diff --git a/build/configure/src/python.rs b/build/configure/src/python.rs index ec6f6fb92..17dddde16 100644 --- a/build/configure/src/python.rs +++ b/build/configure/src/python.rs @@ -125,7 +125,7 @@ impl BuildAction for GenPythonProto { build.add_outputs("", python_outputs); } - fn hide_last_line(&self) -> bool { + fn hide_progress(&self) -> bool { true } } diff --git a/build/ninja_gen/src/action.rs b/build/ninja_gen/src/action.rs index 95a43294f..97d77de95 100644 --- a/build/ninja_gen/src/action.rs +++ b/build/ninja_gen/src/action.rs @@ -44,7 +44,7 @@ pub trait BuildAction { true } - fn hide_last_line(&self) -> bool { + fn hide_progress(&self) -> bool { false } diff --git a/build/ninja_gen/src/build.rs b/build/ninja_gen/src/build.rs index 402074e99..df8ec82fb 100644 --- a/build/ninja_gen/src/build.rs +++ b/build/ninja_gen/src/build.rs @@ -271,14 +271,14 @@ impl BuildStatement<'_> { stmt.rule_variables.push(("pool".into(), pool.into())); } if have_n2 { - stmt.rule_variables.push(( - "hide_success".into(), - (action.hide_success() as u8).to_string(), - )); - stmt.rule_variables.push(( - "hide_last_line".into(), - (action.hide_last_line() as u8).to_string(), - )); + if action.hide_success() { + stmt.rule_variables + .push(("hide_success".into(), "1".into())); + } + if action.hide_progress() { + stmt.rule_variables + .push(("hide_progress".into(), "1".into())); + } } stmt diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs index dde6fa1c4..dac056c10 100644 --- a/build/ninja_gen/src/node.rs +++ b/build/ninja_gen/src/node.rs @@ -252,7 +252,7 @@ impl BuildAction for SvelteCheck { build.add_output_stamp(format!("tests/svelte-check.{hash}")); } - fn hide_last_line(&self) -> bool { + fn hide_progress(&self) -> bool { true } } diff --git a/build/ninja_gen/src/python.rs b/build/ninja_gen/src/python.rs index 1e770741c..3a8931697 100644 --- a/build/ninja_gen/src/python.rs +++ b/build/ninja_gen/src/python.rs @@ -146,7 +146,7 @@ impl BuildAction for PythonTypecheck { build.add_output_stamp(format!("tests/python_typecheck.{hash}")); } - fn hide_last_line(&self) -> bool { + fn hide_progress(&self) -> bool { true } } @@ -259,7 +259,7 @@ impl BuildAction for PythonTest { build.add_output_stamp(format!("tests/python_pytest.{hash}")); } - fn hide_last_line(&self) -> bool { + fn hide_progress(&self) -> bool { true } } diff --git a/tools/install-n2 b/tools/install-n2 index 2c251b5e5..d2872f04b 100755 --- a/tools/install-n2 +++ b/tools/install-n2 @@ -1,3 +1,3 @@ #!/bin/bash -cargo install --git https://github.com/ankitects/n2.git --rev 0de7aa35bf90a4764a54a14e76b8098d65eb3a14 +cargo install --git https://github.com/evmar/n2.git --rev 53ec691df749277104d1d4201a344fe4243d6d0a