Rollup merge of #120530 - trevyn:issue-116434, r=compiler-errors

oli-obk · web-flow · commit c4371a79de38 · 2024-02-14T11:53:39.000+01:00
Be less confident when `dyn` suggestion is not checked for object safety #120275 no longer checks bare traits for object safety when making a `dyn` suggestion on Rust < 2021. In this case, qualify the suggestion with a note that the trait must be object safe, to prevent user confusion as seen in #116434 r? ```@fmease```
diff --git a/compiler/rustc_hir_analysis/src/astconv/lint.rs b/compiler/rustc_hir_analysis/src/astconv/lint.rs
@@ -243,7 +243,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                 tcx.node_span_lint(BARE_TRAIT_OBJECTS, self_ty.hir_id, self_ty.span, msg, |lint| {
                     if self_ty.span.can_be_used_for_suggestions() {
                         lint.multipart_suggestion_verbose(
-                            "use `dyn`",
+                            "if this is an object-safe trait, use `dyn`",
                             sugg,
                             Applicability::MachineApplicable,
                         );
diff --git a/tests/ui/did_you_mean/bad-assoc-ty.stderr b/tests/ui/did_you_mean/bad-assoc-ty.stderr
@@ -182,7 +182,7 @@ LL | type H = Fn(u8) -> (u8)::Output;
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | type H = <dyn Fn(u8) -> (u8)>::Output;
    |          ++++               +
diff --git a/tests/ui/dyn-keyword/dyn-2018-edition-lint.stderr b/tests/ui/dyn-keyword/dyn-2018-edition-lint.stderr
@@ -11,7 +11,7 @@ note: the lint level is defined here
    |
 LL | #[deny(bare_trait_objects)]
    |        ^^^^^^^^^^^^^^^^^^
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn function(x: &dyn SomeTrait, y: Box<SomeTrait>) {
    |                 +++
@@ -24,7 +24,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
    |
    = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn function(x: &SomeTrait, y: Box<dyn SomeTrait>) {
    |                                   +++
@@ -37,7 +37,7 @@ LL |     let _x: &SomeTrait = todo!();
    |
    = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let _x: &dyn SomeTrait = todo!();
    |              +++
diff --git a/tests/ui/dyn-keyword/dyn-angle-brackets.stderr b/tests/ui/dyn-keyword/dyn-angle-brackets.stderr
@@ -11,7 +11,7 @@ note: the lint level is defined here
    |
 LL | #![deny(bare_trait_objects)]
    |         ^^^^^^^^^^^^^^^^^^
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |         <dyn fmt::Debug>::fmt(self, f)
    |          +++
diff --git a/tests/ui/impl-trait/fresh-lifetime-from-bare-trait-obj-114664.stderr b/tests/ui/impl-trait/fresh-lifetime-from-bare-trait-obj-114664.stderr
@@ -7,7 +7,7 @@ LL | fn ice() -> impl AsRef<Fn(&())> {
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn ice() -> impl AsRef<dyn Fn(&())> {
    |                        +++
diff --git a/tests/ui/issues/issue-28344.stderr b/tests/ui/issues/issue-28344.stderr
@@ -7,7 +7,7 @@ LL |     let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let x: u8 = <dyn BitXor>::bitor(0 as u8, 0 as u8);
    |                 ++++       +
@@ -35,7 +35,7 @@ LL |     let g = BitXor::bitor;
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let g = <dyn BitXor>::bitor;
    |             ++++       +
diff --git a/tests/ui/issues/issue-58734.stderr b/tests/ui/issues/issue-58734.stderr
@@ -7,7 +7,7 @@ LL |     Trait::nonexistent(());
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     <dyn Trait>::nonexistent(());
    |     ++++      +
diff --git a/tests/ui/issues/issue-86756.stderr b/tests/ui/issues/issue-86756.stderr
@@ -21,7 +21,7 @@ LL |     eq::<dyn, Foo>
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     eq::<dyn, dyn Foo>
    |               +++
diff --git a/tests/ui/lint/bare-trait-objects-path.stderr b/tests/ui/lint/bare-trait-objects-path.stderr
@@ -7,7 +7,7 @@ LL |     let _: Dyn::Ty;
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let _: <dyn Dyn>::Ty;
    |            ++++    +
@@ -26,7 +26,7 @@ LL |     Dyn::func();
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     <dyn Dyn>::func();
    |     ++++    +
@@ -39,7 +39,7 @@ LL |     ::Dyn::func();
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     <dyn (::Dyn)>::func();
    |     ++++++     ++
@@ -52,7 +52,7 @@ LL |     Dyn::CONST;
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     <dyn Dyn>::CONST;
    |     ++++    +
diff --git a/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
@@ -7,7 +7,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: requested on the command line with `--force-warn bare-trait-objects`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | pub fn function(_x: Box<dyn SomeTrait>) {}
    |                         +++
diff --git a/tests/ui/lint/force-warn/cap-lints-allow.stderr b/tests/ui/lint/force-warn/cap-lints-allow.stderr
@@ -7,7 +7,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: requested on the command line with `--force-warn bare-trait-objects`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | pub fn function(_x: Box<dyn SomeTrait>) {}
    |                         +++
diff --git a/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
    = help: to override `--force-warn rust-2018-idioms` add `#[allow(bare_trait_objects)]`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | pub fn function(_x: Box<dyn SomeTrait>) {}
    |                         +++
diff --git a/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
    = help: to override `--force-warn rust-2018-idioms` add `#[allow(bare_trait_objects)]`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | pub fn function(_x: Box<dyn SomeTrait>) {}
    |                         +++
diff --git a/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
    = help: to override `--force-warn rust-2018-idioms` add `#[allow(bare_trait_objects)]`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | pub fn function(_x: Box<dyn SomeTrait>) {}
    |                         +++
diff --git a/tests/ui/object-safety/avoid-ice-on-warning-2.old.stderr b/tests/ui/object-safety/avoid-ice-on-warning-2.old.stderr
@@ -7,7 +7,7 @@ LL | fn id<F>(f: Copy) -> usize {
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn id<F>(f: dyn Copy) -> usize {
    |             +++
@@ -21,7 +21,7 @@ LL | fn id<F>(f: Copy) -> usize {
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn id<F>(f: dyn Copy) -> usize {
    |             +++
diff --git a/tests/ui/object-safety/avoid-ice-on-warning-3.old.stderr b/tests/ui/object-safety/avoid-ice-on-warning-3.old.stderr
@@ -7,7 +7,7 @@ LL | trait B { fn f(a: A) -> A; }
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait B { fn f(a: dyn A) -> A; }
    |                   +++
@@ -20,7 +20,7 @@ LL | trait B { fn f(a: A) -> A; }
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait B { fn f(a: A) -> dyn A; }
    |                         +++
@@ -33,7 +33,7 @@ LL | trait A { fn g(b: B) -> B; }
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait A { fn g(b: dyn B) -> B; }
    |                   +++
@@ -46,7 +46,7 @@ LL | trait A { fn g(b: B) -> B; }
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait A { fn g(b: B) -> dyn B; }
    |                         +++
@@ -60,7 +60,7 @@ LL | trait B { fn f(a: A) -> A; }
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait B { fn f(a: dyn A) -> A; }
    |                   +++
@@ -96,7 +96,7 @@ LL | trait A { fn g(b: B) -> B; }
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | trait A { fn g(b: dyn B) -> B; }
    |                   +++
diff --git a/tests/ui/object-safety/avoid-ice-on-warning.old.stderr b/tests/ui/object-safety/avoid-ice-on-warning.old.stderr
@@ -19,7 +19,7 @@ LL | fn call_this<F>(f: F) : Fn(&str) + call_that {}
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn call_this<F>(f: F) : dyn Fn(&str) + call_that {}
    |                         +++
diff --git a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr
@@ -11,7 +11,7 @@ note: the lint level is defined here
    |
 LL | #![deny(bare_trait_objects)]
    |         ^^^^^^^^^^^^^^^^^^
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL | fn ord_prefer_dot(s: String) -> dyn Ord {
    |                                 +++
diff --git a/tests/ui/parser/trait-object-trait-parens.stderr b/tests/ui/parser/trait-object-trait-parens.stderr
@@ -25,7 +25,7 @@ LL |     let _: Box<(Obj) + (?Sized) + (for<'a> Trait<'a>)>;
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
    = note: `#[warn(bare_trait_objects)]` on by default
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let _: Box<dyn (Obj) + (?Sized) + (for<'a> Trait<'a>)>;
    |                +++
@@ -49,7 +49,7 @@ LL |     let _: Box<?Sized + (for<'a> Trait<'a>) + (Obj)>;
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let _: Box<dyn ?Sized + (for<'a> Trait<'a>) + (Obj)>;
    |                +++
@@ -73,7 +73,7 @@ LL |     let _: Box<for<'a> Trait<'a> + (Obj) + (?Sized)>;
    |
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
-help: use `dyn`
+help: if this is an object-safe trait, use `dyn`
    |
 LL |     let _: Box<dyn for<'a> Trait<'a> + (Obj) + (?Sized)>;
    |                +++
diff --git a/tests/ui/suggestions/issue-116434-2015.rs b/tests/ui/suggestions/issue-116434-2015.rs
@@ -0,0 +1,23 @@
+trait Foo {
+    type Clone;
+    fn foo() -> Clone;
+    //~^ WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects]
+    //~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
+    //~| WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects]
+    //~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
+    //~| ERROR the trait `Clone` cannot be made into an object [E0038]
+}
+
+trait DbHandle: Sized {}
+
+trait DbInterface {
+    type DbHandle;
+    fn handle() -> DbHandle;
+    //~^ WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects]
+    //~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
+    //~| WARNING trait objects without an explicit `dyn` are deprecated [bare_trait_objects]
+    //~| WARNING this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
+    //~| ERROR the trait `DbHandle` cannot be made into an object [E0038]
+}
+
+fn main() {}
diff --git a/tests/ui/suggestions/issue-116434-2015.stderr b/tests/ui/suggestions/issue-116434-2015.stderr
diff --git a/tests/ui/suggestions/issue-116434-2021.rs b/tests/ui/suggestions/issue-116434-2021.rs
diff --git a/tests/ui/suggestions/issue-116434-2021.stderr b/tests/ui/suggestions/issue-116434-2021.stderr
diff --git a/tests/ui/suggestions/issue-61963.stderr b/tests/ui/suggestions/issue-61963.stderr
diff --git a/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr b/tests/ui/suggestions/suggest-swapping-self-ty-and-trait.stderr
diff --git a/tests/ui/traits/bound/not-on-bare-trait.stderr b/tests/ui/traits/bound/not-on-bare-trait.stderr
diff --git a/tests/ui/traits/unspecified-self-in-trait-ref.stderr b/tests/ui/traits/unspecified-self-in-trait-ref.stderr

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ LL \| type H = Fn(u8) -> (u8)::Output;`
`182`	`182`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`183`	`183`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`184`	`184`	= note: `#[warn(bare_trait_objects)]` on by default
`185`		-help: use `dyn`
	`185`	+help: if this is an object-safe trait, use `dyn`
`186`	`186`	`\|`
`187`	`187`	`LL \| type H = <dyn Fn(u8) -> (u8)>::Output;`
`188`	`188`	`\| ++++ +`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ note: the lint level is defined here`
`11`	`11`	`\|`
`12`	`12`	`LL \| #[deny(bare_trait_objects)]`
`13`	`13`	`\| ^^^^^^^^^^^^^^^^^^`
`14`		-help: use `dyn`
	`14`	+help: if this is an object-safe trait, use `dyn`
`15`	`15`	`\|`
`16`	`16`	`LL \| fn function(x: &dyn SomeTrait, y: Box<SomeTrait>) {`
`17`	`17`	`\| +++`
`@@ -24,7 +24,7 @@ LL \| fn function(x: &SomeTrait, y: Box<SomeTrait>) {`
`24`	`24`	`\|`
`25`	`25`	`= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`26`	`26`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`27`		-help: use `dyn`
	`27`	+help: if this is an object-safe trait, use `dyn`
`28`	`28`	`\|`
`29`	`29`	`LL \| fn function(x: &SomeTrait, y: Box<dyn SomeTrait>) {`
`30`	`30`	`\| +++`
`@@ -37,7 +37,7 @@ LL \| let _x: &SomeTrait = todo!();`
`37`	`37`	`\|`
`38`	`38`	`= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`39`	`39`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`40`		-help: use `dyn`
	`40`	+help: if this is an object-safe trait, use `dyn`
`41`	`41`	`\|`
`42`	`42`	`LL \| let _x: &dyn SomeTrait = todo!();`
`43`	`43`	`\| +++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| fn ice() -> impl AsRef<Fn(&())> {`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `#[warn(bare_trait_objects)]` on by default
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn ice() -> impl AsRef<dyn Fn(&())> {`
`13`	`13`	`\| +++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| let x: u8 = BitXor::bitor(0 as u8, 0 as u8);`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `#[warn(bare_trait_objects)]` on by default
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| let x: u8 = <dyn BitXor>::bitor(0 as u8, 0 as u8);`
`13`	`13`	`\| ++++ +`
`@@ -35,7 +35,7 @@ LL \| let g = BitXor::bitor;`
`35`	`35`	`\|`
`36`	`36`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`37`	`37`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`38`		-help: use `dyn`
	`38`	+help: if this is an object-safe trait, use `dyn`
`39`	`39`	`\|`
`40`	`40`	`LL \| let g = <dyn BitXor>::bitor;`
`41`	`41`	`\| ++++ +`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| Trait::nonexistent(());`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `#[warn(bare_trait_objects)]` on by default
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| <dyn Trait>::nonexistent(());`
`13`	`13`	`\| ++++ +`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ LL \| eq::<dyn, Foo>`
`21`	`21`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`22`	`22`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`23`	`23`	= note: `#[warn(bare_trait_objects)]` on by default
`24`		-help: use `dyn`
	`24`	+help: if this is an object-safe trait, use `dyn`
`25`	`25`	`\|`
`26`	`26`	`LL \| eq::<dyn, dyn Foo>`
`27`	`27`	`\| +++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| let _: Dyn::Ty;`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `#[warn(bare_trait_objects)]` on by default
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _: <dyn Dyn>::Ty;`
`13`	`13`	`\| ++++ +`
`@@ -26,7 +26,7 @@ LL \| Dyn::func();`
`26`	`26`	`\|`
`27`	`27`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`28`	`28`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`29`		-help: use `dyn`
	`29`	+help: if this is an object-safe trait, use `dyn`
`30`	`30`	`\|`
`31`	`31`	`LL \| <dyn Dyn>::func();`
`32`	`32`	`\| ++++ +`
`@@ -39,7 +39,7 @@ LL \| ::Dyn::func();`
`39`	`39`	`\|`
`40`	`40`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`41`	`41`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`42`		-help: use `dyn`
	`42`	+help: if this is an object-safe trait, use `dyn`
`43`	`43`	`\|`
`44`	`44`	`LL \| <dyn (::Dyn)>::func();`
`45`	`45`	`\| ++++++ ++`
`@@ -52,7 +52,7 @@ LL \| Dyn::CONST;`
`52`	`52`	`\|`
`53`	`53`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`54`	`54`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`55`		-help: use `dyn`
	`55`	+help: if this is an object-safe trait, use `dyn`
`56`	`56`	`\|`
`57`	`57`	`LL \| <dyn Dyn>::CONST;`
`58`	`58`	`\| ++++ +`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| pub fn function(_x: Box<SomeTrait>) {}`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: requested on the command line with `--force-warn bare-trait-objects`
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| pub fn function(_x: Box<dyn SomeTrait>) {}`
`13`	`13`	`\| +++`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| pub fn function(_x: Box<SomeTrait>) {}`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
`10`	`10`	= help: to override `--force-warn rust-2018-idioms` add `#[allow(bare_trait_objects)]`
`11`		-help: use `dyn`
	`11`	+help: if this is an object-safe trait, use `dyn`
`12`	`12`	`\|`
`13`	`13`	`LL \| pub fn function(_x: Box<dyn SomeTrait>) {}`
`14`	`14`	`\| +++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| trait B { fn f(a: A) -> A; }`
`7`	`7`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`8`	`8`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`9`	`9`	= note: `#[warn(bare_trait_objects)]` on by default
`10`		-help: use `dyn`
	`10`	+help: if this is an object-safe trait, use `dyn`
`11`	`11`	`\|`
`12`	`12`	`LL \| trait B { fn f(a: dyn A) -> A; }`
`13`	`13`	`\| +++`
`@@ -20,7 +20,7 @@ LL \| trait B { fn f(a: A) -> A; }`
`20`	`20`	`\|`
`21`	`21`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`22`	`22`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`23`		-help: use `dyn`
	`23`	+help: if this is an object-safe trait, use `dyn`
`24`	`24`	`\|`
`25`	`25`	`LL \| trait B { fn f(a: A) -> dyn A; }`
`26`	`26`	`\| +++`
`@@ -33,7 +33,7 @@ LL \| trait A { fn g(b: B) -> B; }`
`33`	`33`	`\|`
`34`	`34`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`35`	`35`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`36`		-help: use `dyn`
	`36`	+help: if this is an object-safe trait, use `dyn`
`37`	`37`	`\|`
`38`	`38`	`LL \| trait A { fn g(b: dyn B) -> B; }`
`39`	`39`	`\| +++`
`@@ -46,7 +46,7 @@ LL \| trait A { fn g(b: B) -> B; }`
`46`	`46`	`\|`
`47`	`47`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`48`	`48`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`49`		-help: use `dyn`
	`49`	+help: if this is an object-safe trait, use `dyn`
`50`	`50`	`\|`
`51`	`51`	`LL \| trait A { fn g(b: B) -> dyn B; }`
`52`	`52`	`\| +++`
`@@ -60,7 +60,7 @@ LL \| trait B { fn f(a: A) -> A; }`
`60`	`60`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`61`	`61`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`62`	`62`	= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
`63`		-help: use `dyn`
	`63`	+help: if this is an object-safe trait, use `dyn`
`64`	`64`	`\|`
`65`	`65`	`LL \| trait B { fn f(a: dyn A) -> A; }`
`66`	`66`	`\| +++`
`@@ -96,7 +96,7 @@ LL \| trait A { fn g(b: B) -> B; }`
`96`	`96`	`= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!`
`97`	`97`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>`
`98`	`98`	= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
`99`		-help: use `dyn`
	`99`	+help: if this is an object-safe trait, use `dyn`
`100`	`100`	`\|`
`101`	`101`	`LL \| trait A { fn g(b: dyn B) -> B; }`
`102`	`102`	`\| +++`