Skip to content

Commit

Permalink
Manual find replace updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Noratrieb committed Nov 21, 2023
1 parent 10d241a commit 524fcb2
Show file tree
Hide file tree
Showing 59 changed files with 59 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ LL | #![deny(clippy::internal)]
= note: `#[deny(clippy::default_deprecation_reason)]` implied by `#[deny(clippy::internal)]`
= note: this error originates in the macro `declare_deprecated_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion src/tools/clippy/tests/ui-internal/default_lint.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
= note: `#[deny(clippy::default_lint)]` implied by `#[deny(clippy::internal)]`
= note: this error originates in the macro `$crate::declare_tool_lint` which comes from the expansion of the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
= note: `#[deny(clippy::lint_without_lint_pass)]` implied by `#[deny(clippy::internal)]`
= note: this error originates in the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion src/tools/clippy/tests/ui-internal/outer_expn_data.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | #![deny(clippy::internal)]
| ^^^^^^^^^^^^^^^^
= note: `#[deny(clippy::outer_expn_expn_data)]` implied by `#[deny(clippy::internal)]`

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ see <https://doc.rust-lang.org/nightly/std/sync/atomic/index.html#atomic-accesse

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ LL | thread.join().unwrap();

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ LL | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), 0);

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ LL | assert_eq!(WaitForSingleObject(native, INFINITE), 0);

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/memleak_rc.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a

note: the evaluated program leaked memory, pass `-Zmiri-ignore-leaks` to disable this check

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ LL | let t2 = std::thread::spawn(move || thread_2(p));

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ LL | pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
= note: inside `std::rt::lang_start_internal` at RUSTLIB/std/src/rt.rs:LL:CC
= note: inside `std::rt::lang_start::<()>` at RUSTLIB/std/src/rt.rs:LL:CC

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion src/tools/miri/tests/fail/tree_borrows/write_to_shr.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ LL | let xref = unsafe { &*(x as *mut u64) };

note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ error[E0425]: cannot find value `no` in this scope
LL | no
| ^^ not found in this scope

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0425`.
Couldn't compile the test.
Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/issues/issue-79494.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) };
= note: source type: `usize` (64 bits)
= note: target type: `&[u8]` (128 bits)

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0512`.
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ note: required by a bound in `is_send`
LL | fn is_send(_: impl Send) {}
| ^^^^ required by this bound in `is_send`

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ note: required by a bound in `is_send`
LL | fn is_send(_: impl Send) {}
| ^^^^ required by this bound in `is_send`

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ error: return type notation is not allowed to use type equality
LL | fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ error: return type notation is not allowed to use type equality
LL | fn test<T: Trait<method() = Box<dyn Future<Output = ()>>>>() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

2 changes: 1 addition & 1 deletion tests/ui/atomic-from-mut-not-available.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ note: if you're trying to build a new `AtomicU64`, consider using `AtomicU64::ne
--> $SRC_DIR/core/src/sync/atomic.rs:LL:COL
= note: this error originates in the macro `atomic_int` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0599`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-err4.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ error[E0080]: evaluation of constant value failed
LL | Boo = [unsafe { Foo { b: () }.a }; 4][3],
| ^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ LL | const BAR: &i32 = unsafe { &*(intrinsics::const_allocate(4, 4) as *mut i32)
╾ALLOC0╼ │ ╾──╼
}

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-eval/transmute-const.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ LL | static FOO: bool = unsafe { mem::transmute(3u8) };
03 │ .
}

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ error[E0284]: type annotations needed: cannot satisfy `<usize as SliceIndex<[u8]
LL | let out_of_bounds_ptr = &ptr[255];
| ^^^^^^^^ cannot satisfy `<usize as SliceIndex<[u8]>>::Output == _`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0284`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-eval/ub-upvars.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ LL | const BAD_UPVAR: &dyn FnOnce() = &{
╾ALLOC0╼ ╾ALLOC1╼ │ ╾──╼╾──╼
}

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ error[E0282]: type annotations needed
LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
| ^^^^^^^^^^^^^^ cannot infer type for type parameter `U` declared on the function `transmute`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0282`.
2 changes: 1 addition & 1 deletion tests/ui/consts/const-points-to-static.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ help: skipping check that does not even have a feature gate
LL | const TEST: &u8 = &MY_STATIC;
| ^^^^^^^^^

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

For more information about this error, try `rustc --explain E0080`.
2 changes: 1 addition & 1 deletion tests/ui/consts/invalid-union.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ LL | let _: &'static _ = &C;
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
2 changes: 1 addition & 1 deletion tests/ui/consts/issue-63952.32bit.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ LL | const SLICE_WAY_TOO_LONG: &[u8] = unsafe {
╾ALLOC0╼ ff ff ff ff │ ╾──╼....
}

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0080`.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ LL | fn dangle(x: &mut i32) -> &'static mut i32 {
LL | GeneratorState::Complete(c) => return c,
| ^ lifetime `'static` required

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0621`.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: expected identifier, found `<<`
LL | <<<<<<< HEAD
| ^^ expected identifier

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ LL | | }
|
= help: a `loop` may express intention better if this is on purpose

error: aborting due to previous error; 4 warnings emitted
error: aborting due to 1 previous error; 4 warnings emitted

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ LL | impl Into<T> for Foo {
- impl<T, U> Into<U> for T
where U: From<T>;

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0119`.
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | let _: &'b i32 = *u.0;
|
= help: consider adding the following bound: `'a: 'b`

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/infinite/infinite-instantiation.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | fn function<T:ToOpt + Clone>(counter: usize, t: T) {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/infinite/infinite-instantiation.polonius/infinite-instantiation.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/issues/issue-22638.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | pub fn matches<F: Fn()>(&self, f: &F) {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-22638.polonius/issue-22638.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | fn recurse(&self) {
| ^^^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-37311-type-length-limit/issue-37311.polonius/issue-37311.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/issues/issue-40510-1.migrate.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ LL | &mut x
= note: `FnMut` closures only have access to their captured variables while they are executing...
= note: ...therefore, they cannot allow references to captured variables to escape

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/issues/issue-40510-3.migrate.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | | }
= note: `FnMut` closures only have access to their captured variables while they are executing...
= note: ...therefore, they cannot allow references to captured variables to escape

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/issues/issue-59756.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ help: try using a variant of the expected enum
LL | Ok(foo()?)
|

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0308`.
2 changes: 1 addition & 1 deletion tests/ui/issues/issue-67552.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ LL | | T: Iterator,
| |________________^
= note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-67552.polonius/issue-67552.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/issues/issue-8727.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ LL | fn generic<T>() {
| ^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/issues/issue-8727.polonius/issue-8727.long-type.txt'

error: aborting due to previous error; 1 warning emitted
error: aborting due to 1 previous error; 1 warning emitted

2 changes: 1 addition & 1 deletion tests/ui/limits/huge-array-simple-32.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: values of the type `[u8; 2147516416]` are too big for the current archite
LL | let _fat: [u8; (1<<31)+(1<<15)] =
| ^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/limits/issue-15919-32.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: values of the type `[usize; usize::MAX]` are too big for the current arch
LL | let x = [0usize; 0xffff_ffff];
| ^

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/lub-glb/old-lub-glb-hr-noteq1.baseleak.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ LL | | };
= note: expected fn pointer `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
found fn pointer `for<'a> fn(&'a u8, &'a u8) -> &'a u8`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0308`.
2 changes: 1 addition & 1 deletion tests/ui/lub-glb/old-lub-glb-hr-noteq1.basenoleak.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ LL | _ => y,
= note: expected fn pointer `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
found fn pointer `for<'a> fn(&'a u8, &'a u8) -> &'a u8`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0308`.
2 changes: 1 addition & 1 deletion tests/ui/nll/get_default.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ LL |
LL | return v;
| - returning this value requires that `*map` is borrowed for `'1`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0502`.
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/recursion/issue-38591-non-regular-dropck-recursion.polonius/issue-38591-non-regular-dropck-recursion.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

2 changes: 1 addition & 1 deletion tests/ui/recursion/recursion.polonius.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LL | fn test<T:Dot> (n:isize, i:isize, first:T, second:T) ->isize {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: the full type name has been written to '$TEST_BUILD_DIR/recursion/recursion.polonius/recursion.long-type.txt'

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ note: required by a bound in `Main::main::{opaque#0}`
LL | fn main() -> impl std::process::Termination;
| ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::main::{opaque#0}`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0277`.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ note: required by a bound in `Main::{opaque#0}`
LL | fn main() -> impl std::process::Termination;
| ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Main::{opaque#0}`

error: aborting due to previous error
error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0277`.
2 changes: 1 addition & 1 deletion tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ error: Dlltool could not create import library with $DLLTOOL -d $DEF_FILE -D foo

$DLLTOOL: Syntax error in def file $DEF_FILE:1

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: import name type must be of the form `import_name_type = "string"`
LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = 6)]
| ^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: multiple `import_name_type` arguments in a single `#[link]` attribute
LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated", import_name_type = "decorated")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: unknown import name type `unknown`, expected one of: decorated, noprefix,
LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error
error: aborting due to 1 previous error

Loading

0 comments on commit 524fcb2

Please sign in to comment.