Skip to content

Commit bc16ede

Browse files
petrochenkovpetrochenkov
committed
Fix rebase and more CI failures
1 parent 37af04f commit bc16ede

33 files changed

+136
-130
lines changed

‎src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ LL | #[derive(Clone)]
55
| ^^^^^^^^^^^^^^^^
66

77
error: `derive` may only be applied to structs, enums and unions
8-
--> $DIR/derive-on-trait-item-or-impl-item.rs:8:5
8+
--> $DIR/derive-on-trait-item-or-impl-item.rs:10:5
99
|
1010
LL | #[derive(Clone)]
1111
| ^^^^^^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
14+

‎src/test/ui/did_you_mean/issue-40396.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: chained comparison operators require parentheses
2-
--> $DIR/issue-40396.rs:2:37
2+
--> $DIR/issue-40396.rs:2:20
33
|
44
LL | (0..13).collect<Vec<i32>>();
55
| ^^^^^^^^
@@ -8,7 +8,7 @@ LL | (0..13).collect<Vec<i32>>();
88
= help: or use `(...)` if you meant to specify fn arguments
99

1010
error: chained comparison operators require parentheses
11-
--> $DIR/issue-40396.rs:6:25
11+
--> $DIR/issue-40396.rs:10:8
1212
|
1313
LL | Vec<i32>::new();
1414
| ^^^^^^^
@@ -17,7 +17,7 @@ LL | Vec<i32>::new();
1717
= help: or use `(...)` if you meant to specify fn arguments
1818

1919
error: chained comparison operators require parentheses
20-
--> $DIR/issue-40396.rs:10:37
20+
--> $DIR/issue-40396.rs:18:20
2121
|
2222
LL | (0..13).collect<Vec<i32>();
2323
| ^^^^^^^^
@@ -26,7 +26,7 @@ LL | (0..13).collect<Vec<i32>();
2626
= help: or use `(...)` if you meant to specify fn arguments
2727

2828
error: chained comparison operators require parentheses
29-
--> $DIR/issue-40396.rs:10:41
29+
--> $DIR/issue-40396.rs:18:24
3030
|
3131
LL | (0..13).collect<Vec<i32>();
3232
| ^^^^^^
@@ -35,65 +35,65 @@ LL | (0..13).collect<Vec<i32>();
3535
= help: or use `(...)` if you meant to specify fn arguments
3636

3737
error[E0423]: expected value, found struct `Vec`
38-
--> $DIR/issue-40396.rs:12:21
38+
--> $DIR/issue-40396.rs:2:21
3939
|
4040
LL | (0..13).collect<Vec<i32>>();
4141
| ^^^ did you mean `Vec { /* fields */ }`?
4242

4343
error[E0423]: expected value, found builtin type `i32`
44-
--> $DIR/issue-40396.rs:12:25
44+
--> $DIR/issue-40396.rs:2:25
4545
|
4646
LL | (0..13).collect<Vec<i32>>();
4747
| ^^^ not a value
4848

4949
error[E0423]: expected value, found struct `Vec`
50-
--> $DIR/issue-40396.rs:20:5
50+
--> $DIR/issue-40396.rs:10:5
5151
|
5252
LL | Vec<i32>::new();
5353
| ^^^ did you mean `Vec { /* fields */ }`?
5454

5555
error[E0423]: expected value, found builtin type `i32`
56-
--> $DIR/issue-40396.rs:20:9
56+
--> $DIR/issue-40396.rs:10:9
5757
|
5858
LL | Vec<i32>::new();
5959
| ^^^ not a value
6060

6161
error[E0425]: cannot find function `new` in the crate root
62-
--> $DIR/issue-40396.rs:20:15
62+
--> $DIR/issue-40396.rs:10:15
6363
|
6464
LL | Vec<i32>::new();
6565
| ^^^ not found in the crate root
6666

6767
error[E0423]: expected value, found struct `Vec`
68-
--> $DIR/issue-40396.rs:28:21
68+
--> $DIR/issue-40396.rs:18:21
6969
|
7070
LL | (0..13).collect<Vec<i32>();
7171
| ^^^ did you mean `Vec { /* fields */ }`?
7272

7373
error[E0423]: expected value, found builtin type `i32`
74-
--> $DIR/issue-40396.rs:28:25
74+
--> $DIR/issue-40396.rs:18:25
7575
|
7676
LL | (0..13).collect<Vec<i32>();
7777
| ^^^ not a value
7878

7979
error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
80-
--> $DIR/issue-40396.rs:12:13
80+
--> $DIR/issue-40396.rs:2:13
8181
|
8282
LL | (0..13).collect<Vec<i32>>();
8383
| ^^^^^^^
8484
|
8585
= help: maybe a `()` to call it is missing?
8686

8787
error[E0615]: attempted to take value of method `collect` on type `std::ops::Range<{integer}>`
88-
--> $DIR/issue-40396.rs:28:13
88+
--> $DIR/issue-40396.rs:18:13
8989
|
9090
LL | (0..13).collect<Vec<i32>();
9191
| ^^^^^^^
9292
|
9393
= help: maybe a `()` to call it is missing?
9494

9595
error[E0308]: mismatched types
96-
--> $DIR/issue-40396.rs:28:29
96+
--> $DIR/issue-40396.rs:18:29
9797
|
9898
LL | (0..13).collect<Vec<i32>();
9999
| ^^ expected bool, found ()

‎src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
error: no rules expected the token `r#async`
2-
--> $DIR/edition-keywords-2015-2015-parsing.rs:12:31
2+
--> $DIR/edition-keywords-2015-2015-parsing.rs:16:31
33
|
44
LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
55
| ^^^^^^^ no rules expected this token in macro call
66

77
error: no rules expected the token `async`
8-
--> $DIR/edition-keywords-2015-2015-parsing.rs:13:35
8+
--> $DIR/edition-keywords-2015-2015-parsing.rs:17:35
99
|
1010
LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
1111
| ^^^^^ no rules expected this token in macro call
1212

1313
error: aborting due to 2 previous errors
14+

‎src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
error: no rules expected the token `r#async`
2-
--> $DIR/edition-keywords-2015-2018-parsing.rs:12:31
2+
--> $DIR/edition-keywords-2015-2018-parsing.rs:16:31
33
|
44
LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
55
| ^^^^^^^ no rules expected this token in macro call
66

77
error: no rules expected the token `async`
8-
--> $DIR/edition-keywords-2015-2018-parsing.rs:13:35
8+
--> $DIR/edition-keywords-2015-2018-parsing.rs:17:35
99
|
1010
LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
1111
| ^^^^^ no rules expected this token in macro call
1212

1313
error: aborting due to 2 previous errors
14+

‎src/test/ui/feature-gates/feature-gate-asm2.stderr

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

‎src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,141 @@
11
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
2-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:13:7
2+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:15:7
33
|
44
LL | #[cfg(target_has_atomic = "8")]
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
88

99
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
10-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:19:7
10+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:21:7
1111
|
1212
LL | #[cfg(target_has_atomic = "8")]
1313
| ^^^^^^^^^^^^^^^^^^^^^^^
1414
|
1515
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
1616

1717
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
18-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:24:7
18+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:26:7
1919
|
2020
LL | #[cfg(target_has_atomic = "16")]
2121
| ^^^^^^^^^^^^^^^^^^^^^^^^
2222
|
2323
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
2424

2525
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
26-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:29:7
26+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:31:7
2727
|
2828
LL | #[cfg(target_has_atomic = "16")]
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^
3030
|
3131
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
3232

3333
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
34-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:34:7
34+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:36:7
3535
|
3636
LL | #[cfg(target_has_atomic = "32")]
3737
| ^^^^^^^^^^^^^^^^^^^^^^^^
3838
|
3939
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
4040

4141
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
42-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:39:7
42+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:41:7
4343
|
4444
LL | #[cfg(target_has_atomic = "32")]
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^
4646
|
4747
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
4848

4949
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
50-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:44:7
50+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:46:7
5151
|
5252
LL | #[cfg(target_has_atomic = "64")]
5353
| ^^^^^^^^^^^^^^^^^^^^^^^^
5454
|
5555
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
5656

5757
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
58-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:49:7
58+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:51:7
5959
|
6060
LL | #[cfg(target_has_atomic = "64")]
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^
6262
|
6363
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
6464

6565
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
66-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:54:7
66+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:56:7
6767
|
6868
LL | #[cfg(target_has_atomic = "128")]
6969
| ^^^^^^^^^^^^^^^^^^^^^^^^^
7070
|
7171
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
7272

7373
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
74-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:59:7
74+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:61:7
7575
|
7676
LL | #[cfg(target_has_atomic = "128")]
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^
7878
|
7979
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
8080

8181
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
82-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:64:7
82+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:66:7
8383
|
8484
LL | #[cfg(target_has_atomic = "ptr")]
8585
| ^^^^^^^^^^^^^^^^^^^^^^^^^
8686
|
8787
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
8888

8989
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
90-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:69:7
90+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:71:7
9191
|
9292
LL | #[cfg(target_has_atomic = "ptr")]
9393
| ^^^^^^^^^^^^^^^^^^^^^^^^^
9494
|
9595
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
9696

9797
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
98-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:76:10
98+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:78:10
9999
|
100100
LL | cfg!(target_has_atomic = "8");
101101
| ^^^^^^^^^^^^^^^^^^^^^^^
102102
|
103103
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
104104

105105
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
106-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:78:10
106+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:80:10
107107
|
108108
LL | cfg!(target_has_atomic = "16");
109109
| ^^^^^^^^^^^^^^^^^^^^^^^^
110110
|
111111
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
112112

113113
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
114-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:80:10
114+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:82:10
115115
|
116116
LL | cfg!(target_has_atomic = "32");
117117
| ^^^^^^^^^^^^^^^^^^^^^^^^
118118
|
119119
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
120120

121121
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
122-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:82:10
122+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:84:10
123123
|
124124
LL | cfg!(target_has_atomic = "64");
125125
| ^^^^^^^^^^^^^^^^^^^^^^^^
126126
|
127127
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
128128

129129
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
130-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:84:10
130+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:86:10
131131
|
132132
LL | cfg!(target_has_atomic = "128");
133133
| ^^^^^^^^^^^^^^^^^^^^^^^^^
134134
|
135135
= help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable
136136

137137
error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976)
138-
--> $DIR/feature-gate-cfg-target-has-atomic.rs:86:10
138+
--> $DIR/feature-gate-cfg-target-has-atomic.rs:88:10
139139
|
140140
LL | cfg!(target_has_atomic = "ptr");
141141
| ^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/feature-gates/feature-gate-concat_idents2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
77
= help: add #![feature(concat_idents)] to the crate attributes to enable
88

99
error[E0425]: cannot find value `ab` in this scope
10-
--> $DIR/feature-gate-concat_idents2.rs:14:5
10+
--> $DIR/feature-gate-concat_idents2.rs:4:5
1111
|
1212
LL | concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
1313
| ^^^^^^^^^^^^^^^^^^^^^ not found in this scope

‎src/test/ui/feature-gates/feature-gate-log_syntax2.stderr

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

‎src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr

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

‎src/test/ui/issues/issue-10536.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: macros that expand to items must either be surrounded with braces or followed by a semicolon
2-
--> $DIR/issue-10536.rs:16:22
2+
--> $DIR/issue-10536.rs:14:22
33
|
44
LL | assert!({one! two()});
55
| ^^
@@ -11,13 +11,13 @@ LL | assert!({one! two});
1111
| ^ expected `(` or `{`
1212

1313
error: cannot find macro `one!` in this scope
14-
--> $DIR/issue-10536.rs:24:14
14+
--> $DIR/issue-10536.rs:14:14
1515
|
1616
LL | assert!({one! two()});
1717
| ^^^
1818

1919
error[E0308]: mismatched types
20-
--> $DIR/issue-10536.rs:24:13
20+
--> $DIR/issue-10536.rs:14:13
2121
|
2222
LL | assert!({one! two()});
2323
| ^^^^^^^^^^^^ expected bool, found ()

‎src/test/ui/issues/issue-11692-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | print!("{}", testo!());
99
| ^^^^^
1010

1111
error: cannot find macro `testo!` in this scope
12-
--> $DIR/issue-11692-1.rs:12:12
12+
--> $DIR/issue-11692-1.rs:2:12
1313
|
1414
LL | print!(testo!());
1515
| ^^^^^

‎src/test/ui/issues/issue-11692-2.stderr

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

‎src/test/ui/issues/issue-32950.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | concat_idents!(Foo, Bar) //~ ERROR `derive` cannot be used on items wit
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
66

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

0 commit comments

Comments
 (0)