itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8408

Browse Source 
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>
This commit is contained in:
bors[bot] 2021-04-07 18:27:03 +00:00 committed by GitHub
commit 6379839c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir_def/src/body/tests.rs
View File

@ -143,7 +143,7 @@ fn f() {
//^^^^^^^^^^^^^ could not convert tokens //^^^^^^^^^^^^^ could not convert tokens
env!("OUT_DIR"); 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!("compile_error works");
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works

2
crates/hir_def/src/nameres/tests/diagnostics.rs
View File

@ -233,7 +233,7 @@ fn good_out_dir_diagnostic() {
macro_rules! concat { () => {} } macro_rules! concat { () => {} }
include!(concat!(env!("OUT_DIR"), "/out.rs")); 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
"#, "#,
); );
} }

2
crates/hir_expand/src/builtin_macro.rs
View File

@ -490,7 +490,7 @@ fn env_expand(
// unnecessary diagnostics for eg. `CARGO_PKG_NAME`. // unnecessary diagnostics for eg. `CARGO_PKG_NAME`.
if key == "OUT_DIR" { if key == "OUT_DIR" {
err = Some(mbe::ExpandError::Other( 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(),
)); ));
} }