Skip to content

Commit

Permalink
ui-test conflict err
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndyJado
AndyJado committed Sep 26, 2022
1 parent d536c17 commit 9768960
Show file tree
Hide file tree
Showing 29 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion src/test/ui/borrowck/issue-82462.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LL | v.push(*x);
| ^^^^^^^^^^ mutable borrow occurs here
LL | break;
LL | }
| - ... and the immutable borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `DroppingSlice`
| - ... and the immutable borrow might be used here, when that temporary is dropped and runs the destructor for type `DroppingSlice`
|
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/btreemap/btreemap_dropck.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LL | let _map = BTreeMap::from_iter([((), PrintOnDrop(&s))]);
LL | drop(s);
| ^ move out of `s` occurs here
LL | }
| - borrow might be used here, when `_map` is dropped and runs the `Drop` code for type `BTreeMap`
| - borrow might be used here, when `_map` is dropped and runs the destructor for type `BTreeMap`

error: aborting due to previous error

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `c_shortest` dropped here while still borrowed
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
|
= note: values in a scope are dropped in the opposite order they are defined

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

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/dropck/dropck-eyepatch-reorder.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `c_shortest` dropped here while still borrowed
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
|
= note: values in a scope are dropped in the opposite order they are defined

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

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/dropck/dropck-eyepatch.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `c_shortest` dropped here while still borrowed
| borrow might be used here, when `dt` is dropped and runs the `Drop` code for type `Dt`
| borrow might be used here, when `dt` is dropped and runs the destructor for type `Dt`
|
= note: values in a scope are dropped in the opposite order they are defined

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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/dropck/dropck-union.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | }
| -
| |
| `v` dropped here while still borrowed
| borrow might be used here, when `v` is dropped and runs the `Drop` code for type `Wrap`
| borrow might be used here, when `v` is dropped and runs the destructor for type `Wrap`

error: aborting due to previous error

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/error-codes/E0597.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `y` dropped here while still borrowed
| borrow might be used here, when `x` is dropped and runs the `Drop` code for type `Foo`
| borrow might be used here, when `x` is dropped and runs the destructor for type `Foo`
|
= note: values in a scope are dropped in the opposite order they are defined

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/generator/dropck-resume.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | r = y.as_ref().unwrap();
| ^^^^^^^^^^ immutable borrow occurs here
LL |
LL | }
| - mutable borrow might be used here, when `g` is dropped and runs the destructor for generator
| - mutable borrow might be used here, when `g` is dropped and runs the destructor for type

error: aborting due to previous error

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/generator/dropck.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `*cell` dropped here while still borrowed
| borrow might be used here, when `gen` is dropped and runs the destructor for generator
| borrow might be used here, when `gen` is dropped and runs the destructor for type
|
= note: values in a scope are dropped in the opposite order they are defined

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

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/macros/format-args-temporaries-in-write.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | write!(Out, "{}", mutex.lock()) /* no semicolon */
| a temporary with access to the borrow is created here ...
LL |
LL | };
| -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
| -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `MutexGuard`
| |
| `mutex` dropped here while still borrowed
|
Expand All @@ -28,7 +28,7 @@ LL | writeln!(Out, "{}", mutex.lock()) /* no semicolon */
| a temporary with access to the borrow is created here ...
LL |
LL | };
| -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
| -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `MutexGuard`
| |
| `mutex` dropped here while still borrowed
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/dont-print-desugared.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LL | }
| -
| |
| `y` dropped here while still borrowed
| ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`

error: aborting due to 2 previous errors

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/nll/drop-no-may-dangle.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | v[0] += 1;
| ^^^^^^^^^ assignment to borrowed `v[_]` occurs here
...
LL | }
| - borrow might be used here, when `p` is dropped and runs the `Drop` code for type `WrapMayNotDangle`
| - borrow might be used here, when `p` is dropped and runs the destructor for type `WrapMayNotDangle`

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

error: aborting due to 2 previous errors

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LL | }
| - `_thing1` dropped here while still borrowed
LL |
LL | ;
| - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
|
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LL | }
| - `_thing1` dropped here while still borrowed
LL |
LL | ;
| - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
|
help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped
|
Expand Down
18 changes: 9 additions & 9 deletions src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:10:55
|
LL | { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // suggest `;`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -17,7 +17,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:13:55
|
LL | { { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } } ; // suggest `;`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -32,7 +32,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:16:55
|
LL | { { let mut _t1 = D(Box::new("t1")); D(&_t1).end() }; } // suggest `;`
| --^^^^- -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- -- ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -47,7 +47,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:19:55
|
LL | let _ = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // suggest `;`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -62,7 +62,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:22:55
|
LL | let _u = { let mut _t1 = D(Box::new("t1")); D(&_t1).unit() } ; // suggest `;`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -77,7 +77,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:25:55
|
LL | let _x = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // `let x = ...; x`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -94,7 +94,7 @@ error[E0597]: `_t1` does not live long enough
--> $DIR/issue-54556-used-vs-unused-tails.rs:30:55
|
LL | _y = { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } ; // `let x = ...; x`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| --^^^^- - - ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | | |
| | | `_t1` dropped here while still borrowed
| | borrowed value does not live long enough
Expand All @@ -114,7 +114,7 @@ LL | fn f_local_ref() { let mut _t1 = D(Box::new("t1")); D(&_t1).unit() } //
| --^^^^- -
| | | |
| | | `_t1` dropped here while still borrowed
| | | ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| | | ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
|
Expand All @@ -130,7 +130,7 @@ LL | fn f() -> String { let mut _t1 = D(Box::new("t1")); D(&_t1).end() } //
| --^^^^- -
| | | |
| | | `_t1` dropped here while still borrowed
| | | ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `D`
| | | ... and the borrow might be used here, when that temporary is dropped and runs the destructor for type `D`
| | borrowed value does not live long enough
| a temporary with access to the borrow is created here ...
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/maybe-initialized-drop.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LL | let wrap = Wrap { p: &mut x };
LL | x = 1;
| ^^^^^ assignment to borrowed `x` occurs here
LL | }
| - borrow might be used here, when `wrap` is dropped and runs the `Drop` code for type `Wrap`
| - borrow might be used here, when `wrap` is dropped and runs the destructor for type `Wrap`

error: aborting due to previous error

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/span/dropck_direct_cycle_with_drop.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `d2` dropped here while still borrowed
| borrow might be used here, when `d1` is dropped and runs the `Drop` code for type `D`
| borrow might be used here, when `d1` is dropped and runs the destructor for type `D`
|
= note: values in a scope are dropped in the opposite order they are defined

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

error: aborting due to 2 previous errors

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/span/dropck_misc_variants.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LL | }
| -
| |
| `v` dropped here while still borrowed
| borrow might be used here, when `_w` is dropped and runs the destructor for closure
| borrow might be used here, when `_w` is dropped and runs the destructor for type
|
= note: values in a scope are dropped in the opposite order they are defined

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LL | }
| -
| |
| `d1` dropped here while still borrowed
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_Child`
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_Child`
|
= note: values in a scope are dropped in the opposite order they are defined

Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | }
| -
| |
| `d1` dropped here while still borrowed
| borrow might be used here, when `_d` is dropped and runs the `Drop` code for type `D_HasSelfMethod`
| borrow might be used here, when `_d` is dropped and runs the destructor for type `D_HasSelfMethod`
|
= note: values in a scope are dropped in the opposite order they are defined

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/span/issue-24895-copy-clone-dropck.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | }
| -
| |
| `d1` dropped here while still borrowed
| borrow might be used here, when `d2` is dropped and runs the `Drop` code for type `D`
| borrow might be used here, when `d2` is dropped and runs the destructor for type `D`
|
= note: values in a scope are dropped in the opposite order they are defined

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/span/issue-26656.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LL | }
| -
| |
| `ticking` dropped here while still borrowed
| borrow might be used here, when `zook` is dropped and runs the `Drop` code for type `Zook`
| borrow might be used here, when `zook` is dropped and runs the destructor for type `Zook`
|
= note: values in a scope are dropped in the opposite order they are defined

Expand Down
Loading

0 comments on commit 9768960

Please sign in to comment.