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.
Auto merge of rust-lang#102022 - matthiaskrgr:rollup-emwfjd1, r=matth…
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#101389 (Tone down explanation on RefCell::get_mut) - rust-lang#101798 (Make `from_waker`, `waker` and `from_raw` unstably `const`) - rust-lang#101881 (Remove an unused struct field `late_bound`) - rust-lang#101904 (Add help for invalid inline argument) - rust-lang#101966 (Add unit test for identifier Unicode emoji diagnostics) - rust-lang#101979 (Update release notes for 1.64) - rust-lang#101985 (interpret: expose generate_stacktrace without full InterpCx) - rust-lang#102004 (Try to clarify what's new in 1.64.0 ffi types) - rust-lang#102005 (rustdoc: remove unused CSS `td.summary-column`) - rust-lang#102017 (Add all submodules to the list of directories tidy skips) - rust-lang#102019 (Remove backed off PRs from relnotes) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
18 changed files
with
176 additions
and
98 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
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
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
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
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 |
---|---|---|
@@ -1,19 +1,14 @@ | ||
#![allow(dead_code)] | ||
|
||
#[inline(please_no)] //~ ERROR invalid argument | ||
fn a() { | ||
} | ||
|
||
#[inline(please,no)] //~ ERROR expected one argument | ||
fn b() { | ||
fn a() { | ||
} | ||
|
||
#[inline()] //~ ERROR expected one argument | ||
fn c() { | ||
fn b() { | ||
} | ||
|
||
fn main() { | ||
a(); | ||
b(); | ||
c(); | ||
} |
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 |
---|---|---|
@@ -1,22 +1,15 @@ | ||
error[E0535]: invalid argument | ||
--> $DIR/invalid-inline.rs:3:10 | ||
| | ||
LL | #[inline(please_no)] | ||
| ^^^^^^^^^ | ||
|
||
error[E0534]: expected one argument | ||
--> $DIR/invalid-inline.rs:7:1 | ||
--> $DIR/invalid-inline.rs:3:1 | ||
| | ||
LL | #[inline(please,no)] | ||
| ^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error[E0534]: expected one argument | ||
--> $DIR/invalid-inline.rs:11:1 | ||
--> $DIR/invalid-inline.rs:7:1 | ||
| | ||
LL | #[inline()] | ||
| ^^^^^^^^^^^ | ||
|
||
error: aborting due to 3 previous errors | ||
error: aborting due to 2 previous errors | ||
|
||
Some errors have detailed explanations: E0534, E0535. | ||
For more information about an error, try `rustc --explain E0534`. | ||
For more information about this error, try `rustc --explain E0534`. |
Oops, something went wrong.