diff options
| author | Rageking8 <tomleetyt@gmail.com> | 2022-09-16 22:49:43 +0800 |
|---|---|---|
| committer | Rageking8 <tomleetyt@gmail.com> | 2022-09-16 23:57:08 +0800 |
| commit | b248a6faf9bcf5f2e309f3c0414172917af64cf7 (patch) | |
| tree | 58cf677ce5e5ad867cfba4571719abb85ba35d42 | |
| parent | 2d1aa57d1e05d1d745aaf864965eebd1fd8d6071 (diff) | |
| download | rust-b248a6faf9bcf5f2e309f3c0414172917af64cf7.tar.gz rust-b248a6faf9bcf5f2e309f3c0414172917af64cf7.zip | |
add help for invalid inline argument
| -rw-r--r-- | compiler/rustc_typeck/src/collect.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/invalid/invalid-inline.rs | 9 | ||||
| -rw-r--r-- | src/test/ui/invalid/invalid-inline.stderr | 15 | ||||
| -rw-r--r-- | src/test/ui/span/E0535.stderr | 2 |
4 files changed, 9 insertions, 18 deletions
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs index fe74ed28aa5..b9bd55f99cc 100644 --- a/compiler/rustc_typeck/src/collect.rs +++ b/compiler/rustc_typeck/src/collect.rs @@ -3129,6 +3129,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: DefId) -> CodegenFnAttrs { E0535, "invalid argument" ) + .help("valid inline arguments are `always` and `never`") .emit(); InlineAttr::None diff --git a/src/test/ui/invalid/invalid-inline.rs b/src/test/ui/invalid/invalid-inline.rs index 8aa8f99f522..2501b1e23f2 100644 --- a/src/test/ui/invalid/invalid-inline.rs +++ b/src/test/ui/invalid/invalid-inline.rs @@ -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(); } diff --git a/src/test/ui/invalid/invalid-inline.stderr b/src/test/ui/invalid/invalid-inline.stderr index f3d04264197..7edbf936b1b 100644 --- a/src/test/ui/invalid/invalid-inline.stderr +++ b/src/test/ui/invalid/invalid-inline.stderr @@ -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`. diff --git a/src/test/ui/span/E0535.stderr b/src/test/ui/span/E0535.stderr index f52c3f9f2c0..b1411bc436a 100644 --- a/src/test/ui/span/E0535.stderr +++ b/src/test/ui/span/E0535.stderr @@ -3,6 +3,8 @@ error[E0535]: invalid argument | LL | #[inline(unknown)] | ^^^^^^^ + | + = help: valid inline arguments are `always` and `never` error: aborting due to previous error |