OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rebase and more CI failures

Browse Source
This commit is contained in:
Vadim Petrochenkov 2018-12-27 03:07:00 +03:00
parent 37af04ff8d
commit bc16edeb28
33 changed files with 136 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr
View File

@ -5,9 +5,10 @@ LL | #[derive(Clone)]
| ^^^^^^^^^^^^^^^^
error: `derive` may only be applied to structs, enums and unions
--> $DIR/derive-on-trait-item-or-impl-item.rs:8:5
--> $DIR/derive-on-trait-item-or-impl-item.rs:10:5
|
LL | #[derive(Clone)]
| ^^^^^^^^^^^^^^^^
error: aborting due to 2 previous errors

28
src/test/ui/did_you_mean/issue-40396.stderr
View File

@ -1,5 +1,5 @@
error: chained comparison operators require parentheses
--> $DIR/issue-40396.rs:2:37
--> $DIR/issue-40396.rs:2:20
|
LL | (0..13).collect<Vec<i32>>();
| ^^^^^^^^
@ -8,7 +8,7 @@ LL | (0..13).collect<Vec<i32>>();
= help: or use `(...)` if you meant to specify fn arguments
error: chained comparison operators require parentheses
--> $DIR/issue-40396.rs:6:25
--> $DIR/issue-40396.rs:10:8
|
LL | Vec<i32>::new();
| ^^^^^^^
@ -17,7 +17,7 @@ LL | Vec<i32>::new();
= help: or use `(...)` if you meant to specify fn arguments
error: chained comparison operators require parentheses
--> $DIR/issue-40396.rs:10:37
--> $DIR/issue-40396.rs:18:20
|
LL | (0..13).collect<Vec<i32>();
| ^^^^^^^^
@ -26,7 +26,7 @@ LL | (0..13).collect<Vec<i32>();
= help: or use `(...)` if you meant to specify fn arguments
error: chained comparison operators require parentheses
--> $DIR/issue-40396.rs:10:41
--> $DIR/issue-40396.rs:18:24
|
LL | (0..13).collect<Vec<i32>();
| ^^^^^^
@ -35,49 +35,49 @@ LL | (0..13).collect<Vec<i32>();
= help: or use `(...)` if you meant to specify fn arguments
error[E0423]: expected value, found struct `Vec`
--> $DIR/issue-40396.rs:12:21
--> $DIR/issue-40396.rs:2:21
|
LL | (0..13).collect<Vec<i32>>();
| ^^^ did you mean `Vec { /* fields */ }`?
error[E0423]: expected value, found builtin type `i32`
--> $DIR/issue-40396.rs:12:25
--> $DIR/issue-40396.rs:2:25
|
LL | (0..13).collect<Vec<i32>>();
| ^^^ not a value
error[E0423]: expected value, found struct `Vec`
--> $DIR/issue-40396.rs:20:5
--> $DIR/issue-40396.rs:10:5
|
LL | Vec<i32>::new();
| ^^^ did you mean `Vec { /* fields */ }`?
error[E0423]: expected value, found builtin type `i32`
--> $DIR/issue-40396.rs:20:9
--> $DIR/issue-40396.rs:10:9
|
LL | Vec<i32>::new();
| ^^^ not a value
error[E0425]: cannot find function `new` in the crate root
--> $DIR/issue-40396.rs:20:15
--> $DIR/issue-40396.rs:10:15
|
LL | Vec<i32>::new();
| ^^^ not found in the crate root
error[E0423]: expected value, found struct `Vec`
--> $DIR/issue-40396.rs:28:21
--> $DIR/issue-40396.rs:18:21
|
LL | (0..13).collect<Vec<i32>();
| ^^^ did you mean `Vec { /* fields */ }`?
error[E0423]: expected value, found builtin type `i32`
--> $DIR/issue-40396.rs:28:25
--> $DIR/issue-40396.rs:18:25
|
LL | (0..13).collect<Vec<i32>();
| ^^^ not a value
error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
--> $DIR/issue-40396.rs:12:13
--> $DIR/issue-40396.rs:2:13
|
LL | (0..13).collect<Vec<i32>>();
| ^^^^^^^
@ -85,7 +85,7 @@ LL | (0..13).collect<Vec<i32>>();
= help: maybe a `()` to call it is missing?
error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
--> $DIR/issue-40396.rs:28:13
--> $DIR/issue-40396.rs:18:13
|
LL | (0..13).collect<Vec<i32>();
| ^^^^^^^
@ -93,7 +93,7 @@ LL | (0..13).collect<Vec<i32>();
= help: maybe a `()` to call it is missing?
error[E0308]: mismatched types
--> $DIR/issue-40396.rs:28:29
--> $DIR/issue-40396.rs:18:29
|
LL | (0..13).collect<Vec<i32>();
| ^^ expected bool, found ()

5
src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr
View File

@ -1,13 +1,14 @@
error: no rules expected the token `r#async`
--> $DIR/edition-keywords-2015-2015-parsing.rs:12:31
--> $DIR/edition-keywords-2015-2015-parsing.rs:16:31
|
LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
| ^^^^^^^ no rules expected this token in macro call
error: no rules expected the token `async`
--> $DIR/edition-keywords-2015-2015-parsing.rs:13:35
--> $DIR/edition-keywords-2015-2015-parsing.rs:17:35
|
LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
| ^^^^^ no rules expected this token in macro call
error: aborting due to 2 previous errors

5
src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr
View File

@ -1,13 +1,14 @@
error: no rules expected the token `r#async`
--> $DIR/edition-keywords-2015-2018-parsing.rs:12:31
--> $DIR/edition-keywords-2015-2018-parsing.rs:16:31
|
LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
| ^^^^^^^ no rules expected this token in macro call
error: no rules expected the token `async`
--> $DIR/edition-keywords-2015-2018-parsing.rs:13:35
--> $DIR/edition-keywords-2015-2018-parsing.rs:17:35
|
LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
| ^^^^^ no rules expected this token in macro call
error: aborting due to 2 previous errors

2
src/test/ui/feature-gates/feature-gate-asm2.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: inline assembly is not stable enough for use and is subject to change (see issue #29722)
--> $DIR/feature-gate-asm2.rs:5:24
--> $DIR/feature-gate-asm2.rs:5:26
|
LL | println!("{:?}", asm!("")); //~ ERROR inline assembly is not stable
| ^^^^^^^^

36
src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:13:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:15:7
|
LL | #[cfg(target_has_atomic = "8")]
| ^^^^^^^^^^^^^^^^^^^^^^^
@ -7,7 +7,7 @@ LL | #[cfg(target_has_atomic = "8")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:19:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:21:7
|
LL | #[cfg(target_has_atomic = "8")]
| ^^^^^^^^^^^^^^^^^^^^^^^
@ -15,7 +15,7 @@ LL | #[cfg(target_has_atomic = "8")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:24:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:26:7
|
LL | #[cfg(target_has_atomic = "16")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -23,7 +23,7 @@ LL | #[cfg(target_has_atomic = "16")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:29:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:31:7
|
LL | #[cfg(target_has_atomic = "16")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -31,7 +31,7 @@ LL | #[cfg(target_has_atomic = "16")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:34:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:36:7
|
LL | #[cfg(target_has_atomic = "32")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -39,7 +39,7 @@ LL | #[cfg(target_has_atomic = "32")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:39:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:41:7
|
LL | #[cfg(target_has_atomic = "32")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -47,7 +47,7 @@ LL | #[cfg(target_has_atomic = "32")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:44:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:46:7
|
LL | #[cfg(target_has_atomic = "64")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -55,7 +55,7 @@ LL | #[cfg(target_has_atomic = "64")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:49:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:51:7
|
LL | #[cfg(target_has_atomic = "64")]
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -63,7 +63,7 @@ LL | #[cfg(target_has_atomic = "64")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:54:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:56:7
|
LL | #[cfg(target_has_atomic = "128")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -71,7 +71,7 @@ LL | #[cfg(target_has_atomic = "128")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:59:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:61:7
|
LL | #[cfg(target_has_atomic = "128")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -79,7 +79,7 @@ LL | #[cfg(target_has_atomic = "128")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:64:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:66:7
|
LL | #[cfg(target_has_atomic = "ptr")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -87,7 +87,7 @@ LL | #[cfg(target_has_atomic = "ptr")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:69:7
--> $DIR/feature-gate-cfg-target-has-atomic.rs:71:7
|
LL | #[cfg(target_has_atomic = "ptr")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -95,7 +95,7 @@ LL | #[cfg(target_has_atomic = "ptr")]
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:76:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:78:10
|
LL | cfg!(target_has_atomic = "8");
| ^^^^^^^^^^^^^^^^^^^^^^^
@ -103,7 +103,7 @@ LL | cfg!(target_has_atomic = "8");
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:78:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:80:10
|
LL | cfg!(target_has_atomic = "16");
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -111,7 +111,7 @@ LL | cfg!(target_has_atomic = "16");
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:80:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:82:10
|
LL | cfg!(target_has_atomic = "32");
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -119,7 +119,7 @@ LL | cfg!(target_has_atomic = "32");
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:82:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:84:10
|
LL | cfg!(target_has_atomic = "64");
| ^^^^^^^^^^^^^^^^^^^^^^^^
@ -127,7 +127,7 @@ LL | cfg!(target_has_atomic = "64");
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:84:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:86:10
|
LL | cfg!(target_has_atomic = "128");
| ^^^^^^^^^^^^^^^^^^^^^^^^^
@ -135,7 +135,7 @@ LL | cfg!(target_has_atomic = "128");
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
--> $DIR/feature-gate-cfg-target-has-atomic.rs:86:10
--> $DIR/feature-gate-cfg-target-has-atomic.rs:88:10
|
LL | cfg!(target_has_atomic = "ptr");
| ^^^^^^^^^^^^^^^^^^^^^^^^^

2
src/test/ui/feature-gates/feature-gate-concat_idents2.stderr
View File

@ -7,7 +7,7 @@ LL | concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
= help: add #![feature(concat_idents)] to the crate attributes to enable
error[E0425]: cannot find value `ab` in this scope
--> $DIR/feature-gate-concat_idents2.rs:14:5
--> $DIR/feature-gate-concat_idents2.rs:4:5
|
LL | concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
| ^^^^^^^^^^^^^^^^^^^^^ not found in this scope

2
src/test/ui/feature-gates/feature-gate-log_syntax2.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: `log_syntax!` is not stable enough for use and is subject to change (see issue #29598)
--> $DIR/feature-gate-log_syntax2.rs:4:20
--> $DIR/feature-gate-log_syntax2.rs:4:22
|
LL | println!("{:?}", log_syntax!()); //~ ERROR `log_syntax!` is not stable
| ^^^^^^^^^^^^^

2
src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: unless otherwise specified, attributes with the prefix `rustc_` are reserved for internal compiler diagnostics (see issue #29642)
--> $DIR/feature-gate-rustc-attrs.rs:5:3
--> $DIR/feature-gate-rustc-attrs.rs:3:3
|
LL | #[rustc_foo]
| ^^^^^^^^^

6
src/test/ui/issues/issue-10536.stderr
View File

@ -1,5 +1,5 @@
error: macros that expand to items must either be surrounded with braces or followed by a semicolon
--> $DIR/issue-10536.rs:16:22
--> $DIR/issue-10536.rs:14:22
|
LL | assert!({one! two()});
| ^^
@ -11,13 +11,13 @@ LL | assert!({one! two});
| ^ expected `(` or `{`
error: cannot find macro `one!` in this scope
--> $DIR/issue-10536.rs:24:14
--> $DIR/issue-10536.rs:14:14
|
LL | assert!({one! two()});
| ^^^
error[E0308]: mismatched types
--> $DIR/issue-10536.rs:24:13
--> $DIR/issue-10536.rs:14:13
|
LL | assert!({one! two()});
| ^^^^^^^^^^^^ expected bool, found ()

2
src/test/ui/issues/issue-11692-1.stderr
View File

@ -9,7 +9,7 @@ LL | print!("{}", testo!());
| ^^^^^
error: cannot find macro `testo!` in this scope
--> $DIR/issue-11692-1.rs:12:12
--> $DIR/issue-11692-1.rs:2:12
|
LL | print!(testo!());
| ^^^^^

2
src/test/ui/issues/issue-11692-2.stderr
View File

@ -1,5 +1,5 @@
error: expected a literal
--> $DIR/issue-11692-2.rs:12:13
--> $DIR/issue-11692-2.rs:2:13
|
LL | concat!(test!()); //~ ERROR cannot find macro `test!` in this scope
| ^^^^^^^

2
src/test/ui/issues/issue-32950.stderr
View File

@ -5,7 +5,7 @@ LL | concat_idents!(Foo, Bar) //~ ERROR `derive` cannot be used on items wit
| ^^^^^^^^^^^^^^^^^^^^^^^^
error[E0412]: cannot find type `FooBar` in this scope
--> $DIR/issue-32950.rs:15:5
--> $DIR/issue-32950.rs:5:5
|
LL | concat_idents!(Foo, Bar) //~ ERROR `derive` cannot be used on items with type macros
| ^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope

2
src/test/ui/issues/issue-49074.stderr
View File

@ -7,7 +7,7 @@ LL | #[marco_use] // typo
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error: cannot find macro `bar!` in this scope
--> $DIR/issue-49074.rs:22:4
--> $DIR/issue-49074.rs:12:4
|
LL | bar!(); //~ ERROR cannot find macro `bar!` in this scope
| ^^^

2
src/test/ui/issues/issue-51279.stderr
View File

@ -47,7 +47,7 @@ LL | type Z<#[ignored] 'a, #[cfg(none)] T> = X<'a, T>;
| ^^^^^^^^^^^^
error[E0658]: The attribute `ignored` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
--> $DIR/issue-51279.rs:33:8
--> $DIR/issue-51279.rs:23:8
|
LL | type Z<#[ignored] 'a, #[cfg(none)] T> = X<'a, T>;
| ^^^^^^^^^^

1
src/test/ui/issues/issue-6596-2.stderr
View File

@ -8,3 +8,4 @@ LL | g!(foo);
| -------- in this macro invocation
error: aborting due to previous error

1
src/test/ui/macro_backtrace/main.rs
View File

@ -12,6 +12,7 @@ macro_rules! pong {
//~| ERROR expected one of
//~| ERROR expected one of
#[allow(non_camel_case_types)]
struct syntax;
fn main() {

19
src/test/ui/macros/macro-comma-behavior.core.stderr
View File

@ -1,47 +1,44 @@
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:17:23
--> $DIR/macro-comma-behavior.rs:21:23
|
LL | assert_eq!(1, 1, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:20:23
--> $DIR/macro-comma-behavior.rs:24:23
|
LL | assert_ne!(1, 2, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:26:29
--> $DIR/macro-comma-behavior.rs:30:29
|
LL | debug_assert_eq!(1, 1, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:29:29
--> $DIR/macro-comma-behavior.rs:33:29
|
LL | debug_assert_ne!(1, 2, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:50:19
--> $DIR/macro-comma-behavior.rs:54:19
|
LL | format_args!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:68:21
--> $DIR/macro-comma-behavior.rs:72:21
|
LL | unimplemented!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:77:24
--> $DIR/macro-comma-behavior.rs:81:24
|
LL | write!(f, "{}",)?;
| ^^
error: `#[panic_handler]` function required, but not found
error: aborting due to 7 previous errors
error: language item required, but not found: `eh_personality`
error: aborting due to 9 previous errors

2
src/test/ui/macros/macro-comma-behavior.rs
View File

@ -8,7 +8,9 @@
#[cfg(std)] use std::fmt;
#[cfg(core)] use core::fmt;
#[cfg(core)] #[lang = "eh_personality"] fn eh_personality() {}
#[cfg(core)] #[lang = "eh_unwind_resume"] fn eh_unwind_resume() {}
#[cfg(core)] #[lang = "panic_impl"] fn panic_impl(panic: &core::panic::PanicInfo) -> ! { loop {} }
// (see documentation of the similarly-named test in run-pass)
fn to_format_or_not_to_format() {

21
src/test/ui/macros/macro-comma-behavior.std.stderr
View File

@ -1,61 +1,62 @@
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:17:23
--> $DIR/macro-comma-behavior.rs:21:23
|
LL | assert_eq!(1, 1, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:20:23
--> $DIR/macro-comma-behavior.rs:24:23
|
LL | assert_ne!(1, 2, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:26:29
--> $DIR/macro-comma-behavior.rs:30:29
|
LL | debug_assert_eq!(1, 1, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:29:29
--> $DIR/macro-comma-behavior.rs:33:29
|
LL | debug_assert_ne!(1, 2, "{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:34:18
--> $DIR/macro-comma-behavior.rs:38:18
|
LL | eprint!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:46:18
--> $DIR/macro-comma-behavior.rs:50:18
|
LL | format!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:50:19
--> $DIR/macro-comma-behavior.rs:54:19
|
LL | format_args!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:57:17
--> $DIR/macro-comma-behavior.rs:61:17
|
LL | print!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:68:21
--> $DIR/macro-comma-behavior.rs:72:21
|
LL | unimplemented!("{}",);
| ^^
error: 1 positional argument in format string, but no arguments were given
--> $DIR/macro-comma-behavior.rs:77:24
--> $DIR/macro-comma-behavior.rs:81:24
|
LL | write!(f, "{}",)?;
| ^^
error: aborting due to 10 previous errors

2
src/test/ui/parser/macro/pub-item-macro.stderr
View File

@ -10,7 +10,7 @@ LL | pub_x!();
= help: try adjusting the macro to put `pub` inside the invocation
error[E0603]: static `x` is private
--> $DIR/pub-item-macro.rs:27:23
--> $DIR/pub-item-macro.rs:17:23
|
LL | let y: u32 = foo::x; //~ ERROR static `x` is private
| ^

2
src/test/ui/proc-macro/issue-41211.stderr
View File

@ -7,7 +7,7 @@ LL | #![emit_unchanged]
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error: inconsistent resolution for a macro: first custom attribute, then attribute macro
--> $DIR/issue-41211.rs:18:4
--> $DIR/issue-41211.rs:8:4
|
LL | #![emit_unchanged]
| ^^^^^^^^^^^^^^

10
src/test/ui/proc-macro/more-gates.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: procedural macros cannot expand to macro definitions (see issue #54727)
--> $DIR/more-gates.rs:7:1
--> $DIR/more-gates.rs:9:1
|
LL | #[attr2mac1]
| ^^^^^^^^^^^^
@ -7,7 +7,7 @@ LL | #[attr2mac1]
= help: add #![feature(proc_macro_hygiene)] to the crate attributes to enable
error[E0658]: procedural macros cannot expand to macro definitions (see issue #54727)
--> $DIR/more-gates.rs:10:1
--> $DIR/more-gates.rs:12:1
|
LL | #[attr2mac2]
| ^^^^^^^^^^^^
@ -15,7 +15,7 @@ LL | #[attr2mac2]
= help: add #![feature(proc_macro_hygiene)] to the crate attributes to enable
error[E0658]: procedural macros cannot expand to macro definitions (see issue #54727)
--> $DIR/more-gates.rs:14:1
--> $DIR/more-gates.rs:16:1
|
LL | mac2mac1!(); //~ ERROR: cannot expand to macro definitions
| ^^^^^^^^^^^^
@ -23,7 +23,7 @@ LL | mac2mac1!(); //~ ERROR: cannot expand to macro definitions
= help: add #![feature(proc_macro_hygiene)] to the crate attributes to enable
error[E0658]: procedural macros cannot expand to macro definitions (see issue #54727)
--> $DIR/more-gates.rs:15:1
--> $DIR/more-gates.rs:17:1
|
LL | mac2mac2!(); //~ ERROR: cannot expand to macro definitions
| ^^^^^^^^^^^^
@ -31,7 +31,7 @@ LL | mac2mac2!(); //~ ERROR: cannot expand to macro definitions
= help: add #![feature(proc_macro_hygiene)] to the crate attributes to enable
error[E0658]: procedural macros cannot expand to macro definitions (see issue #54727)
--> $DIR/more-gates.rs:17:1
--> $DIR/more-gates.rs:19:1
|
LL | tricky!();
| ^^^^^^^^^^

30
src/test/ui/proc-macro/parent-source-spans.stderr
View File

@ -35,25 +35,25 @@ LL | one!("hello", "world");
| ----------------------- in this macro invocation
error: first grandparent: "hello"
--> $DIR/parent-source-spans.rs:34:5
--> $DIR/parent-source-spans.rs:37:5
|
LL | one!("hello", "world");
| ^^^^^^^^^^^^^^^^^^^^^^^
error: second grandparent: "world"
--> $DIR/parent-source-spans.rs:34:5
--> $DIR/parent-source-spans.rs:37:5
|
LL | one!("hello", "world");
| ^^^^^^^^^^^^^^^^^^^^^^^
error: first source: "hello"
--> $DIR/parent-source-spans.rs:34:5
--> $DIR/parent-source-spans.rs:37:5
|
LL | one!("hello", "world");
| ^^^^^^^^^^^^^^^^^^^^^^^
error: second source: "world"
--> $DIR/parent-source-spans.rs:34:5
--> $DIR/parent-source-spans.rs:37:5
|
LL | one!("hello", "world");
| ^^^^^^^^^^^^^^^^^^^^^^^
@ -77,55 +77,55 @@ LL | two!("yay", "rust");
| -------------------- in this macro invocation
error: first parent: "yay"
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:43:5
|
LL | two!("yay", "rust");
| ^^^^^^^^^^^^^^^^^^^^
error: second parent: "rust"
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:43:5
|
LL | two!("yay", "rust");
| ^^^^^^^^^^^^^^^^^^^^
error: first source: "yay"
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:43:5
|
LL | two!("yay", "rust");
| ^^^^^^^^^^^^^^^^^^^^
error: second source: "rust"
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:43:5
|
LL | two!("yay", "rust");
| ^^^^^^^^^^^^^^^^^^^^
error: first final: "hip"
--> $DIR/parent-source-spans.rs:46:12
--> $DIR/parent-source-spans.rs:49:12
|
LL | three!("hip", "hop");
| ^^^^^
error: second final: "hop"
--> $DIR/parent-source-spans.rs:46:19
--> $DIR/parent-source-spans.rs:49:19
|
LL | three!("hip", "hop");
| ^^^^^
error: first source: "hip"
--> $DIR/parent-source-spans.rs:46:12
--> $DIR/parent-source-spans.rs:49:12
|
LL | three!("hip", "hop");
| ^^^^^
error: second source: "hop"
--> $DIR/parent-source-spans.rs:46:19
--> $DIR/parent-source-spans.rs:49:19
|
LL | three!("hip", "hop");
| ^^^^^
error[E0425]: cannot find value `ok` in this scope
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:30:5
|
LL | parent_source_spans!($($tokens)*);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `Ok`?
@ -134,7 +134,7 @@ LL | one!("hello", "world");
| ----------------------- in this macro invocation
error[E0425]: cannot find value `ok` in this scope
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:30:5
|
LL | parent_source_spans!($($tokens)*);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `Ok`?
@ -143,7 +143,7 @@ LL | two!("yay", "rust");
| -------------------- in this macro invocation
error[E0425]: cannot find value `ok` in this scope
--> $DIR/parent-source-spans.rs:40:5
--> $DIR/parent-source-spans.rs:30:5
|
LL | parent_source_spans!($($tokens)*);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `Ok`?

26
src/test/ui/proc-macro/proc-macro-attributes.stderr
View File

@ -7,75 +7,75 @@ LL | #[C] //~ ERROR attribute `C` is currently unknown to the compiler
= help: add #![feature(custom_attribute)] to the crate attributes to enable
error[E0659]: `B` is ambiguous (derive helper attribute vs any other name)
--> $DIR/proc-macro-attributes.rs:16:3
--> $DIR/proc-macro-attributes.rs:6:3
|
LL | #[B] //~ ERROR `B` is ambiguous
| ^ ambiguous name
|
note: `B` could refer to the derive helper attribute defined here
--> $DIR/proc-macro-attributes.rs:22:10
--> $DIR/proc-macro-attributes.rs:12:10
|
LL | #[derive(B)]
| ^
note: `B` could also refer to the derive macro imported here
--> $DIR/proc-macro-attributes.rs:13:1
--> $DIR/proc-macro-attributes.rs:3:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^
error[E0659]: `B` is ambiguous (derive helper attribute vs any other name)
--> $DIR/proc-macro-attributes.rs:18:3
--> $DIR/proc-macro-attributes.rs:8:3
|
LL | #[B(D)] //~ ERROR `B` is ambiguous
| ^ ambiguous name
|
note: `B` could refer to the derive helper attribute defined here
--> $DIR/proc-macro-attributes.rs:22:10
--> $DIR/proc-macro-attributes.rs:12:10
|
LL | #[derive(B)]
| ^
note: `B` could also refer to the derive macro imported here
--> $DIR/proc-macro-attributes.rs:13:1
--> $DIR/proc-macro-attributes.rs:3:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^
error[E0659]: `B` is ambiguous (derive helper attribute vs any other name)
--> $DIR/proc-macro-attributes.rs:19:3
--> $DIR/proc-macro-attributes.rs:9:3
|
LL | #[B(E = "foo")] //~ ERROR `B` is ambiguous
| ^ ambiguous name
|
note: `B` could refer to the derive helper attribute defined here
--> $DIR/proc-macro-attributes.rs:22:10
--> $DIR/proc-macro-attributes.rs:12:10
|
LL | #[derive(B)]
| ^
note: `B` could also refer to the derive macro imported here
--> $DIR/proc-macro-attributes.rs:13:1
--> $DIR/proc-macro-attributes.rs:3:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^
error[E0659]: `B` is ambiguous (derive helper attribute vs any other name)
--> $DIR/proc-macro-attributes.rs:20:3
--> $DIR/proc-macro-attributes.rs:10:3
|
LL | #[B(arbitrary tokens)] //~ ERROR `B` is ambiguous
| ^ ambiguous name
|
note: `B` could refer to the derive helper attribute defined here
--> $DIR/proc-macro-attributes.rs:22:10
--> $DIR/proc-macro-attributes.rs:12:10
|
LL | #[derive(B)]
| ^
note: `B` could also refer to the derive macro imported here
--> $DIR/proc-macro-attributes.rs:13:1
--> $DIR/proc-macro-attributes.rs:3:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^
error: expected one of `(`, `)`, `,`, `::`, or `=`, found `tokens`
--> $DIR/proc-macro-attributes.rs:20:15
--> $DIR/proc-macro-attributes.rs:10:15
|
LL | #[B(arbitrary tokens)] //~ ERROR `B` is ambiguous
| ^^^^^^ expected one of `(`, `)`, `,`, `::`, or `=` here

8
src/test/ui/quote-with-interpolated.stderr
View File

@ -8,19 +8,19 @@ LL | foo!(bar);
| ---------- in this macro invocation
error[E0433]: failed to resolve: maybe a missing `extern crate syntax;`?
--> $DIR/quote-with-interpolated.rs:15:13
--> $DIR/quote-with-interpolated.rs:5:13
|
LL | quote_expr!(cx, $bar)
| ^^^^^^^^^^^^^^^^^^^^^ maybe a missing `extern crate syntax;`?
error[E0433]: failed to resolve: maybe a missing `extern crate syntax;`?
--> $DIR/quote-with-interpolated.rs:15:29
--> $DIR/quote-with-interpolated.rs:5:29
|
LL | quote_expr!(cx, $bar)
| ^^^^ maybe a missing `extern crate syntax;`?
error[E0425]: cannot find value `cx` in this scope
--> $DIR/quote-with-interpolated.rs:15:25
--> $DIR/quote-with-interpolated.rs:5:25
|
LL | quote_expr!(cx, $bar)
| ^^ not found in this scope
@ -29,7 +29,7 @@ LL | foo!(bar);
| ---------- in this macro invocation
error[E0425]: cannot find function `new_parser_from_tts` in this scope
--> $DIR/quote-with-interpolated.rs:15:13
--> $DIR/quote-with-interpolated.rs:5:13
|
LL | quote_expr!(cx, $bar)
| ^^^^^^^^^^^^^^^^^^^^^ not found in this scope

2
src/test/ui/reserved/reserved-attr-on-macro.stderr
View File

@ -7,7 +7,7 @@ LL | #[rustc_attribute_should_be_reserved]
= help: add #![feature(rustc_attrs)] to the crate attributes to enable
error: cannot determine resolution for the macro `foo`
--> $DIR/reserved-attr-on-macro.rs:18:5
--> $DIR/reserved-attr-on-macro.rs:8:5
|
LL | foo!(); //~ ERROR cannot determine resolution for the macro `foo`
| ^^^

18
src/test/ui/self/self_type_keyword.stderr
View File

@ -5,43 +5,43 @@ LL | struct Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:15:13
--> $DIR/self_type_keyword.rs:16:13
|
LL | ref Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:17:13
--> $DIR/self_type_keyword.rs:18:13
|
LL | mut Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:19:17
--> $DIR/self_type_keyword.rs:20:17
|
LL | ref mut Self => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:23:15
--> $DIR/self_type_keyword.rs:24:15
|
LL | Foo { Self } => (),
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:29:26
--> $DIR/self_type_keyword.rs:30:26
|
LL | extern crate core as Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:34:32
--> $DIR/self_type_keyword.rs:35:32
|
LL | use std::option::Option as Self;
| ^^^^ expected identifier, found keyword
error: expected identifier, found keyword `Self`
--> $DIR/self_type_keyword.rs:39:11
--> $DIR/self_type_keyword.rs:40:11
|
LL | trait Self {}
| ^^^^ expected identifier, found keyword
@ -53,13 +53,13 @@ LL | struct Bar<'Self>;
| ^^^^^
error: cannot find macro `Self!` in this scope
--> $DIR/self_type_keyword.rs:21:9
--> $DIR/self_type_keyword.rs:22:9
|
LL | Self!() => (),
| ^^^^
error[E0392]: parameter `'Self` is never used
--> $DIR/self_type_keyword.rs:18:12
--> $DIR/self_type_keyword.rs:8:12
|
LL | struct Bar<'Self>;
| ^^^^^ unused type parameter

11
src/test/ui/span/macro-ty-params.stderr
View File

@ -1,25 +1,26 @@
error: unexpected generic arguments in path
error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:10:8
|
LL | foo::<T>!(); //~ ERROR generic arguments in macro path
| ^^^^^
error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:10:15
--> $DIR/macro-ty-params.rs:11:8
|
LL | foo::<>!(); //~ ERROR generic arguments in macro path
| ^^^^
error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:8:8
error: unexpected generic arguments in path
--> $DIR/macro-ty-params.rs:12:8
|
LL | m!(Default<>); //~ ERROR generic arguments in macro path
| ^^^^^^^^^
error: generic arguments in macro path
--> $DIR/macro-ty-params.rs:9:8
--> $DIR/macro-ty-params.rs:12:15
|
LL | m!(Default<>); //~ ERROR generic arguments in macro path
| ^^
error: aborting due to 4 previous errors

4
src/test/ui/span/visibility-ty-params.stderr
View File

@ -5,13 +5,13 @@ LL | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
| ^^^^^
error: unexpected generic arguments in path
--> $DIR/visibility-ty-params.rs:9:9
--> $DIR/visibility-ty-params.rs:10:9
|
LL | m!{ m<> } //~ ERROR unexpected generic arguments in path
| ^^^
error[E0577]: expected module, found struct `S`
--> $DIR/visibility-ty-params.rs:16:5
--> $DIR/visibility-ty-params.rs:6:5
|
LL | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
| -^^^^

4
src/test/ui/trace_macros-gate.stderr
View File

@ -7,7 +7,7 @@ LL | trace_macros!(); //~ ERROR `trace_macros` is not stable
= help: add #![feature(trace_macros)] to the crate attributes to enable
error: trace_macros! accepts only `true` or `false`
--> $DIR/trace_macros-gate.rs:14:5
--> $DIR/trace_macros-gate.rs:4:5
|
LL | trace_macros!(); //~ ERROR `trace_macros` is not stable
| ^^^^^^^^^^^^^^^^
@ -29,7 +29,7 @@ LL | trace_macros!(false); //~ ERROR `trace_macros` is not stable
= help: add #![feature(trace_macros)] to the crate attributes to enable
error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598)
--> $DIR/trace_macros-gate.rs:20:26
--> $DIR/trace_macros-gate.rs:10:26
|
LL | ($x: ident) => { trace_macros!($x) } //~ ERROR `trace_macros` is not stable
| ^^^^^^^^^^^^^^^^^

2
src/test/ui/tuple/tuple-struct-fields/test2.stderr
View File

@ -8,7 +8,7 @@ LL | define_struct! { (foo) } //~ ERROR cannot find type `foo` in this scope
| ------------------------ in this macro invocation
error[E0412]: cannot find type `foo` in this scope
--> $DIR/test2.rs:21:23
--> $DIR/test2.rs:11:23
|
LL | define_struct! { (foo) } //~ ERROR cannot find type `foo` in this scope
| ^^^ not found in this scope

2
src/test/ui/tuple/tuple-struct-fields/test3.stderr
View File

@ -8,7 +8,7 @@ LL | define_struct! { foo } //~ ERROR cannot find type `foo` in this scope
| ---------------------- in this macro invocation
error[E0412]: cannot find type `foo` in this scope
--> $DIR/test3.rs:21:22
--> $DIR/test3.rs:11:22
|
LL | define_struct! { foo } //~ ERROR cannot find type `foo` in this scope
| ^^^ not found in this scope