Skip to content

Commit 958d6f8

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#120530 - trevyn:issue-116434, r=compiler-errors
Be less confident when `dyn` suggestion is not checked for object safety rust-lang#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 rust-lang#116434 r? `@fmease`
2 parents f12c1c2 + 8d31a53 commit 958d6f8

27 files changed

+211
-64
lines changed

‎compiler/rustc_hir_analysis/src/astconv/lint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
243243
tcx.node_span_lint(BARE_TRAIT_OBJECTS, self_ty.hir_id, self_ty.span, msg, |lint| {
244244
if self_ty.span.can_be_used_for_suggestions() {
245245
lint.multipart_suggestion_verbose(
246-
"use `dyn`",
246+
"if this is an object-safe trait, use `dyn`",
247247
sugg,
248-
Applicability::MachineApplicable,
248+
Applicability::MaybeIncorrect,
249249
);
250250
}
251251
self.maybe_lint_blanket_trait_impl(self_ty, lint);

‎tests/ui/did_you_mean/bad-assoc-ty.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ LL | type H = Fn(u8) -> (u8)::Output;
182182
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
183183
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
184184
= note: `#[warn(bare_trait_objects)]` on by default
185-
help: use `dyn`
185+
help: if this is an object-safe trait, use `dyn`
186186
|
187187
LL | type H = <dyn Fn(u8) -> (u8)>::Output;
188188
| ++++ +

‎tests/ui/dyn-keyword/dyn-2018-edition-lint.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ note: the lint level is defined here
1111
|
1212
LL | #[deny(bare_trait_objects)]
1313
| ^^^^^^^^^^^^^^^^^^
14-
help: use `dyn`
14+
help: if this is an object-safe trait, use `dyn`
1515
|
1616
LL | fn function(x: &dyn SomeTrait, y: Box<SomeTrait>) {
1717
| +++
@@ -24,7 +24,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
2424
|
2525
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
2626
= 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`
2828
|
2929
LL | fn function(x: &SomeTrait, y: Box<dyn SomeTrait>) {
3030
| +++
@@ -37,7 +37,7 @@ LL | let _x: &SomeTrait = todo!();
3737
|
3838
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
3939
= 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`
4141
|
4242
LL | let _x: &dyn SomeTrait = todo!();
4343
| +++
@@ -51,7 +51,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
5151
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
5252
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
5353
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
54-
help: use `dyn`
54+
help: if this is an object-safe trait, use `dyn`
5555
|
5656
LL | fn function(x: &dyn SomeTrait, y: Box<SomeTrait>) {
5757
| +++
@@ -65,7 +65,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
6565
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
6666
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
6767
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
68-
help: use `dyn`
68+
help: if this is an object-safe trait, use `dyn`
6969
|
7070
LL | fn function(x: &dyn SomeTrait, y: Box<SomeTrait>) {
7171
| +++
@@ -79,7 +79,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
7979
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
8080
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
8181
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
82-
help: use `dyn`
82+
help: if this is an object-safe trait, use `dyn`
8383
|
8484
LL | fn function(x: &SomeTrait, y: Box<dyn SomeTrait>) {
8585
| +++
@@ -93,7 +93,7 @@ LL | fn function(x: &SomeTrait, y: Box<SomeTrait>) {
9393
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
9494
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
9595
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
96-
help: use `dyn`
96+
help: if this is an object-safe trait, use `dyn`
9797
|
9898
LL | fn function(x: &SomeTrait, y: Box<dyn SomeTrait>) {
9999
| +++

‎tests/ui/dyn-keyword/dyn-angle-brackets.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ note: the lint level is defined here
1111
|
1212
LL | #![deny(bare_trait_objects)]
1313
| ^^^^^^^^^^^^^^^^^^
14-
help: use `dyn`
14+
help: if this is an object-safe trait, use `dyn`
1515
|
1616
LL | <dyn fmt::Debug>::fmt(self, f)
1717
| +++

‎tests/ui/impl-trait/fresh-lifetime-from-bare-trait-obj-114664.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | fn ice() -> impl AsRef<Fn(&())> {
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `#[warn(bare_trait_objects)]` on by default
10-
help: use `dyn`
10+
help: if this is an object-safe trait, use `dyn`
1111
|
1212
LL | fn ice() -> impl AsRef<dyn Fn(&())> {
1313
| +++
@@ -21,7 +21,7 @@ LL | fn ice() -> impl AsRef<Fn(&())> {
2121
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2222
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2323
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
24-
help: use `dyn`
24+
help: if this is an object-safe trait, use `dyn`
2525
|
2626
LL | fn ice() -> impl AsRef<dyn Fn(&())> {
2727
| +++
@@ -35,7 +35,7 @@ LL | fn ice() -> impl AsRef<Fn(&())> {
3535
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3636
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3737
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38-
help: use `dyn`
38+
help: if this is an object-safe trait, use `dyn`
3939
|
4040
LL | fn ice() -> impl AsRef<dyn Fn(&())> {
4141
| +++

‎tests/ui/issues/issue-28344.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `#[warn(bare_trait_objects)]` on by default
10-
help: use `dyn`
10+
help: if this is an object-safe trait, use `dyn`
1111
|
1212
LL | let x: u8 = <dyn BitXor>::bitor(0 as u8, 0 as u8);
1313
| ++++ +
@@ -35,7 +35,7 @@ LL | let g = BitXor::bitor;
3535
|
3636
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3737
= 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`
3939
|
4040
LL | let g = <dyn BitXor>::bitor;
4141
| ++++ +

‎tests/ui/issues/issue-58734.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | Trait::nonexistent(());
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `#[warn(bare_trait_objects)]` on by default
10-
help: use `dyn`
10+
help: if this is an object-safe trait, use `dyn`
1111
|
1212
LL | <dyn Trait>::nonexistent(());
1313
| ++++ +

‎tests/ui/issues/issue-86756.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LL | eq::<dyn, Foo>
2121
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2222
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2323
= note: `#[warn(bare_trait_objects)]` on by default
24-
help: use `dyn`
24+
help: if this is an object-safe trait, use `dyn`
2525
|
2626
LL | eq::<dyn, dyn Foo>
2727
| +++

‎tests/ui/lint/bare-trait-objects-path.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | let _: Dyn::Ty;
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `#[warn(bare_trait_objects)]` on by default
10-
help: use `dyn`
10+
help: if this is an object-safe trait, use `dyn`
1111
|
1212
LL | let _: <dyn Dyn>::Ty;
1313
| ++++ +
@@ -26,7 +26,7 @@ LL | Dyn::func();
2626
|
2727
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2828
= 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`
3030
|
3131
LL | <dyn Dyn>::func();
3232
| ++++ +
@@ -39,7 +39,7 @@ LL | ::Dyn::func();
3939
|
4040
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
4141
= 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`
4343
|
4444
LL | <dyn (::Dyn)>::func();
4545
| ++++++ ++
@@ -52,7 +52,7 @@ LL | Dyn::CONST;
5252
|
5353
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
5454
= 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`
5656
|
5757
LL | <dyn Dyn>::CONST;
5858
| ++++ +

‎tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= 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`
1111
|
1212
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
1313
| +++
@@ -21,7 +21,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
2121
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2222
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2323
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
24-
help: use `dyn`
24+
help: if this is an object-safe trait, use `dyn`
2525
|
2626
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
2727
| +++
@@ -35,7 +35,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
3535
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3636
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3737
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38-
help: use `dyn`
38+
help: if this is an object-safe trait, use `dyn`
3939
|
4040
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
4141
| +++

‎tests/ui/lint/force-warn/cap-lints-allow.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= 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`
1111
|
1212
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
1313
| +++
@@ -21,7 +21,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
2121
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2222
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2323
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
24-
help: use `dyn`
24+
help: if this is an object-safe trait, use `dyn`
2525
|
2626
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
2727
| +++
@@ -35,7 +35,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
3535
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3636
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3737
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38-
help: use `dyn`
38+
help: if this is an object-safe trait, use `dyn`
3939
|
4040
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
4141
| +++

‎tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
1010
= 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`
1212
|
1313
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
1414
| +++
@@ -22,7 +22,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
2222
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2323
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2424
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
25-
help: use `dyn`
25+
help: if this is an object-safe trait, use `dyn`
2626
|
2727
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
2828
| +++
@@ -36,7 +36,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
3636
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3737
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3838
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
39-
help: use `dyn`
39+
help: if this is an object-safe trait, use `dyn`
4040
|
4141
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
4242
| +++

‎tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
1010
= 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`
1212
|
1313
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
1414
| +++
@@ -22,7 +22,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
2222
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2323
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2424
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
25-
help: use `dyn`
25+
help: if this is an object-safe trait, use `dyn`
2626
|
2727
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
2828
| +++
@@ -36,7 +36,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
3636
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3737
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3838
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
39-
help: use `dyn`
39+
help: if this is an object-safe trait, use `dyn`
4040
|
4141
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
4242
| +++

‎tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
1010
= 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`
1212
|
1313
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
1414
| +++
@@ -22,7 +22,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
2222
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2323
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2424
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
25-
help: use `dyn`
25+
help: if this is an object-safe trait, use `dyn`
2626
|
2727
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
2828
| +++
@@ -36,7 +36,7 @@ LL | pub fn function(_x: Box<SomeTrait>) {}
3636
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
3737
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
3838
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
39-
help: use `dyn`
39+
help: if this is an object-safe trait, use `dyn`
4040
|
4141
LL | pub fn function(_x: Box<dyn SomeTrait>) {}
4242
| +++

‎tests/ui/object-safety/avoid-ice-on-warning-2.old.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | fn id<F>(f: Copy) -> usize {
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
= note: `#[warn(bare_trait_objects)]` on by default
10-
help: use `dyn`
10+
help: if this is an object-safe trait, use `dyn`
1111
|
1212
LL | fn id<F>(f: dyn Copy) -> usize {
1313
| +++
@@ -21,7 +21,7 @@ LL | fn id<F>(f: Copy) -> usize {
2121
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
2222
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
2323
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
24-
help: use `dyn`
24+
help: if this is an object-safe trait, use `dyn`
2525
|
2626
LL | fn id<F>(f: dyn Copy) -> usize {
2727
| +++

0 commit comments

Comments
 (0)