From 053dac88caa94d47ff31db41c90390433fb906c1 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 7 Apr 2021 20:19:28 +0200 Subject: Update `OUT_DIR` diagnostic to match setting --- crates/hir_def/src/body/tests.rs | 2 +- crates/hir_def/src/nameres/tests/diagnostics.rs | 2 +- crates/hir_expand/src/builtin_macro.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs index faa133297..c1d3e998f 100644 --- a/crates/hir_def/src/body/tests.rs +++ b/crates/hir_def/src/body/tests.rs @@ -143,7 +143,7 @@ fn f() { //^^^^^^^^^^^^^ could not convert tokens env!("OUT_DIR"); - //^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "load out dirs from check" to fix + //^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix compile_error!("compile_error works"); //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works diff --git a/crates/hir_def/src/nameres/tests/diagnostics.rs b/crates/hir_def/src/nameres/tests/diagnostics.rs index fefdadb22..1ac88fc89 100644 --- a/crates/hir_def/src/nameres/tests/diagnostics.rs +++ b/crates/hir_def/src/nameres/tests/diagnostics.rs @@ -233,7 +233,7 @@ fn good_out_dir_diagnostic() { macro_rules! concat { () => {} } include!(concat!(env!("OUT_DIR"), "/out.rs")); - //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "load out dirs from check" to fix + //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix "#, ); } diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs index 75ec4196b..a7d0f5b1f 100644 --- a/crates/hir_expand/src/builtin_macro.rs +++ b/crates/hir_expand/src/builtin_macro.rs @@ -490,7 +490,7 @@ fn env_expand( // unnecessary diagnostics for eg. `CARGO_PKG_NAME`. if key == "OUT_DIR" { err = Some(mbe::ExpandError::Other( - r#"`OUT_DIR` not set, enable "load out dirs from check" to fix"#.into(), + r#"`OUT_DIR` not set, enable "run build scripts" to fix"#.into(), )); } -- cgit v1.2.3