Skip to content

Commit 0182ff6

Browse files
sjakobisjakobi
committed
bless
1 parent 843e1b1 commit 0182ff6

File tree

73 files changed

+1545
-1590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1545
-1590
lines changed

‎src/test/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.before-SimplifyBranches-final.after.diff

Lines changed: 248 additions & 248 deletions
Large diffs are not rendered by default.

‎src/test/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff

Lines changed: 161 additions & 161 deletions
Large diffs are not rendered by default.

‎src/test/ui/associated-type-bounds/ambiguous-associated-type2.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
error[E0391]: cycle detected when computing the super traits of `Baz` with associated type name `Item`
2-
--> $DIR/ambiguous-associated-type2.rs:9:1
2+
--> $DIR/ambiguous-associated-type2.rs:7:1
33
|
44
LL | trait Baz: Foo + Bar<Self::Item> {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: ...which again requires computing the super traits of `Baz` with associated type name `Item`, completing the cycle
88
note: cycle used when computing the super traits of `Baz`
9-
--> $DIR/ambiguous-associated-type2.rs:9:1
9+
--> $DIR/ambiguous-associated-type2.rs:7:1
1010
|
1111
LL | trait Baz: Foo + Bar<Self::Item> {}
1212
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/associated-type-bounds/duplicate.full_tait.stderr

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

‎src/test/ui/associated-type-bounds/duplicate.min_tait.stderr

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

‎src/test/ui/async-await/issue-61949-self-return-type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0760]: `async fn` return type cannot contain a projection or `Self` that references lifetimes from a parent scope
2-
--> $DIR/issue-61949-self-return-type.rs:11:40
2+
--> $DIR/issue-61949-self-return-type.rs:10:40
33
|
44
LL | pub async fn new(_bar: &'a i32) -> Self {
55
| ^^^^ help: consider spelling out the type instead: `Foo<'a>`

‎src/test/ui/borrowck/borrowck-describe-lvalue.stderr

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0499]: cannot borrow `x` as mutable more than once at a time
2-
--> $DIR/borrowck-describe-lvalue.rs:256:13
2+
--> $DIR/borrowck-describe-lvalue.rs:254:13
33
|
44
LL | let y = &mut x;
55
| ------ first mutable borrow occurs here
@@ -9,7 +9,7 @@ LL | *y = 1;
99
| ------ first borrow later used here
1010

1111
error[E0499]: cannot borrow `x` as mutable more than once at a time
12-
--> $DIR/borrowck-describe-lvalue.rs:266:20
12+
--> $DIR/borrowck-describe-lvalue.rs:264:20
1313
|
1414
LL | let y = &mut x;
1515
| ------ first mutable borrow occurs here
@@ -19,7 +19,7 @@ LL | *y = 1;
1919
| ------ first borrow later used here
2020

2121
error: captured variable cannot escape `FnMut` closure body
22-
--> $DIR/borrowck-describe-lvalue.rs:264:16
22+
--> $DIR/borrowck-describe-lvalue.rs:262:16
2323
|
2424
LL | let mut x = 0;
2525
| ----- variable defined here
@@ -38,7 +38,7 @@ LL | | }
3838
= note: ...therefore, they cannot allow references to captured variables to escape
3939

4040
error[E0503]: cannot use `f.x` because it was mutably borrowed
41-
--> $DIR/borrowck-describe-lvalue.rs:39:9
41+
--> $DIR/borrowck-describe-lvalue.rs:37:9
4242
|
4343
LL | let x = f.x();
4444
| - borrow of `f` occurs here
@@ -48,7 +48,7 @@ LL | drop(x);
4848
| - borrow later used here
4949

5050
error[E0503]: cannot use `g.0` because it was mutably borrowed
51-
--> $DIR/borrowck-describe-lvalue.rs:46:9
51+
--> $DIR/borrowck-describe-lvalue.rs:44:9
5252
|
5353
LL | let x = g.x();
5454
| - borrow of `g` occurs here
@@ -58,7 +58,7 @@ LL | drop(x);
5858
| - borrow later used here
5959

6060
error[E0503]: cannot use `h.0` because it was mutably borrowed
61-
--> $DIR/borrowck-describe-lvalue.rs:53:9
61+
--> $DIR/borrowck-describe-lvalue.rs:51:9
6262
|
6363
LL | let x = &mut h.0;
6464
| -------- borrow of `h.0` occurs here
@@ -68,7 +68,7 @@ LL | drop(x);
6868
| - borrow later used here
6969

7070
error[E0503]: cannot use `e.0` because it was mutably borrowed
71-
--> $DIR/borrowck-describe-lvalue.rs:61:20
71+
--> $DIR/borrowck-describe-lvalue.rs:59:20
7272
|
7373
LL | let x = e.x();
7474
| - borrow of `e` occurs here
@@ -80,7 +80,7 @@ LL | drop(x);
8080
| - borrow later used here
8181

8282
error[E0503]: cannot use `u.a` because it was mutably borrowed
83-
--> $DIR/borrowck-describe-lvalue.rs:69:9
83+
--> $DIR/borrowck-describe-lvalue.rs:67:9
8484
|
8585
LL | let x = &mut u.a;
8686
| -------- borrow of `u.a` occurs here
@@ -90,7 +90,7 @@ LL | drop(x);
9090
| - borrow later used here
9191

9292
error[E0503]: cannot use `f.x` because it was mutably borrowed
93-
--> $DIR/borrowck-describe-lvalue.rs:76:9
93+
--> $DIR/borrowck-describe-lvalue.rs:74:9
9494
|
9595
LL | let x = f.x();
9696
| - borrow of `*f` occurs here
@@ -100,7 +100,7 @@ LL | drop(x);
100100
| - borrow later used here
101101

102102
error[E0503]: cannot use `g.0` because it was mutably borrowed
103-
--> $DIR/borrowck-describe-lvalue.rs:83:9
103+
--> $DIR/borrowck-describe-lvalue.rs:81:9
104104
|
105105
LL | let x = g.x();
106106
| - borrow of `*g` occurs here
@@ -110,7 +110,7 @@ LL | drop(x);
110110
| - borrow later used here
111111

112112
error[E0503]: cannot use `h.0` because it was mutably borrowed
113-
--> $DIR/borrowck-describe-lvalue.rs:90:9
113+
--> $DIR/borrowck-describe-lvalue.rs:88:9
114114
|
115115
LL | let x = &mut h.0;
116116
| -------- borrow of `h.0` occurs here
@@ -120,7 +120,7 @@ LL | drop(x);
120120
| - borrow later used here
121121

122122
error[E0503]: cannot use `e.0` because it was mutably borrowed
123-
--> $DIR/borrowck-describe-lvalue.rs:98:20
123+
--> $DIR/borrowck-describe-lvalue.rs:96:20
124124
|
125125
LL | let x = e.x();
126126
| - borrow of `*e` occurs here
@@ -132,7 +132,7 @@ LL | drop(x);
132132
| - borrow later used here
133133

134134
error[E0503]: cannot use `u.a` because it was mutably borrowed
135-
--> $DIR/borrowck-describe-lvalue.rs:107:9
135+
--> $DIR/borrowck-describe-lvalue.rs:105:9
136136
|
137137
LL | let x = &mut u.a;
138138
| -------- borrow of `u.a` occurs here
@@ -142,7 +142,7 @@ LL | drop(x);
142142
| - borrow later used here
143143

144144
error[E0503]: cannot use `v[..]` because it was mutably borrowed
145-
--> $DIR/borrowck-describe-lvalue.rs:115:15
145+
--> $DIR/borrowck-describe-lvalue.rs:113:15
146146
|
147147
LL | let x = &mut v;
148148
| ------ borrow of `v` occurs here
@@ -154,7 +154,7 @@ LL | drop(x);
154154
| - borrow later used here
155155

156156
error[E0503]: cannot use `v[..]` because it was mutably borrowed
157-
--> $DIR/borrowck-describe-lvalue.rs:120:18
157+
--> $DIR/borrowck-describe-lvalue.rs:118:18
158158
|
159159
LL | let x = &mut v;
160160
| ------ borrow of `v` occurs here
@@ -166,7 +166,7 @@ LL | drop(x);
166166
| - borrow later used here
167167

168168
error[E0503]: cannot use `v[..]` because it was mutably borrowed
169-
--> $DIR/borrowck-describe-lvalue.rs:125:25
169+
--> $DIR/borrowck-describe-lvalue.rs:123:25
170170
|
171171
LL | let x = &mut v;
172172
| ------ borrow of `v` occurs here
@@ -178,7 +178,7 @@ LL | drop(x);
178178
| - borrow later used here
179179

180180
error[E0503]: cannot use `v[..]` because it was mutably borrowed
181-
--> $DIR/borrowck-describe-lvalue.rs:130:28
181+
--> $DIR/borrowck-describe-lvalue.rs:128:28
182182
|
183183
LL | let x = &mut v;
184184
| ------ borrow of `v` occurs here
@@ -190,7 +190,7 @@ LL | drop(x);
190190
| - borrow later used here
191191

192192
error[E0503]: cannot use `v[..]` because it was mutably borrowed
193-
--> $DIR/borrowck-describe-lvalue.rs:141:15
193+
--> $DIR/borrowck-describe-lvalue.rs:139:15
194194
|
195195
LL | let x = &mut v;
196196
| ------ borrow of `v` occurs here
@@ -202,7 +202,7 @@ LL | drop(x);
202202
| - borrow later used here
203203

204204
error[E0503]: cannot use `v[..]` because it was mutably borrowed
205-
--> $DIR/borrowck-describe-lvalue.rs:146:18
205+
--> $DIR/borrowck-describe-lvalue.rs:144:18
206206
|
207207
LL | let x = &mut v;
208208
| ------ borrow of `v` occurs here
@@ -214,7 +214,7 @@ LL | drop(x);
214214
| - borrow later used here
215215

216216
error[E0503]: cannot use `v[..]` because it was mutably borrowed
217-
--> $DIR/borrowck-describe-lvalue.rs:151:15
217+
--> $DIR/borrowck-describe-lvalue.rs:149:15
218218
|
219219
LL | let x = &mut v;
220220
| ------ borrow of `v` occurs here
@@ -226,7 +226,7 @@ LL | drop(x);
226226
| - borrow later used here
227227

228228
error[E0503]: cannot use `v[..]` because it was mutably borrowed
229-
--> $DIR/borrowck-describe-lvalue.rs:156:18
229+
--> $DIR/borrowck-describe-lvalue.rs:154:18
230230
|
231231
LL | let x = &mut v;
232232
| ------ borrow of `v` occurs here
@@ -238,7 +238,7 @@ LL | drop(x);
238238
| - borrow later used here
239239

240240
error[E0503]: cannot use `e` because it was mutably borrowed
241-
--> $DIR/borrowck-describe-lvalue.rs:169:13
241+
--> $DIR/borrowck-describe-lvalue.rs:167:13
242242
|
243243
LL | let x = &mut e;
244244
| ------ borrow of `e` occurs here
@@ -250,7 +250,7 @@ LL | drop(x);
250250
| - borrow later used here
251251

252252
error[E0502]: cannot borrow `e.0` as immutable because it is also borrowed as mutable
253-
--> $DIR/borrowck-describe-lvalue.rs:169:18
253+
--> $DIR/borrowck-describe-lvalue.rs:167:18
254254
|
255255
LL | let x = &mut e;
256256
| ------ mutable borrow occurs here
@@ -262,7 +262,7 @@ LL | drop(x);
262262
| - mutable borrow later used here
263263

264264
error[E0502]: cannot borrow `e.x` as immutable because it is also borrowed as mutable
265-
--> $DIR/borrowck-describe-lvalue.rs:173:23
265+
--> $DIR/borrowck-describe-lvalue.rs:171:23
266266
|
267267
LL | let x = &mut e;
268268
| ------ mutable borrow occurs here
@@ -274,7 +274,7 @@ LL | drop(x);
274274
| - mutable borrow later used here
275275

276276
error[E0502]: cannot borrow `s.y.0` as immutable because it is also borrowed as mutable
277-
--> $DIR/borrowck-describe-lvalue.rs:186:22
277+
--> $DIR/borrowck-describe-lvalue.rs:184:22
278278
|
279279
LL | let x = &mut s;
280280
| ------ mutable borrow occurs here
@@ -286,7 +286,7 @@ LL | drop(x);
286286
| - mutable borrow later used here
287287

288288
error[E0502]: cannot borrow `s.x.y` as immutable because it is also borrowed as mutable
289-
--> $DIR/borrowck-describe-lvalue.rs:192:28
289+
--> $DIR/borrowck-describe-lvalue.rs:190:28
290290
|
291291
LL | let x = &mut s;
292292
| ------ mutable borrow occurs here
@@ -298,7 +298,7 @@ LL | drop(x);
298298
| - mutable borrow later used here
299299

300300
error[E0503]: cannot use `*v` because it was mutably borrowed
301-
--> $DIR/borrowck-describe-lvalue.rs:234:9
301+
--> $DIR/borrowck-describe-lvalue.rs:232:9
302302
|
303303
LL | let x = &mut v;
304304
| ------ borrow of `v` occurs here
@@ -309,7 +309,7 @@ LL | drop(x);
309309
| - borrow later used here
310310

311311
error[E0503]: cannot use `v[_].y` because it was mutably borrowed
312-
--> $DIR/borrowck-describe-lvalue.rs:234:9
312+
--> $DIR/borrowck-describe-lvalue.rs:232:9
313313
|
314314
LL | let x = &mut v;
315315
| ------ borrow of `v` occurs here
@@ -320,7 +320,7 @@ LL | drop(x);
320320
| - borrow later used here
321321

322322
error[E0502]: cannot borrow `v[..].x` as immutable because it is also borrowed as mutable
323-
--> $DIR/borrowck-describe-lvalue.rs:245:24
323+
--> $DIR/borrowck-describe-lvalue.rs:243:24
324324
|
325325
LL | let x = &mut v;
326326
| ------ mutable borrow occurs here
@@ -332,7 +332,7 @@ LL | drop(x);
332332
| - mutable borrow later used here
333333

334334
error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable
335-
--> $DIR/borrowck-describe-lvalue.rs:208:29
335+
--> $DIR/borrowck-describe-lvalue.rs:206:29
336336
|
337337
LL | let x = &mut block;
338338
| ---------- mutable borrow occurs here
@@ -343,7 +343,7 @@ LL | drop(x);
343343
| - mutable borrow later used here
344344

345345
error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable
346-
--> $DIR/borrowck-describe-lvalue.rs:223:33
346+
--> $DIR/borrowck-describe-lvalue.rs:221:33
347347
|
348348
LL | let x = &mut block;
349349
| ---------- mutable borrow occurs here
@@ -354,7 +354,7 @@ LL | drop(x);
354354
| - mutable borrow later used here
355355

356356
error[E0382]: use of moved value: `x`
357-
--> $DIR/borrowck-describe-lvalue.rs:276:22
357+
--> $DIR/borrowck-describe-lvalue.rs:274:22
358358
|
359359
LL | drop(x);
360360
| - value moved here

0 commit comments

Comments
 (0)