Skip to content

Commit 4bf35f9

Browse files
pvdrzpvdrz
committed
updated stderr files and removed feature-gate test for dyn_trait
1 parent 55a653d commit 4bf35f9

18 files changed

+133
-147
lines changed

‎src/test/ui/feature-gate-dyn-trait.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/test/ui/impl_trait_projections.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error[E0667]: `impl Trait` is not allowed in path parameters
2-
--> $DIR/impl_trait_projections.rs:23:51
2+
--> $DIR/impl_trait_projections.rs:24:51
33
|
44
LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
55
| ^^^^^^^^^^^^^
66

77
error[E0667]: `impl Trait` is not allowed in path parameters
8-
--> $DIR/impl_trait_projections.rs:30:9
8+
--> $DIR/impl_trait_projections.rs:31:9
99
|
1010
LL | -> <impl Iterator as Iterator>::Item
1111
| ^^^^^^^^^^^^^
1212

1313
error[E0667]: `impl Trait` is not allowed in path parameters
14-
--> $DIR/impl_trait_projections.rs:37:27
14+
--> $DIR/impl_trait_projections.rs:38:27
1515
|
1616
LL | -> <::std::ops::Range<impl Debug> as Iterator>::Item
1717
| ^^^^^^^^^^
1818

1919
error[E0667]: `impl Trait` is not allowed in path parameters
20-
--> $DIR/impl_trait_projections.rs:44:29
20+
--> $DIR/impl_trait_projections.rs:45:29
2121
|
2222
LL | -> <dyn Iterator<Item = impl Debug> as Iterator>::Item
2323
| ^^^^^^^^^^
2424

2525
error[E0223]: ambiguous associated type
26-
--> $DIR/impl_trait_projections.rs:23:50
26+
--> $DIR/impl_trait_projections.rs:24:50
2727
|
2828
LL | fn projection_is_disallowed(x: impl Iterator) -> <impl Iterator>::Item {
2929
| ^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type

‎src/test/ui/in-band-lifetimes/impl/dyn-trait.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements
2-
--> $DIR/dyn-trait.rs:33:16
2+
--> $DIR/dyn-trait.rs:32:16
33
|
44
LL | static_val(x); //~ ERROR cannot infer
55
| ^
66
|
7-
note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 32:1...
8-
--> $DIR/dyn-trait.rs:32:1
7+
note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 31:1...
8+
--> $DIR/dyn-trait.rs:31:1
99
|
1010
LL | fn with_dyn_debug_static<'a>(x: Box<dyn Debug + 'a>) {
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
warning: not reporting region error due to nll
2-
--> $DIR/projection-no-regions-closure.rs:36:31
2+
--> $DIR/projection-no-regions-closure.rs:35:31
33
|
44
LL | with_signature(x, |mut y| Box::new(y.next()))
55
| ^^^^^^^^^^^^^^^^^^
66

77
warning: not reporting region error due to nll
8-
--> $DIR/projection-no-regions-closure.rs:54:31
8+
--> $DIR/projection-no-regions-closure.rs:53:31
99
|
1010
LL | with_signature(x, |mut y| Box::new(y.next()))
1111
| ^^^^^^^^^^^^^^^^^^
1212

1313
note: External requirements
14-
--> $DIR/projection-no-regions-closure.rs:36:23
14+
--> $DIR/projection-no-regions-closure.rs:35:23
1515
|
1616
LL | with_signature(x, |mut y| Box::new(y.next()))
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -26,15 +26,15 @@ LL | with_signature(x, |mut y| Box::new(y.next()))
2626
= note: where <T as std::iter::Iterator>::Item: '_#2r
2727

2828
error[E0309]: the associated type `<T as std::iter::Iterator>::Item` may not live long enough
29-
--> $DIR/projection-no-regions-closure.rs:36:23
29+
--> $DIR/projection-no-regions-closure.rs:35:23
3030
|
3131
LL | with_signature(x, |mut y| Box::new(y.next()))
3232
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3333
|
3434
= help: consider adding an explicit lifetime bound `<T as std::iter::Iterator>::Item: ReEarlyBound(0, 'a)`...
3535

3636
note: No external requirements
37-
--> $DIR/projection-no-regions-closure.rs:32:1
37+
--> $DIR/projection-no-regions-closure.rs:31:1
3838
|
3939
LL | / fn no_region<'a, T>(x: Box<T>) -> Box<dyn Anything + 'a>
4040
LL | | where
@@ -51,7 +51,7 @@ LL | | }
5151
]
5252

5353
note: External requirements
54-
--> $DIR/projection-no-regions-closure.rs:46:23
54+
--> $DIR/projection-no-regions-closure.rs:45:23
5555
|
5656
LL | with_signature(x, |mut y| Box::new(y.next()))
5757
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -66,7 +66,7 @@ LL | with_signature(x, |mut y| Box::new(y.next()))
6666
= note: where <T as std::iter::Iterator>::Item: '_#2r
6767

6868
note: No external requirements
69-
--> $DIR/projection-no-regions-closure.rs:42:1
69+
--> $DIR/projection-no-regions-closure.rs:41:1
7070
|
7171
LL | / fn correct_region<'a, T>(x: Box<T>) -> Box<dyn Anything + 'a>
7272
LL | | where
@@ -82,7 +82,7 @@ LL | | }
8282
]
8383

8484
note: External requirements
85-
--> $DIR/projection-no-regions-closure.rs:54:23
85+
--> $DIR/projection-no-regions-closure.rs:53:23
8686
|
8787
LL | with_signature(x, |mut y| Box::new(y.next()))
8888
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -98,15 +98,15 @@ LL | with_signature(x, |mut y| Box::new(y.next()))
9898
= note: where <T as std::iter::Iterator>::Item: '_#3r
9999

100100
error[E0309]: the associated type `<T as std::iter::Iterator>::Item` may not live long enough
101-
--> $DIR/projection-no-regions-closure.rs:54:23
101+
--> $DIR/projection-no-regions-closure.rs:53:23
102102
|
103103
LL | with_signature(x, |mut y| Box::new(y.next()))
104104
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
105105
|
106106
= help: consider adding an explicit lifetime bound `<T as std::iter::Iterator>::Item: ReEarlyBound(0, 'a)`...
107107

108108
note: No external requirements
109-
--> $DIR/projection-no-regions-closure.rs:50:1
109+
--> $DIR/projection-no-regions-closure.rs:49:1
110110
|
111111
LL | / fn wrong_region<'a, 'b, T>(x: Box<T>) -> Box<dyn Anything + 'a>
112112
LL | | where
@@ -124,7 +124,7 @@ LL | | }
124124
]
125125

126126
note: External requirements
127-
--> $DIR/projection-no-regions-closure.rs:65:23
127+
--> $DIR/projection-no-regions-closure.rs:64:23
128128
|
129129
LL | with_signature(x, |mut y| Box::new(y.next()))
130130
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -140,7 +140,7 @@ LL | with_signature(x, |mut y| Box::new(y.next()))
140140
= note: where <T as std::iter::Iterator>::Item: '_#3r
141141

142142
note: No external requirements
143-
--> $DIR/projection-no-regions-closure.rs:60:1
143+
--> $DIR/projection-no-regions-closure.rs:59:1
144144
|
145145
LL | / fn outlives_region<'a, 'b, T>(x: Box<T>) -> Box<dyn Anything + 'a>
146146
LL | | where

‎src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
warning: not reporting region error due to nll
2-
--> $DIR/projection-no-regions-fn.rs:24:5
2+
--> $DIR/projection-no-regions-fn.rs:23:5
33
|
44
LL | Box::new(x.next())
55
| ^^^^^^^^^^^^^^^^^^
66

77
warning: not reporting region error due to nll
8-
--> $DIR/projection-no-regions-fn.rs:40:5
8+
--> $DIR/projection-no-regions-fn.rs:39:5
99
|
1010
LL | Box::new(x.next())
1111
| ^^^^^^^^^^^^^^^^^^
1212

1313
error[E0309]: the associated type `<T as std::iter::Iterator>::Item` may not live long enough
14-
--> $DIR/projection-no-regions-fn.rs:24:5
14+
--> $DIR/projection-no-regions-fn.rs:23:5
1515
|
1616
LL | Box::new(x.next())
1717
| ^^^^^^^^^^^^^^^^^^
1818
|
1919
= help: consider adding an explicit lifetime bound `<T as std::iter::Iterator>::Item: ReEarlyBound(0, 'a)`...
2020

2121
error[E0309]: the associated type `<T as std::iter::Iterator>::Item` may not live long enough
22-
--> $DIR/projection-no-regions-fn.rs:40:5
22+
--> $DIR/projection-no-regions-fn.rs:39:5
2323
|
2424
LL | Box::new(x.next())
2525
| ^^^^^^^^^^^^^^^^^^

‎src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
warning: not reporting region error due to nll
2-
--> $DIR/projection-one-region-closure.rs:56:39
2+
--> $DIR/projection-one-region-closure.rs:55:39
33
|
44
LL | with_signature(cell, t, |cell, t| require(cell, t));
55
| ^^^^^^^
66

77
warning: not reporting region error due to nll
8-
--> $DIR/projection-one-region-closure.rs:68:39
8+
--> $DIR/projection-one-region-closure.rs:67:39
99
|
1010
LL | with_signature(cell, t, |cell, t| require(cell, t));
1111
| ^^^^^^^
1212

1313
warning: not reporting region error due to nll
14-
--> $DIR/projection-one-region-closure.rs:90:39
14+
--> $DIR/projection-one-region-closure.rs:89:39
1515
|
1616
LL | with_signature(cell, t, |cell, t| require(cell, t));
1717
| ^^^^^^^
1818

1919
note: External requirements
20-
--> $DIR/projection-one-region-closure.rs:56:29
20+
--> $DIR/projection-one-region-closure.rs:55:29
2121
|
2222
LL | with_signature(cell, t, |cell, t| require(cell, t));
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -33,21 +33,21 @@ LL | with_signature(cell, t, |cell, t| require(cell, t));
3333
= note: where '_#1r: '_#2r
3434

3535
error[E0309]: the parameter type `T` may not live long enough
36-
--> $DIR/projection-one-region-closure.rs:56:29
36+
--> $DIR/projection-one-region-closure.rs:55:29
3737
|
3838
LL | with_signature(cell, t, |cell, t| require(cell, t));
3939
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4040
|
4141
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0/0:8 ~ projection_one_region_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(1:16), 'a))`...
4242

4343
error: free region `ReEarlyBound(0, 'b)` does not outlive free region `ReFree(DefId(0/0:8 ~ projection_one_region_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(1:16), 'a))`
44-
--> $DIR/projection-one-region-closure.rs:56:20
44+
--> $DIR/projection-one-region-closure.rs:55:20
4545
|
4646
LL | with_signature(cell, t, |cell, t| require(cell, t));
4747
| ^^^^
4848

4949
note: No external requirements
50-
--> $DIR/projection-one-region-closure.rs:52:1
50+
--> $DIR/projection-one-region-closure.rs:51:1
5151
|
5252
LL | / fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T)
5353
LL | | where
@@ -64,7 +64,7 @@ LL | | }
6464
]
6565

6666
note: External requirements
67-
--> $DIR/projection-one-region-closure.rs:68:29
67+
--> $DIR/projection-one-region-closure.rs:67:29
6868
|
6969
LL | with_signature(cell, t, |cell, t| require(cell, t));
7070
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -81,21 +81,21 @@ LL | with_signature(cell, t, |cell, t| require(cell, t));
8181
= note: where '_#2r: '_#3r
8282

8383
error[E0309]: the parameter type `T` may not live long enough
84-
--> $DIR/projection-one-region-closure.rs:68:29
84+
--> $DIR/projection-one-region-closure.rs:67:29
8585
|
8686
LL | with_signature(cell, t, |cell, t| require(cell, t));
8787
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
8888
|
8989
= help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`...
9090

9191
error: free region `ReEarlyBound(1, 'b)` does not outlive free region `ReEarlyBound(0, 'a)`
92-
--> $DIR/projection-one-region-closure.rs:68:20
92+
--> $DIR/projection-one-region-closure.rs:67:20
9393
|
9494
LL | with_signature(cell, t, |cell, t| require(cell, t));
9595
| ^^^^
9696

9797
note: No external requirements
98-
--> $DIR/projection-one-region-closure.rs:63:1
98+
--> $DIR/projection-one-region-closure.rs:62:1
9999
|
100100
LL | / fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T)
101101
LL | | where
@@ -113,7 +113,7 @@ LL | | }
113113
]
114114

115115
note: External requirements
116-
--> $DIR/projection-one-region-closure.rs:90:29
116+
--> $DIR/projection-one-region-closure.rs:89:29
117117
|
118118
LL | with_signature(cell, t, |cell, t| require(cell, t));
119119
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -130,21 +130,21 @@ LL | with_signature(cell, t, |cell, t| require(cell, t));
130130
= note: where '_#2r: '_#3r
131131

132132
error[E0309]: the parameter type `T` may not live long enough
133-
--> $DIR/projection-one-region-closure.rs:90:29
133+
--> $DIR/projection-one-region-closure.rs:89:29
134134
|
135135
LL | with_signature(cell, t, |cell, t| require(cell, t));
136136
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
137137
|
138138
= help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`...
139139

140140
error: free region `ReEarlyBound(1, 'b)` does not outlive free region `ReEarlyBound(0, 'a)`
141-
--> $DIR/projection-one-region-closure.rs:90:20
141+
--> $DIR/projection-one-region-closure.rs:89:20
142142
|
143143
LL | with_signature(cell, t, |cell, t| require(cell, t));
144144
| ^^^^
145145

146146
note: No external requirements
147-
--> $DIR/projection-one-region-closure.rs:75:1
147+
--> $DIR/projection-one-region-closure.rs:74:1
148148
|
149149
LL | / fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T)
150150
LL | | where
@@ -162,7 +162,7 @@ LL | | }
162162
]
163163

164164
note: External requirements
165-
--> $DIR/projection-one-region-closure.rs:103:29
165+
--> $DIR/projection-one-region-closure.rs:102:29
166166
|
167167
LL | with_signature(cell, t, |cell, t| require(cell, t));
168168
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -179,7 +179,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t));
179179
= note: where '_#2r: '_#3r
180180

181181
note: No external requirements
182-
--> $DIR/projection-one-region-closure.rs:97:1
182+
--> $DIR/projection-one-region-closure.rs:96:1
183183
|
184184
LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T)
185185
LL | | where

0 commit comments

Comments
 (0)