ui-test conflict err

AndyJado · AndyJado · commit 9768960d6323 · 2022-09-26T10:54:47.000+08:00
diff --git a/src/test/ui/borrowck/issue-82462.stderr b/src/test/ui/borrowck/issue-82462.stderr
@@ -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
    |
diff --git a/src/test/ui/btreemap/btreemap_dropck.stderr b/src/test/ui/btreemap/btreemap_dropck.stderr
@@ -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
 
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr b/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr b/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/dropck/dropck-eyepatch.stderr b/src/test/ui/dropck/dropck-eyepatch.stderr
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/dropck/dropck-union.stderr b/src/test/ui/dropck/dropck-union.stderr
@@ -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
 
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
@@ -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
 
diff --git a/src/test/ui/generator/dropck-resume.stderr b/src/test/ui/generator/dropck-resume.stderr
@@ -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
 
diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/macros/format-args-temporaries-in-write.stderr b/src/test/ui/macros/format-args-temporaries-in-write.stderr
@@ -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
    |
@@ -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
    |
diff --git a/src/test/ui/nll/dont-print-desugared.stderr b/src/test/ui/nll/dont-print-desugared.stderr
@@ -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
 
diff --git a/src/test/ui/nll/drop-no-may-dangle.stderr b/src/test/ui/nll/drop-no-may-dangle.stderr
@@ -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
@@ -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
 
diff --git a/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr b/src/test/ui/nll/issue-54382-use-span-of-tail-of-block.stderr
@@ -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
    |
diff --git a/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr b/src/test/ui/nll/issue-54556-temps-in-tail-diagnostic.stderr
@@ -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
    |
diff --git a/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr b/src/test/ui/nll/issue-54556-used-vs-unused-tails.stderr
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ...
    |
@@ -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 ...
    |
diff --git a/src/test/ui/nll/maybe-initialized-drop.stderr b/src/test/ui/nll/maybe-initialized-drop.stderr
@@ -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
 
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/span/dropck_misc_variants.stderr b/src/test/ui/span/dropck_misc_variants.stderr
@@ -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
 
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
@@ -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
 
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr b/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
@@ -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
 
@@ -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
 
@@ -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
 
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr b/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
@@ -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
 
diff --git a/src/test/ui/span/issue-26656.stderr b/src/test/ui/span/issue-26656.stderr
@@ -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
 
diff --git a/src/test/ui/span/issue-29106.stderr b/src/test/ui/span/issue-29106.stderr
diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/span/issue28498-reject-ex1.stderr
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/src/test/ui/span/issue28498-reject-lifetime-param.stderr
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/src/test/ui/span/issue28498-reject-trait-bound.stderr
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.stderr b/src/test/ui/span/vec_refs_data_with_early_death.stderr

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ LL \| v.push(*x);`
`10`	`10`	`\| ^^^^^^^^^^ mutable borrow occurs here`
`11`	`11`	`LL \| break;`
`12`	`12`	`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`
`14`	`14`	`\|`
`15`	`15`	`help: consider adding semicolon after the expression so its temporaries are dropped sooner, before the local variables declared by the block are dropped`
`16`	`16`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| }`
`8`	`8`	`\| -`
`9`	`9`	`\| \|`
`10`	`10`	\| `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`
`12`	`12`	`\|`
`13`	`13`	`= note: values in a scope are dropped in the opposite order they are defined`
`14`	`14`