nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

expand env! with def-site context

Browse Source
This commit is contained in:
Andy Russell 2020-05-26 19:45:30 -04:00
parent 5239f5c57b
commit 68bf8d2487
No known key found for this signature in database
GPG Key ID: BE2221033EDBC374
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librustc_builtin_macros/env.rs
View File

@ -77,6 +77,7 @@ pub fn expand_env<'cx>(
return DummyResult::any(sp); return DummyResult::any(sp);
} }
let sp = cx.with_def_site_ctxt(sp);
let e = match env::var(&*var.as_str()) { let e = match env::var(&*var.as_str()) {
Err(_) => { Err(_) => {
cx.span_err(sp, &msg.as_str()); cx.span_err(sp, &msg.as_str());

2
src/test/ui/extenv/extenv-not-defined-custom.stderr
View File

@ -3,6 +3,8 @@ error: my error message
| |
LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/extenv/extenv-not-defined-default.stderr
View File

@ -3,6 +3,8 @@ error: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined
| |
LL | env!("__HOPEFULLY_NOT_DEFINED__"); LL | env!("__HOPEFULLY_NOT_DEFINED__");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/extenv/issue-55897.stderr
View File

@ -3,6 +3,8 @@ error: environment variable `NON_EXISTENT` not defined
| |
LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: suffixes on a string literal are invalid error: suffixes on a string literal are invalid
--> $DIR/issue-55897.rs:16:22 --> $DIR/issue-55897.rs:16:22

2
src/test/ui/macros/macros-nonfatal-errors.stderr
View File

@ -47,6 +47,8 @@ error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined
| |
LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: format argument must be a string literal error: format argument must be a string literal
--> $DIR/macros-nonfatal-errors.rs:23:13 --> $DIR/macros-nonfatal-errors.rs:23:13