forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#116420 - bvanjoi:fix-116203, r=Nilstrieb
discard invalid spans in external blocks Fixes rust-lang#116203 This PR has discarded the invalid `const_span`, thereby making the format more neat. r? `@Nilstrieb`
- Loading branch information
Showing
4 changed files
with
71 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
extern "C" { | ||
thread_local! { | ||
static FOO: u32 = 0; | ||
//~^ error: extern items cannot be `const` | ||
//~| error: incorrect `static` inside `extern` block | ||
} | ||
} | ||
|
||
macro_rules! hello { | ||
($name:ident) => { | ||
const $name: () = (); | ||
}; | ||
} | ||
|
||
extern "C" { | ||
hello! { yes } | ||
//~^ error: extern items cannot be `const` | ||
//~| error: incorrect `static` inside `extern` block | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
error: extern items cannot be `const` | ||
--> $DIR/issue-116203.rs:3:14 | ||
| | ||
LL | static FOO: u32 = 0; | ||
| ^^^ | ||
| | ||
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html | ||
|
||
error: extern items cannot be `const` | ||
--> $DIR/issue-116203.rs:16:14 | ||
| | ||
LL | hello! { yes } | ||
| ^^^ | ||
| | ||
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html | ||
|
||
error: incorrect `static` inside `extern` block | ||
--> $DIR/issue-116203.rs:3:14 | ||
| | ||
LL | extern "C" { | ||
| ---------- `extern` blocks define existing foreign statics and statics inside of them cannot have a body | ||
LL | / thread_local! { | ||
LL | | static FOO: u32 = 0; | ||
| | ^^^ cannot have a body | ||
LL | | | ||
LL | | | ||
LL | | } | ||
| |_____- the invalid body | ||
| | ||
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html | ||
|
||
error: incorrect `static` inside `extern` block | ||
--> $DIR/issue-116203.rs:16:14 | ||
| | ||
LL | const $name: () = (); | ||
| -- the invalid body | ||
... | ||
LL | extern "C" { | ||
| ---------- `extern` blocks define existing foreign statics and statics inside of them cannot have a body | ||
LL | hello! { yes } | ||
| ^^^ cannot have a body | ||
| | ||
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html | ||
|
||
error: aborting due to 4 previous errors | ||
|