Fix more errors from rebase

rust-lang · tgross35 · Aug 4, 2023 · Aug 10, 2023 · Aug 31, 2023 · Dec 3, 2023
commit 53c48029367cf539c98288297d9415343fcff1b7
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
@@ -11,7 +11,6 @@
 #![feature(round_ties_even)]
 #![feature(let_chains)]
 #![feature(lint_reasons)]
-#![cfg_attr(bootstrap, feature(trait_upcasting))]
 #![cfg_attr(not(bootstrap), feature(f16))]
 // Configure clippy and other lints
 #![allow(

diff --git a/tests/ui/binop/binary-op-suggest-deref.stderr b/tests/ui/binop/binary-op-suggest-deref.stderr
@@ -255,7 +255,7 @@ LL |     _ = &&0 == Foo;
              i128
              usize
              u8
-           and 6 others
+           and 8 others
 
 error[E0369]: binary operation `==` cannot be applied to type `Foo`
   --> $DIR/binary-op-suggest-deref.rs:60:13