Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various metrics comms fixes #1074

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Various metrics comms fixes #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e52530c
settings: ensure `messaging_format` is propagated from `--configure`
feds01 Jul 7, 2024
7fb7b4a
driver: disallow `--configure` unknown fields
feds01 Jul 10, 2024
5723f3b
settings: default serde serialization/deserialization to use kebab-ca…
feds01 Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions compiler/hash-pipeline/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::{error::PipelineError, fs::resolve_path};
/// Various settings that are present on the compiler pipeline when initially
/// launching.
#[derive(Parser, Debug, Clone, Deserialize, Serialize, JsonSchema)]
#[serde(crate = "self::serde")]
#[serde(crate = "self::serde", deny_unknown_fields)]
#[command(name = "hashc", version = env!("COMPILER_VERSION"), about = "", author)]
pub struct CompilerSettings {
/// An optionally specified entry point for the compiler.
Expand Down Expand Up @@ -67,7 +67,7 @@ pub struct CompilerSettings {

/// Print metrics about each stage when the entire pipeline has completed.
#[arg(long = "timings", default_value_t = false)]
#[serde(default)]
#[serde(default, alias = "timings")]
pub show_timings: bool,

/// The format to use when outputting information about compilation, either
Expand Down Expand Up @@ -165,6 +165,7 @@ impl MergeConfig for CompilerSettings {
self.worker_count = config.worker_count;
self.skip_prelude |= config.skip_prelude;
self.prelude_is_quiet |= config.prelude_is_quiet;
self.messaging_format = config.messaging_format;
self.emit_errors |= config.emit_errors;
self.emit_schema |= config.emit_schema;
self.character_set = config.character_set;
Expand Down Expand Up @@ -401,7 +402,7 @@ impl Default for CompilerSettings {
Serialize,
JsonSchema,
)]
#[serde(crate = "self::serde")]
#[serde(crate = "self::serde", rename_all = "kebab-case")]
pub enum OptimisationLevel {
/// Run the compiler using the debug optimisation level. This will
/// disable most optimisations that the compiler would otherwise do.
Expand Down Expand Up @@ -686,7 +687,7 @@ impl Default for CodeGenSettings {
/// All of the current possible code generation backends that
/// are available.
#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum, Serialize, Deserialize, JsonSchema)]
#[serde(crate = "self::serde")]
#[serde(crate = "self::serde", rename_all = "kebab-case")]
pub enum CodeGenBackend {
/// The LLVM backend is target for code generation.
#[cfg(feature = "llvm")]
Expand Down Expand Up @@ -755,7 +756,7 @@ impl fmt::Display for CodeGenBackend {
Serialize,
JsonSchema,
)]
#[serde(crate = "self::serde")]
#[serde(crate = "self::serde", rename_all = "kebab-case")]
pub enum CompilerStageKind {
/// Parse the source code into an AST.
Parse,
Expand Down
1 change: 1 addition & 0 deletions compiler/hash-utils/src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use crate::{
#[derive(
ValueEnum, Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize, JsonSchema, Default,
)]
#[serde(rename_all = "lowercase")]
pub enum CompilerMessagingFormat {
/// All messages that are emitted to and from the compiler will be in JSON
/// format according to the schema that represents [CompilerMessage].
Expand Down
Loading