diff --git a/Cargo.lock b/Cargo.lock index 805ee90..a4c79e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,7 +379,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=efbd9824eb4ee28bd91b1aaa04a52883d4e1ab45#efbd9824eb4ee28bd91b1aaa04a52883d4e1ab45" +source = "git+https://github.com/ComlineProject/generation?rev=42cc2c037d901acec17e85a1c1ed47690ae4aeb1#42cc2c037d901acec17e85a1c1ed47690ae4aeb1" dependencies = [ "comline-core", "eyre", @@ -388,7 +388,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=d2999a728d9000b2345d04a4352c05016af6de64#d2999a728d9000b2345d04a4352c05016af6de64" +source = "git+https://github.com/ComlineProject/comline-rust?rev=bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b#bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b" dependencies = [ "comline-codegen", "comline-core", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=86ddc4a016d5d6251179a140c808e4109d65895c#86ddc4a016d5d6251179a140c808e4109d65895c" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=f37cc585d93704e147e93909ab80e88c6aeeca4f#f37cc585d93704e147e93909ab80e88c6aeeca4f" dependencies = [ "comline-codegen", "comline-core", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=6431e61a4f1073aceeaee7be7df83e6b77b2acd5#6431e61a4f1073aceeaee7be7df83e6b77b2acd5" +source = "git+https://github.com/ComlineProject/core?rev=f03537962746a93e888888905b4224b17d18a6b4#f03537962746a93e888888905b4224b17d18a6b4" dependencies = [ "ariadne", "bincode", @@ -439,7 +439,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=6431e61a4f1073aceeaee7be7df83e6b77b2acd5#6431e61a4f1073aceeaee7be7df83e6b77b2acd5" +source = "git+https://github.com/ComlineProject/core?rev=f03537962746a93e888888905b4224b17d18a6b4#f03537962746a93e888888905b4224b17d18a6b4" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index 760749d..aacc1ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ toml = "0.8" # needs real I/O (git fetch, filesystem), so it's off by default for # `comline-core`'s wasm32 consumers (the playground editor, the language # server); the CLI is the one consumer that actually runs `comline build`. -comline-core = { git = "https://github.com/ComlineProject/core", rev = "6431e61a4f1073aceeaee7be7df83e6b77b2acd5", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "f03537962746a93e888888905b4224b17d18a6b4", features = ["deps"] } # All three pinned to revs that agree on one `comline-codegen` - bumped # together: generation#40's branch-tip commit (GenRequest.external_std - # comline-rust/comline-typescript's own codegen crates consume @@ -37,9 +37,9 @@ comline-core = { git = "https://github.com/ComlineProject/core", rev = "6431e61a # they do, since Cargo only unifies a git dependency across byte-identical # revs), then comline-rust#30 and comline-typescript#25 (both branch-tip, # pending those PRs' merge). -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "efbd9824eb4ee28bd91b1aaa04a52883d4e1ab45" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "d2999a728d9000b2345d04a4352c05016af6de64", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "86ddc4a016d5d6251179a140c808e4109d65895c", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "42cc2c037d901acec17e85a1c1ed47690ae4aeb1" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "bc43ade3dc3dcf18cfaefc7934cfc4ef2652268b", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "f37cc585d93704e147e93909ab80e88c6aeeca4f", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole diff --git a/src/commands/build.rs b/src/commands/build.rs index 8d24345..5fefd34 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -31,6 +31,9 @@ fn build_once(work_dir: &Path, release: bool) -> Result<()> { ui::finish_spinner(spinner); let result = result.map_err(|e| core_err("build failed", e))?; + for warning in result.context.rendered_warnings() { + ui::warn(warning); + } ui::success("Project built"); diff --git a/src/commands/check.rs b/src/commands/check.rs index a14da55..21ec949 100644 --- a/src/commands/check.rs +++ b/src/commands/check.rs @@ -15,7 +15,10 @@ pub fn run(work_dir: &Path) -> Result<()> { let outcome = comline_core::package::build::compile_package(work_dir); ui::finish_spinner(spinner); - outcome.map_err(|e| core_err("validation failed", e))?; + let context = outcome.map_err(|e| core_err("validation failed", e))?; + for warning in context.rendered_warnings() { + ui::warn(warning); + } ui::success("Check passed"); Ok(()) diff --git a/src/commands/generate.rs b/src/commands/generate.rs index 1a963ce..fb3f0e6 100644 --- a/src/commands/generate.rs +++ b/src/commands/generate.rs @@ -61,6 +61,9 @@ fn generate_once(work_dir: &Path, overrides: &Overrides) -> Result<()> { let context = build::compile_package(work_dir); ui::finish_spinner(spinner); let context = context.map_err(|e| core_err("code generation failed", e))?; + for warning in context.rendered_warnings() { + ui::warn(warning); + } let Some(config_units) = &context.config_frozen else { ui::warn("no package config was produced");