Skip to content

Commit 9768960

Browse files
AndyJadoAndyJado
committed
ui-test conflict err
1 parent d536c17 commit 9768960

29 files changed

+48
-48
lines changed

‎src/test/ui/borrowck/issue-82462.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | v.push(*x);
1010
| ^^^^^^^^^^ mutable borrow occurs here
1111
LL | break;
1212
LL | }
13-
| - ... and the immutable borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `DroppingSlice`
13+
| - ... and the immutable borrow might be used here, when that temporary is dropped and runs the destructor for type `DroppingSlice`
1414
|
1515
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
1616
|

‎src/test/ui/btreemap/btreemap_dropck.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let _map = BTreeMap::from_iter([((), PrintOnDrop(&s))]);
66
LL | drop(s);
77
| ^ move out of `s` occurs here
88
LL | }
9-
| - borrow might be used here, when `_map` is dropped and runs the `Drop` code for type `BTreeMap`
9+
| - borrow might be used here, when `_map` is dropped and runs the destructor for type `BTreeMap`
1010

1111
error: aborting due to previous error
1212

‎src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `c_shortest` dropped here while still borrowed
11-
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
11+
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

@@ -22,7 +22,7 @@ LL | }
2222
| -
2323
| |
2424
| `c_shortest` dropped here while still borrowed
25-
| borrow might be used here, when `pt` is dropped and runs the `Drop` code for type `Pt`
25+
| borrow might be used here, when `pt` is dropped and runs the destructor for type `Pt`
2626
|
2727
= note: values in a scope are dropped in the opposite order they are defined
2828

‎src/test/ui/dropck/dropck-eyepatch-reorder.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `c_shortest` dropped here while still borrowed
11-
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
11+
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

@@ -22,7 +22,7 @@ LL | }
2222
| -
2323
| |
2424
| `c_shortest` dropped here while still borrowed
25-
| borrow might be used here, when `pt` is dropped and runs the `Drop` code for type `Pt`
25+
| borrow might be used here, when `pt` is dropped and runs the destructor for type `Pt`
2626
|
2727
= note: values in a scope are dropped in the opposite order they are defined
2828

‎src/test/ui/dropck/dropck-eyepatch.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `c_shortest` dropped here while still borrowed
11-
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
11+
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

@@ -22,7 +22,7 @@ LL | }
2222
| -
2323
| |
2424
| `c_shortest` dropped here while still borrowed
25-
| borrow might be used here, when `pt` is dropped and runs the `Drop` code for type `Pt`
25+
| borrow might be used here, when `pt` is dropped and runs the destructor for type `Pt`
2626
|
2727
= note: values in a scope are dropped in the opposite order they are defined
2828

‎src/test/ui/dropck/dropck-union.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `v` dropped here while still borrowed
10-
| borrow might be used here, when `v` is dropped and runs the `Drop` code for type `Wrap`
10+
| borrow might be used here, when `v` is dropped and runs the destructor for type `Wrap`
1111

1212
error: aborting due to previous error
1313

‎src/test/ui/error-codes/E0597.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `y` dropped here while still borrowed
11-
| borrow might be used here, when `x` is dropped and runs the `Drop` code for type `Foo`
11+
| borrow might be used here, when `x` is dropped and runs the destructor for type `Foo`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

‎src/test/ui/generator/dropck-resume.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | r = y.as_ref().unwrap();
88
| ^^^^^^^^^^ immutable borrow occurs here
99
LL |
1010
LL | }
11-
| - mutable borrow might be used here, when `g` is dropped and runs the destructor for generator
11+
| - mutable borrow might be used here, when `g` is dropped and runs the destructor for type
1212

1313
error: aborting due to previous error
1414

‎src/test/ui/generator/dropck.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `*cell` dropped here while still borrowed
11-
| borrow might be used here, when `gen` is dropped and runs the destructor for generator
11+
| borrow might be used here, when `gen` is dropped and runs the destructor for type
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

@@ -25,7 +25,7 @@ LL | }
2525
| -
2626
| |
2727
| `ref_` dropped here while still borrowed
28-
| borrow might be used here, when `gen` is dropped and runs the destructor for generator
28+
| borrow might be used here, when `gen` is dropped and runs the destructor for type
2929
|
3030
= note: values in a scope are dropped in the opposite order they are defined
3131

‎src/test/ui/macros/format-args-temporaries-in-write.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | write!(Out, "{}", mutex.lock()) /* no semicolon */
88
| a temporary with access to the borrow is created here ...
99
LL |
1010
LL | };
11-
| -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
11+
| -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `MutexGuard`
1212
| |
1313
| `mutex` dropped here while still borrowed
1414
|
@@ -28,7 +28,7 @@ LL | writeln!(Out, "{}", mutex.lock()) /* no semicolon */
2828
| a temporary with access to the borrow is created here ...
2929
LL |
3030
LL | };
31-
| -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
31+
| -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `MutexGuard`
3232
| |
3333
| `mutex` dropped here while still borrowed
3434
|

‎src/test/ui/nll/dont-print-desugared.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LL | }
1616
| -
1717
| |
1818
| `y` dropped here while still borrowed
19-
| ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
19+
| ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
2020

2121
error: aborting due to 2 previous errors
2222

‎src/test/ui/nll/drop-no-may-dangle.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | v[0] += 1;
88
| ^^^^^^^^^ assignment to borrowed `v[_]` occurs here
99
...
1010
LL | }
11-
| - borrow might be used here, when `p` is dropped and runs the `Drop` code for type `WrapMayNotDangle`
11+
| - borrow might be used here, when `p` is dropped and runs the destructor for type `WrapMayNotDangle`
1212

1313
error[E0506]: cannot assign to `v[_]` because it is borrowed
1414
--> $DIR/drop-no-may-dangle.rs:21:5
@@ -19,7 +19,7 @@ LL | let p: WrapMayNotDangle<&usize> = WrapMayNotDangle { value: &v[0] };
1919
LL | v[0] += 1;
2020
| ^^^^^^^^^ assignment to borrowed `v[_]` occurs here
2121
LL | }
22-
| - borrow might be used here, when `p` is dropped and runs the `Drop` code for type `WrapMayNotDangle`
22+
| - borrow might be used here, when `p` is dropped and runs the destructor for type `WrapMayNotDangle`
2323

2424
error: aborting due to 2 previous errors
2525

‎src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | }
1111
| - `_thing1` dropped here while still borrowed
1212
LL |
1313
LL | ;
14-
| - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
14+
| - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
1515
|
1616
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
1717
|

‎src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | }
1010
| - `_thing1` dropped here while still borrowed
1111
LL |
1212
LL | ;
13-
| - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
13+
| - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
1414
|
1515
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
1616
|

‎src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0597]: `_t1` does not live long enough
22
--> $DIR/issue-54556-used-vs-unused-tails.rs:10:55
33
|
44
LL | { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // suggest `;`
5-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
5+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
66
| | | |
77
| | | `_t1` dropped here while still borrowed
88
| | borrowed value does not live long enough
@@ -17,7 +17,7 @@ error[E0597]: `_t1` does not live long enough
1717
--> $DIR/issue-54556-used-vs-unused-tails.rs:13:55
1818
|
1919
LL | { { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } } ; // suggest `;`
20-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
20+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
2121
| | | |
2222
| | | `_t1` dropped here while still borrowed
2323
| | borrowed value does not live long enough
@@ -32,7 +32,7 @@ error[E0597]: `_t1` does not live long enough
3232
--> $DIR/issue-54556-used-vs-unused-tails.rs:16:55
3333
|
3434
LL | { { let mut _t1 = D(Box::new("t1")); D(&_t1).end() }; } // suggest `;`
35-
| --^^^^- -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
35+
| --^^^^- -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
3636
| | | |
3737
| | | `_t1` dropped here while still borrowed
3838
| | borrowed value does not live long enough
@@ -47,7 +47,7 @@ error[E0597]: `_t1` does not live long enough
4747
--> $DIR/issue-54556-used-vs-unused-tails.rs:19:55
4848
|
4949
LL | let _ = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // suggest `;`
50-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
50+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
5151
| | | |
5252
| | | `_t1` dropped here while still borrowed
5353
| | borrowed value does not live long enough
@@ -62,7 +62,7 @@ error[E0597]: `_t1` does not live long enough
6262
--> $DIR/issue-54556-used-vs-unused-tails.rs:22:55
6363
|
6464
LL | let _u = { let mut _t1 = D(Box::new("t1")); D(&_t1).unit() } ; // suggest `;`
65-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
65+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
6666
| | | |
6767
| | | `_t1` dropped here while still borrowed
6868
| | borrowed value does not live long enough
@@ -77,7 +77,7 @@ error[E0597]: `_t1` does not live long enough
7777
--> $DIR/issue-54556-used-vs-unused-tails.rs:25:55
7878
|
7979
LL | let _x = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // `let x = ...; x`
80-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
80+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
8181
| | | |
8282
| | | `_t1` dropped here while still borrowed
8383
| | borrowed value does not live long enough
@@ -94,7 +94,7 @@ error[E0597]: `_t1` does not live long enough
9494
--> $DIR/issue-54556-used-vs-unused-tails.rs:30:55
9595
|
9696
LL | _y = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // `let x = ...; x`
97-
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
97+
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
9898
| | | |
9999
| | | `_t1` dropped here while still borrowed
100100
| | borrowed value does not live long enough
@@ -114,7 +114,7 @@ LL | fn f_local_ref() { let mut _t1 = D(Box::new("t1")); D(&_t1).unit() } //
114114
| --^^^^- -
115115
| | | |
116116
| | | `_t1` dropped here while still borrowed
117-
| | | ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
117+
| | | ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
118118
| | borrowed value does not live long enough
119119
| a temporary with access to the borrow is created here ...
120120
|
@@ -130,7 +130,7 @@ LL | fn f() -> String { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } //
130130
| --^^^^- -
131131
| | | |
132132
| | | `_t1` dropped here while still borrowed
133-
| | | ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
133+
| | | ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
134134
| | borrowed value does not live long enough
135135
| a temporary with access to the borrow is created here ...
136136
|

‎src/test/ui/nll/maybe-initialized-drop.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let wrap = Wrap { p: &mut x };
66
LL | x = 1;
77
| ^^^^^ assignment to borrowed `x` occurs here
88
LL | }
9-
| - borrow might be used here, when `wrap` is dropped and runs the `Drop` code for type `Wrap`
9+
| - borrow might be used here, when `wrap` is dropped and runs the destructor for type `Wrap`
1010

1111
error: aborting due to previous error
1212

‎src/test/ui/span/dropck_direct_cycle_with_drop.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `d2` dropped here while still borrowed
11-
| borrow might be used here, when `d1` is dropped and runs the `Drop` code for type `D`
11+
| borrow might be used here, when `d1` is dropped and runs the destructor for type `D`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

@@ -22,7 +22,7 @@ LL | }
2222
| -
2323
| |
2424
| `d1` dropped here while still borrowed
25-
| borrow might be used here, when `d1` is dropped and runs the `Drop` code for type `D`
25+
| borrow might be used here, when `d1` is dropped and runs the destructor for type `D`
2626

2727
error: aborting due to 2 previous errors
2828

‎src/test/ui/span/dropck_misc_variants.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LL | }
2121
| -
2222
| |
2323
| `v` dropped here while still borrowed
24-
| borrow might be used here, when `_w` is dropped and runs the destructor for closure
24+
| borrow might be used here, when `_w` is dropped and runs the destructor for type
2525
|
2626
= note: values in a scope are dropped in the opposite order they are defined
2727

‎src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | }
88
| -
99
| |
1010
| `d1` dropped here while still borrowed
11-
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_Child`
11+
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_Child`
1212
|
1313
= note: values in a scope are dropped in the opposite order they are defined
1414

‎src/test/ui/span/issue-24805-dropck-trait-has-items.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `d1` dropped here while still borrowed
10-
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_HasSelfMethod`
10+
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_HasSelfMethod`
1111
|
1212
= note: values in a scope are dropped in the opposite order they are defined
1313

@@ -20,7 +20,7 @@ LL | }
2020
| -
2121
| |
2222
| `d1` dropped here while still borrowed
23-
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_HasMethodWithSelfArg`
23+
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_HasMethodWithSelfArg`
2424
|
2525
= note: values in a scope are dropped in the opposite order they are defined
2626

@@ -33,7 +33,7 @@ LL | }
3333
| -
3434
| |
3535
| `d1` dropped here while still borrowed
36-
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_HasType`
36+
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_HasType`
3737
|
3838
= note: values in a scope are dropped in the opposite order they are defined
3939

‎src/test/ui/span/issue-24895-copy-clone-dropck.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `d1` dropped here while still borrowed
10-
| borrow might be used here, when `d2` is dropped and runs the `Drop` code for type `D`
10+
| borrow might be used here, when `d2` is dropped and runs the destructor for type `D`
1111
|
1212
= note: values in a scope are dropped in the opposite order they are defined
1313

‎src/test/ui/span/issue-26656.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | }
77
| -
88
| |
99
| `ticking` dropped here while still borrowed
10-
| borrow might be used here, when `zook` is dropped and runs the `Drop` code for type `Zook`
10+
| borrow might be used here, when `zook` is dropped and runs the destructor for type `Zook`
1111
|
1212
= note: values in a scope are dropped in the opposite order they are defined
1313

0 commit comments

Comments
 (0)