Skip to content

Commit 9768960

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

29 files changed

+48
-48
lines changed

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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
|

0 commit comments

Comments
 (0)