Skip to content

Commit 6379839

Browse files
Merge #8408
8408: Update `OUT_DIR` diagnostic to match setting r=jonas-schievink a=jonas-schievink The setting was renamed, so the diagnostic should follow bors r+ Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2 parents 834fda0 + 053dac8 commit 6379839

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

crates/hir_def/src/body/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn f() {
143143
//^^^^^^^^^^^^^ could not convert tokens
144144
145145
env!("OUT_DIR");
146-
//^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "load out dirs from check" to fix
146+
//^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix
147147
148148
compile_error!("compile_error works");
149149
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works

crates/hir_def/src/nameres/tests/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ fn good_out_dir_diagnostic() {
233233
macro_rules! concat { () => {} }
234234
235235
include!(concat!(env!("OUT_DIR"), "/out.rs"));
236-
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "load out dirs from check" to fix
236+
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix
237237
"#,
238238
);
239239
}

crates/hir_expand/src/builtin_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ fn env_expand(
490490
// unnecessary diagnostics for eg. `CARGO_PKG_NAME`.
491491
if key == "OUT_DIR" {
492492
err = Some(mbe::ExpandError::Other(
493-
r#"`OUT_DIR` not set, enable "load out dirs from check" to fix"#.into(),
493+
r#"`OUT_DIR` not set, enable "run build scripts" to fix"#.into(),
494494
));
495495
}
496496

0 commit comments

Comments
 (0)