Skip to content

Commit 04c2761

Browse files
KivooeoKivooeo
committed
try solve conflict
1 parent 49046a0 commit 04c2761

File tree

3 files changed

+50
-49
lines changed

3 files changed

+50
-49
lines changed

‎tests/ui/drop/drop-order-comparisons.e2021.fixed‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
//@ [e2024] edition: 2024
2525
//@ run-pass
2626

27+
#![feature(if_let_guard)]
2728
#![cfg_attr(e2021, feature(let_chains))]
2829
#![cfg_attr(e2021, warn(rust_2024_compatibility))]
2930

‎tests/ui/drop/drop-order-comparisons.e2021.stderr‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: relative drop order changing in Rust 2024
2-
--> $DIR/drop-order-comparisons.rs:76:9
2+
--> $DIR/drop-order-comparisons.rs:77:9
33
|
44
LL | _ = ({
55
| _________-
@@ -29,35 +29,35 @@ LL | | }, e.mark(3), e.ok(4));
2929
= warning: this changes meaning in Rust 2024
3030
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
3131
note: `#3` invokes this custom destructor
32-
--> $DIR/drop-order-comparisons.rs:611:1
32+
--> $DIR/drop-order-comparisons.rs:612:1
3333
|
3434
LL | impl<'b> Drop for LogDrop<'b> {
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636
note: `#1` invokes this custom destructor
37-
--> $DIR/drop-order-comparisons.rs:611:1
37+
--> $DIR/drop-order-comparisons.rs:612:1
3838
|
3939
LL | impl<'b> Drop for LogDrop<'b> {
4040
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4141
note: `_v` invokes this custom destructor
42-
--> $DIR/drop-order-comparisons.rs:611:1
42+
--> $DIR/drop-order-comparisons.rs:612:1
4343
|
4444
LL | impl<'b> Drop for LogDrop<'b> {
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4646
note: `#2` invokes this custom destructor
47-
--> $DIR/drop-order-comparisons.rs:611:1
47+
--> $DIR/drop-order-comparisons.rs:612:1
4848
|
4949
LL | impl<'b> Drop for LogDrop<'b> {
5050
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5151
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
5252
note: the lint level is defined here
53-
--> $DIR/drop-order-comparisons.rs:28:25
53+
--> $DIR/drop-order-comparisons.rs:29:25
5454
|
5555
LL | #![cfg_attr(e2021, warn(rust_2024_compatibility))]
5656
| ^^^^^^^^^^^^^^^^^^^^^^^
5757
= note: `#[warn(tail_expr_drop_order)]` implied by `#[warn(rust_2024_compatibility)]`
5858

5959
warning: relative drop order changing in Rust 2024
60-
--> $DIR/drop-order-comparisons.rs:100:45
60+
--> $DIR/drop-order-comparisons.rs:101:45
6161
|
6262
LL | _ = ({
6363
| _________-
@@ -77,19 +77,19 @@ LL | | }, e.mark(1), e.ok(4));
7777
= warning: this changes meaning in Rust 2024
7878
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
7979
note: `#2` invokes this custom destructor
80-
--> $DIR/drop-order-comparisons.rs:611:1
80+
--> $DIR/drop-order-comparisons.rs:612:1
8181
|
8282
LL | impl<'b> Drop for LogDrop<'b> {
8383
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8484
note: `#1` invokes this custom destructor
85-
--> $DIR/drop-order-comparisons.rs:611:1
85+
--> $DIR/drop-order-comparisons.rs:612:1
8686
|
8787
LL | impl<'b> Drop for LogDrop<'b> {
8888
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8989
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
9090

9191
warning: relative drop order changing in Rust 2024
92-
--> $DIR/drop-order-comparisons.rs:100:19
92+
--> $DIR/drop-order-comparisons.rs:101:19
9393
|
9494
LL | _ = ({
9595
| _________-
@@ -109,19 +109,19 @@ LL | | }, e.mark(1), e.ok(4));
109109
= warning: this changes meaning in Rust 2024
110110
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
111111
note: `#2` invokes this custom destructor
112-
--> $DIR/drop-order-comparisons.rs:611:1
112+
--> $DIR/drop-order-comparisons.rs:612:1
113113
|
114114
LL | impl<'b> Drop for LogDrop<'b> {
115115
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
116116
note: `#1` invokes this custom destructor
117-
--> $DIR/drop-order-comparisons.rs:611:1
117+
--> $DIR/drop-order-comparisons.rs:612:1
118118
|
119119
LL | impl<'b> Drop for LogDrop<'b> {
120120
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
121121
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
122122

123123
warning: relative drop order changing in Rust 2024
124-
--> $DIR/drop-order-comparisons.rs:221:24
124+
--> $DIR/drop-order-comparisons.rs:222:24
125125
|
126126
LL | _ = ({
127127
| _________-
@@ -141,19 +141,19 @@ LL | | }, e.mark(2), e.ok(3));
141141
= warning: this changes meaning in Rust 2024
142142
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
143143
note: `#2` invokes this custom destructor
144-
--> $DIR/drop-order-comparisons.rs:611:1
144+
--> $DIR/drop-order-comparisons.rs:612:1
145145
|
146146
LL | impl<'b> Drop for LogDrop<'b> {
147147
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
148148
note: `#1` invokes this custom destructor
149-
--> $DIR/drop-order-comparisons.rs:611:1
149+
--> $DIR/drop-order-comparisons.rs:612:1
150150
|
151151
LL | impl<'b> Drop for LogDrop<'b> {
152152
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
153153
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
154154

155155
warning: relative drop order changing in Rust 2024
156-
--> $DIR/drop-order-comparisons.rs:247:24
156+
--> $DIR/drop-order-comparisons.rs:248:24
157157
|
158158
LL | _ = ({
159159
| _________-
@@ -173,19 +173,19 @@ LL | | }, e.mark(2), e.ok(3));
173173
= warning: this changes meaning in Rust 2024
174174
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-tail-expr-scope.html>
175175
note: `#2` invokes this custom destructor
176-
--> $DIR/drop-order-comparisons.rs:611:1
176+
--> $DIR/drop-order-comparisons.rs:612:1
177177
|
178178
LL | impl<'b> Drop for LogDrop<'b> {
179179
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
180180
note: `#1` invokes this custom destructor
181-
--> $DIR/drop-order-comparisons.rs:611:1
181+
--> $DIR/drop-order-comparisons.rs:612:1
182182
|
183183
LL | impl<'b> Drop for LogDrop<'b> {
184184
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
185185
= note: most of the time, changing drop order is harmless; inspect the `impl Drop`s for side effects like releasing locks or sending messages
186186

187187
warning: `if let` assigns a shorter lifetime since Edition 2024
188-
--> $DIR/drop-order-comparisons.rs:123:13
188+
--> $DIR/drop-order-comparisons.rs:124:13
189189
|
190190
LL | _ = (if let Ok(_) = e.ok(4).as_ref() {
191191
| ^^^^^^^^^^^^-------^^^^^^^^^
@@ -195,12 +195,12 @@ LL | _ = (if let Ok(_) = e.ok(4).as_ref() {
195195
= warning: this changes meaning in Rust 2024
196196
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
197197
note: value invokes this custom destructor
198-
--> $DIR/drop-order-comparisons.rs:611:1
198+
--> $DIR/drop-order-comparisons.rs:612:1
199199
|
200200
LL | impl<'b> Drop for LogDrop<'b> {
201201
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
202202
help: the value is now dropped here in Edition 2024
203-
--> $DIR/drop-order-comparisons.rs:127:5
203+
--> $DIR/drop-order-comparisons.rs:128:5
204204
|
205205
LL | }, e.mark(2), e.ok(3));
206206
| ^
@@ -215,7 +215,7 @@ LL ~ } _ => {}}, e.mark(2), e.ok(3));
215215
|
216216

217217
warning: `if let` assigns a shorter lifetime since Edition 2024
218-
--> $DIR/drop-order-comparisons.rs:145:13
218+
--> $DIR/drop-order-comparisons.rs:146:13
219219
|
220220
LL | _ = (if let Ok(_) = e.err(4).as_ref() {} else {
221221
| ^^^^^^^^^^^^--------^^^^^^^^^
@@ -225,12 +225,12 @@ LL | _ = (if let Ok(_) = e.err(4).as_ref() {} else {
225225
= warning: this changes meaning in Rust 2024
226226
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
227227
note: value invokes this custom destructor
228-
--> $DIR/drop-order-comparisons.rs:611:1
228+
--> $DIR/drop-order-comparisons.rs:612:1
229229
|
230230
LL | impl<'b> Drop for LogDrop<'b> {
231231
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
232232
help: the value is now dropped here in Edition 2024
233-
--> $DIR/drop-order-comparisons.rs:145:44
233+
--> $DIR/drop-order-comparisons.rs:146:44
234234
|
235235
LL | _ = (if let Ok(_) = e.err(4).as_ref() {} else {
236236
| ^
@@ -244,7 +244,7 @@ LL ~ }}, e.mark(2), e.ok(3));
244244
|
245245

246246
warning: `if let` assigns a shorter lifetime since Edition 2024
247-
--> $DIR/drop-order-comparisons.rs:247:12
247+
--> $DIR/drop-order-comparisons.rs:248:12
248248
|
249249
LL | if let Ok(_) = e.err(4).as_ref() {} else {
250250
| ^^^^^^^^^^^^--------^^^^^^^^^
@@ -254,12 +254,12 @@ LL | if let Ok(_) = e.err(4).as_ref() {} else {
254254
= warning: this changes meaning in Rust 2024
255255
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
256256
note: value invokes this custom destructor
257-
--> $DIR/drop-order-comparisons.rs:611:1
257+
--> $DIR/drop-order-comparisons.rs:612:1
258258
|
259259
LL | impl<'b> Drop for LogDrop<'b> {
260260
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
261261
help: the value is now dropped here in Edition 2024
262-
--> $DIR/drop-order-comparisons.rs:247:43
262+
--> $DIR/drop-order-comparisons.rs:248:43
263263
|
264264
LL | if let Ok(_) = e.err(4).as_ref() {} else {
265265
| ^
@@ -273,7 +273,7 @@ LL ~ }}
273273
|
274274

275275
warning: `if let` assigns a shorter lifetime since Edition 2024
276-
--> $DIR/drop-order-comparisons.rs:371:12
276+
--> $DIR/drop-order-comparisons.rs:372:12
277277
|
278278
LL | if let true = e.err(9).is_ok() {} else {
279279
| ^^^^^^^^^^^--------^^^^^^^^
@@ -283,12 +283,12 @@ LL | if let true = e.err(9).is_ok() {} else {
283283
= warning: this changes meaning in Rust 2024
284284
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
285285
note: value invokes this custom destructor
286-
--> $DIR/drop-order-comparisons.rs:611:1
286+
--> $DIR/drop-order-comparisons.rs:612:1
287287
|
288288
LL | impl<'b> Drop for LogDrop<'b> {
289289
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
290290
help: the value is now dropped here in Edition 2024
291-
--> $DIR/drop-order-comparisons.rs:371:41
291+
--> $DIR/drop-order-comparisons.rs:372:41
292292
|
293293
LL | if let true = e.err(9).is_ok() {} else {
294294
| ^
@@ -302,7 +302,7 @@ LL ~ }}}}}}}}};
302302
|
303303

304304
warning: `if let` assigns a shorter lifetime since Edition 2024
305-
--> $DIR/drop-order-comparisons.rs:374:12
305+
--> $DIR/drop-order-comparisons.rs:375:12
306306
|
307307
LL | if let Ok(_v) = e.err(8) {} else {
308308
| ^^^^^^^^^^^^^--------
@@ -312,12 +312,12 @@ LL | if let Ok(_v) = e.err(8) {} else {
312312
= warning: this changes meaning in Rust 2024
313313
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
314314
note: value invokes this custom destructor
315-
--> $DIR/drop-order-comparisons.rs:611:1
315+
--> $DIR/drop-order-comparisons.rs:612:1
316316
|
317317
LL | impl<'b> Drop for LogDrop<'b> {
318318
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
319319
help: the value is now dropped here in Edition 2024
320-
--> $DIR/drop-order-comparisons.rs:374:35
320+
--> $DIR/drop-order-comparisons.rs:375:35
321321
|
322322
LL | if let Ok(_v) = e.err(8) {} else {
323323
| ^
@@ -331,7 +331,7 @@ LL ~ }}}}}}}}};
331331
|
332332

333333
warning: `if let` assigns a shorter lifetime since Edition 2024
334-
--> $DIR/drop-order-comparisons.rs:377:12
334+
--> $DIR/drop-order-comparisons.rs:378:12
335335
|
336336
LL | if let Ok(_) = e.err(7) {} else {
337337
| ^^^^^^^^^^^^--------
@@ -341,12 +341,12 @@ LL | if let Ok(_) = e.err(7) {} else {
341341
= warning: this changes meaning in Rust 2024
342342
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
343343
note: value invokes this custom destructor
344-
--> $DIR/drop-order-comparisons.rs:611:1
344+
--> $DIR/drop-order-comparisons.rs:612:1
345345
|
346346
LL | impl<'b> Drop for LogDrop<'b> {
347347
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
348348
help: the value is now dropped here in Edition 2024
349-
--> $DIR/drop-order-comparisons.rs:377:34
349+
--> $DIR/drop-order-comparisons.rs:378:34
350350
|
351351
LL | if let Ok(_) = e.err(7) {} else {
352352
| ^
@@ -360,7 +360,7 @@ LL ~ }}}}}}}}};
360360
|
361361

362362
warning: `if let` assigns a shorter lifetime since Edition 2024
363-
--> $DIR/drop-order-comparisons.rs:380:12
363+
--> $DIR/drop-order-comparisons.rs:381:12
364364
|
365365
LL | if let Ok(_) = e.err(6).as_ref() {} else {
366366
| ^^^^^^^^^^^^--------^^^^^^^^^
@@ -370,12 +370,12 @@ LL | if let Ok(_) = e.err(6).as_ref() {} else {
370370
= warning: this changes meaning in Rust 2024
371371
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
372372
note: value invokes this custom destructor
373-
--> $DIR/drop-order-comparisons.rs:611:1
373+
--> $DIR/drop-order-comparisons.rs:612:1
374374
|
375375
LL | impl<'b> Drop for LogDrop<'b> {
376376
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
377377
help: the value is now dropped here in Edition 2024
378-
--> $DIR/drop-order-comparisons.rs:380:43
378+
--> $DIR/drop-order-comparisons.rs:381:43
379379
|
380380
LL | if let Ok(_) = e.err(6).as_ref() {} else {
381381
| ^
@@ -389,7 +389,7 @@ LL ~ }}}}}}}}};
389389
|
390390

391391
warning: `if let` assigns a shorter lifetime since Edition 2024
392-
--> $DIR/drop-order-comparisons.rs:384:12
392+
--> $DIR/drop-order-comparisons.rs:385:12
393393
|
394394
LL | if let Ok(_v) = e.err(5) {} else {
395395
| ^^^^^^^^^^^^^--------
@@ -399,12 +399,12 @@ LL | if let Ok(_v) = e.err(5) {} else {
399399
= warning: this changes meaning in Rust 2024
400400
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
401401
note: value invokes this custom destructor
402-
--> $DIR/drop-order-comparisons.rs:611:1
402+
--> $DIR/drop-order-comparisons.rs:612:1
403403
|
404404
LL | impl<'b> Drop for LogDrop<'b> {
405405
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
406406
help: the value is now dropped here in Edition 2024
407-
--> $DIR/drop-order-comparisons.rs:384:35
407+
--> $DIR/drop-order-comparisons.rs:385:35
408408
|
409409
LL | if let Ok(_v) = e.err(5) {} else {
410410
| ^
@@ -418,7 +418,7 @@ LL ~ }}}}}}}}};
418418
|
419419

420420
warning: `if let` assigns a shorter lifetime since Edition 2024
421-
--> $DIR/drop-order-comparisons.rs:387:12
421+
--> $DIR/drop-order-comparisons.rs:388:12
422422
|
423423
LL | if let Ok(_) = e.err(4) {} else {
424424
| ^^^^^^^^^^^^--------
@@ -428,12 +428,12 @@ LL | if let Ok(_) = e.err(4) {} else {
428428
= warning: this changes meaning in Rust 2024
429429
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
430430
note: value invokes this custom destructor
431-
--> $DIR/drop-order-comparisons.rs:611:1
431+
--> $DIR/drop-order-comparisons.rs:612:1
432432
|
433433
LL | impl<'b> Drop for LogDrop<'b> {
434434
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
435435
help: the value is now dropped here in Edition 2024
436-
--> $DIR/drop-order-comparisons.rs:387:34
436+
--> $DIR/drop-order-comparisons.rs:388:34
437437
|
438438
LL | if let Ok(_) = e.err(4) {} else {
439439
| ^
@@ -447,7 +447,7 @@ LL ~ }}}}}}}}};
447447
|
448448

449449
warning: `if let` assigns a shorter lifetime since Edition 2024
450-
--> $DIR/drop-order-comparisons.rs:423:12
450+
--> $DIR/drop-order-comparisons.rs:424:12
451451
|
452452
LL | if let Ok(_) = e.err(4).as_ref() {} else {
453453
| ^^^^^^^^^^^^--------^^^^^^^^^
@@ -457,12 +457,12 @@ LL | if let Ok(_) = e.err(4).as_ref() {} else {
457457
= warning: this changes meaning in Rust 2024
458458
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/temporary-if-let-scope.html>
459459
note: value invokes this custom destructor
460-
--> $DIR/drop-order-comparisons.rs:611:1
460+
--> $DIR/drop-order-comparisons.rs:612:1
461461
|
462462
LL | impl<'b> Drop for LogDrop<'b> {
463463
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
464464
help: the value is now dropped here in Edition 2024
465-
--> $DIR/drop-order-comparisons.rs:423:43
465+
--> $DIR/drop-order-comparisons.rs:424:43
466466
|
467467
LL | if let Ok(_) = e.err(4).as_ref() {} else {
468468
| ^
@@ -476,4 +476,3 @@ LL ~ }}}}}}}}};
476476
|
477477

478478
warning: 15 warnings emitted
479-

‎tests/ui/drop/drop-order-comparisons.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
//@ [e2024] edition: 2024
2525
//@ run-pass
2626

27+
#![feature(if_let_guard)]
2728
#![cfg_attr(e2021, feature(let_chains))]
2829
#![cfg_attr(e2021, warn(rust_2024_compatibility))]
2930

0 commit comments

Comments
 (0)