From 8477b9b707db74aa97a8390ff562f0e20b5d4d86 Mon Sep 17 00:00:00 2001 From: mejrs <> Date: Sun, 11 Sep 2022 00:46:53 +0200 Subject: Note if mismatched types have a similar name --- .../fully-qualified-type-name2.stderr | 12 +++++++++++ src/test/ui/issues/issue-56943.stderr | 12 +++++++++++ src/test/ui/mismatched_types/similar_paths.rs | 11 +++++++++++ src/test/ui/mismatched_types/similar_paths.stderr | 23 ++++++++++++++++++++++ .../ui/type/type-mismatch-same-crate-name.stderr | 11 +++++++++++ 5 files changed, 69 insertions(+) create mode 100644 src/test/ui/mismatched_types/similar_paths.rs create mode 100644 src/test/ui/mismatched_types/similar_paths.stderr (limited to 'src/test') diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr index aed7f72c660..8729ea1740c 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr @@ -5,6 +5,18 @@ LL | fn bar(x: x::Foo) -> y::Foo { | ------ expected `y::Foo` because of return type LL | return x; | ^ expected enum `y::Foo`, found enum `x::Foo` + | + = note: enum `x::Foo` and enum `y::Foo` have similar names, but are actually distinct types +note: enum `x::Foo` is defined in the current crate. + --> $DIR/fully-qualified-type-name2.rs:4:5 + | +LL | pub enum Foo { } + | ^^^^^^^^^^^^ +note: enum `y::Foo` is defined in the current crate. + --> $DIR/fully-qualified-type-name2.rs:8:5 + | +LL | pub enum Foo { } + | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/issues/issue-56943.stderr b/src/test/ui/issues/issue-56943.stderr index 74ed5ec0fb6..3efa5f6d040 100644 --- a/src/test/ui/issues/issue-56943.stderr +++ b/src/test/ui/issues/issue-56943.stderr @@ -5,6 +5,18 @@ LL | let _: issue_56943::S = issue_56943::S2; | -------------- ^^^^^^^^^^^^^^^ expected struct `S`, found struct `S2` | | | expected due to this + | + = note: struct `S2` and struct `S` have similar names, but are actually distinct types +note: struct `S2` is defined in crate `issue_56943`. + --> $DIR/auxiliary/issue-56943.rs:2:9 + | +LL | mod m { pub struct S; } + | ^^^^^^^^^^^^ +note: struct `S` is defined in crate `issue_56943`. + --> $DIR/auxiliary/issue-56943.rs:1:1 + | +LL | pub struct S; + | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/mismatched_types/similar_paths.rs b/src/test/ui/mismatched_types/similar_paths.rs new file mode 100644 index 00000000000..4d3a2a1fcc6 --- /dev/null +++ b/src/test/ui/mismatched_types/similar_paths.rs @@ -0,0 +1,11 @@ +enum Option{ + Some(T), + None, +} + +pub fn foo() -> Option{ + Some(42_u8) + //~^ ERROR mismatched types [E0308] +} + +fn main(){} diff --git a/src/test/ui/mismatched_types/similar_paths.stderr b/src/test/ui/mismatched_types/similar_paths.stderr new file mode 100644 index 00000000000..c12afd20b9c --- /dev/null +++ b/src/test/ui/mismatched_types/similar_paths.stderr @@ -0,0 +1,23 @@ +error[E0308]: mismatched types + --> $DIR/similar_paths.rs:7:5 + | +LL | pub fn foo() -> Option{ + | ---------- expected `Option` because of return type +LL | Some(42_u8) + | ^^^^^^^^^^^ expected enum `Option`, found enum `std::option::Option` + | + = note: enum `std::option::Option` and enum `Option` have similar names, but are actually distinct types +note: enum `std::option::Option` is defined in the standard library. + --> $SRC_DIR/core/src/option.rs:LL:COL + | +LL | pub enum Option { + | ^^^^^^^^^^^^^^^^^^ +note: enum `Option` is defined in the current crate. + --> $DIR/similar_paths.rs:1:1 + | +LL | enum Option{ + | ^^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/type/type-mismatch-same-crate-name.stderr b/src/test/ui/type/type-mismatch-same-crate-name.stderr index 783f747fa6d..38a36e8940f 100644 --- a/src/test/ui/type/type-mismatch-same-crate-name.stderr +++ b/src/test/ui/type/type-mismatch-same-crate-name.stderr @@ -6,6 +6,17 @@ LL | a::try_foo(foo2); | | | arguments to this function are incorrect | + = note: struct `main::a::Foo` and struct `main::a::Foo` have similar names, but are actually distinct types +note: struct `main::a::Foo` is defined in crate `crate_a2`. + --> $DIR/auxiliary/crate_a2.rs:1:1 + | +LL | pub struct Foo; + | ^^^^^^^^^^^^^^ +note: struct `main::a::Foo` is defined in crate `crate_a1`. + --> $DIR/auxiliary/crate_a1.rs:1:1 + | +LL | pub struct Foo; + | ^^^^^^^^^^^^^^ = note: perhaps two different versions of crate `crate_a1` are being used? note: function defined here --> $DIR/auxiliary/crate_a1.rs:10:8 -- cgit 1.4.1-3-g733a5 From 3699c2497bc6ff74126ae8c56a06905f49d0300c Mon Sep 17 00:00:00 2001 From: mejrs <> Date: Mon, 12 Sep 2022 22:17:06 +0200 Subject: Address feedback --- .../rustc_infer/src/infer/error_reporting/mod.rs | 171 +++++++++++++++++---- compiler/rustc_infer/src/lib.rs | 2 + .../fully-qualified-type-name2.stderr | 4 +- src/test/ui/issues/issue-56943.stderr | 12 -- src/test/ui/mismatched_types/show_module.rs | 18 +++ src/test/ui/mismatched_types/show_module.stderr | 23 +++ src/test/ui/mismatched_types/similar_paths.stderr | 4 +- .../ui/mismatched_types/similar_paths_primitive.rs | 10 ++ .../similar_paths_primitive.stderr | 24 +++ .../ui/type/type-mismatch-same-crate-name.stderr | 4 +- 10 files changed, 223 insertions(+), 49 deletions(-) create mode 100644 src/test/ui/mismatched_types/show_module.rs create mode 100644 src/test/ui/mismatched_types/show_module.stderr create mode 100644 src/test/ui/mismatched_types/similar_paths_primitive.rs create mode 100644 src/test/ui/mismatched_types/similar_paths_primitive.stderr (limited to 'src/test') diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs index ab76b488478..d4e8e267bab 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs @@ -1654,47 +1654,156 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { ), Mismatch::Fixed(s) => (s.into(), s.into(), None), }; - let looks_similar = |e: ExpectedFound>| { - // We're only interested in adts - if let (Some(e), Some(f)) = (e.expected.ty_adt_def(), e.found.ty_adt_def()) { - // Only compare the last parts of the path. - // `whatever::Foo` is pretty similar to `blah::Foo` - let e_path = self.tcx.def_path(e.did()).data; - let f_path = self.tcx.def_path(f.did()).data; - if let (Some(e), Some(f)) = (e_path.last(), f_path.last()) { - return e.data == f.data; + + enum Similar<'tcx> { + Adts(ty::AdtDef<'tcx>, ty::AdtDef<'tcx>), + PrimitiveFound(Ty<'tcx>, ty::AdtDef<'tcx>), + PrimitiveExpected(ty::AdtDef<'tcx>, Ty<'tcx>), + } + + let primitive_sym = |kind: &_| match kind { + ty::Bool => Some(sym::bool), + ty::Char => Some(sym::char), + ty::Float(f) => match f { + ty::FloatTy::F32 => Some(sym::f32), + ty::FloatTy::F64 => Some(sym::f64), + }, + ty::Int(f) => match f { + ty::IntTy::Isize => Some(sym::isize), + ty::IntTy::I8 => Some(sym::i8), + ty::IntTy::I16 => Some(sym::i16), + ty::IntTy::I32 => Some(sym::i32), + ty::IntTy::I64 => Some(sym::i64), + ty::IntTy::I128 => Some(sym::i128), + }, + ty::Uint(f) => match f { + ty::UintTy::Usize => Some(sym::usize), + ty::UintTy::U8 => Some(sym::u8), + ty::UintTy::U16 => Some(sym::u16), + ty::UintTy::U32 => Some(sym::u32), + ty::UintTy::U64 => Some(sym::u64), + ty::UintTy::U128 => Some(sym::u128), + }, + _ => None, + }; + + let similarity = |e: ExpectedFound>| { + let (fk, ek) = (e.found.kind(), e.expected.kind()); + match (fk, ek) { + ( + ty::Adt(adt, _), + ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_), + ) => { + let path = self.tcx.def_path(adt.did()).data; + let name = path.last().unwrap().data.get_opt_name(); + let prim_sym = primitive_sym(ek); + + if name == prim_sym { + return Some(Similar::PrimitiveExpected(*adt, e.expected)); + } + None + } + ( + ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_), + ty::Adt(adt, _), + ) => { + let path = self.tcx.def_path(adt.did()).data; + let name = path.last().unwrap().data.get_opt_name(); + let prim_sym = primitive_sym(fk); + + if name == prim_sym { + return Some(Similar::PrimitiveFound(e.expected, *adt)); + } + None + } + (ty::Adt(f, _), ty::Adt(e, _)) => { + if !f.did().is_local() && f.did().krate == e.did().krate { + // Most likely types from different versions of the same crate + // are in play, in which case this message isn't so helpful. + // A "perhaps two different versions..." error is already emitted for that. + return None; + } + let e_path = self.tcx.def_path(e.did()).data; + let f_path = self.tcx.def_path(f.did()).data; + if let (Some(e_last), Some(f_last)) = (e_path.last(), f_path.last()) && e_last == f_last { + return Some(Similar::Adts(*f, *e)); + } + None } + _ => None, } - false }; match terr { // If two types mismatch but have similar names, mention that specifically. - TypeError::Sorts(values) if looks_similar(values) => { - let found_adt = values.found.ty_adt_def().unwrap(); - let expected_adt = values.expected.ty_adt_def().unwrap(); - - let found_name = values.found.sort_string(self.tcx); - let expected_name = values.expected.sort_string(self.tcx); + TypeError::Sorts(values) if let Some(s) = similarity(values) => { + let diagnose_primitive = + |prim: Ty<'tcx>, + shadow: Ty<'tcx>, + defid: DefId, + diagnostic: &mut Diagnostic| { + let name = shadow.sort_string(self.tcx); + diagnostic.note(format!( + "{prim} and {name} have similar names, but are actually distinct types" + )); + diagnostic + .note(format!("{prim} is a primitive defined by the language")); + let def_span = self.tcx.def_span(defid); + let msg = if defid.is_local() { + format!("{name} is defined in the current crate") + } else { + let crate_name = self.tcx.crate_name(defid.krate); + format!("{name} is defined in crate `{crate_name}") + }; + diagnostic.span_note(def_span, msg); + }; - diag.note(format!("{found_name} and {expected_name} have similar names, but are actually distinct types")); + let diagnose_adts = + |found_adt: ty::AdtDef<'tcx>, + expected_adt: ty::AdtDef<'tcx>, + diagnostic: &mut Diagnostic| { + let found_name = values.found.sort_string(self.tcx); + let expected_name = values.expected.sort_string(self.tcx); - for (adt, name) in [(found_adt, found_name), (expected_adt, expected_name)] { - let defid = adt.did(); - let def_span = self.tcx.def_span(defid); + let found_defid = found_adt.did(); + let expected_defid = expected_adt.did(); - let msg = if defid.is_local() { - format!("{name} is defined in the current crate.") - } else if self.tcx.all_diagnostic_items(()).id_to_name.get(&defid).is_some() - { - // if it's a diagnostic item, it's definitely defined in std/core/alloc - // otherwise might be, might not be. - format!("{name} is defined in the standard library.") - } else { - let crate_name = self.tcx.crate_name(defid.krate); - format!("{name} is defined in crate `{crate_name}`.") + diagnostic.note(format!("{found_name} and {expected_name} have similar names, but are actually distinct types")); + for (defid, name) in + [(found_defid, found_name), (expected_defid, expected_name)] + { + let def_span = self.tcx.def_span(defid); + + let msg = if found_defid.is_local() && expected_defid.is_local() { + let module = self + .tcx + .parent_module_from_def_id(defid.expect_local()) + .to_def_id(); + let module_name = + self.tcx.def_path(module).to_string_no_crate_verbose(); + format!( + "{name} is defined in module {module_name} of the current crate" + ) + } else if defid.is_local() { + format!("{name} is defined in the current crate") + } else { + let crate_name = self.tcx.crate_name(defid.krate); + format!("{name} is defined in crate `{crate_name}`") + }; + diagnostic.span_note(def_span, msg); + } }; - diag.span_note(def_span, msg); + + match s { + Similar::Adts(found_adt, expected_adt) => { + diagnose_adts(found_adt, expected_adt, diag) + } + Similar::PrimitiveFound(prim, e) => { + diagnose_primitive(prim, values.expected, e.did(), diag) + } + Similar::PrimitiveExpected(f, prim) => { + diagnose_primitive(prim, values.found, f.did(), diag) + } } } TypeError::Sorts(values) => { diff --git a/compiler/rustc_infer/src/lib.rs b/compiler/rustc_infer/src/lib.rs index ef60d2c9188..5b14e5bdb78 100644 --- a/compiler/rustc_infer/src/lib.rs +++ b/compiler/rustc_infer/src/lib.rs @@ -20,6 +20,8 @@ #![cfg_attr(bootstrap, feature(label_break_value))] #![feature(let_chains)] #![cfg_attr(bootstrap, feature(let_else))] +#![feature(let_else)] +#![feature(if_let_guard)] #![feature(min_specialization)] #![feature(never_type)] #![feature(try_blocks)] diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr index 8729ea1740c..94c34cf9d04 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr @@ -7,12 +7,12 @@ LL | return x; | ^ expected enum `y::Foo`, found enum `x::Foo` | = note: enum `x::Foo` and enum `y::Foo` have similar names, but are actually distinct types -note: enum `x::Foo` is defined in the current crate. +note: enum `x::Foo` is defined in module ::x of the current crate --> $DIR/fully-qualified-type-name2.rs:4:5 | LL | pub enum Foo { } | ^^^^^^^^^^^^ -note: enum `y::Foo` is defined in the current crate. +note: enum `y::Foo` is defined in module ::y of the current crate --> $DIR/fully-qualified-type-name2.rs:8:5 | LL | pub enum Foo { } diff --git a/src/test/ui/issues/issue-56943.stderr b/src/test/ui/issues/issue-56943.stderr index 3efa5f6d040..74ed5ec0fb6 100644 --- a/src/test/ui/issues/issue-56943.stderr +++ b/src/test/ui/issues/issue-56943.stderr @@ -5,18 +5,6 @@ LL | let _: issue_56943::S = issue_56943::S2; | -------------- ^^^^^^^^^^^^^^^ expected struct `S`, found struct `S2` | | | expected due to this - | - = note: struct `S2` and struct `S` have similar names, but are actually distinct types -note: struct `S2` is defined in crate `issue_56943`. - --> $DIR/auxiliary/issue-56943.rs:2:9 - | -LL | mod m { pub struct S; } - | ^^^^^^^^^^^^ -note: struct `S` is defined in crate `issue_56943`. - --> $DIR/auxiliary/issue-56943.rs:1:1 - | -LL | pub struct S; - | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/mismatched_types/show_module.rs b/src/test/ui/mismatched_types/show_module.rs new file mode 100644 index 00000000000..97d45b377bc --- /dev/null +++ b/src/test/ui/mismatched_types/show_module.rs @@ -0,0 +1,18 @@ +pub mod blah{ + pub mod baz{ + pub struct Foo; + } +} + +pub mod meh{ + pub struct Foo; +} + +pub type Foo = blah::baz::Foo; + +fn foo() -> Foo { + meh::Foo + //~^ ERROR mismatched types [E0308] +} + +fn main(){} diff --git a/src/test/ui/mismatched_types/show_module.stderr b/src/test/ui/mismatched_types/show_module.stderr new file mode 100644 index 00000000000..6d8986d1cad --- /dev/null +++ b/src/test/ui/mismatched_types/show_module.stderr @@ -0,0 +1,23 @@ +error[E0308]: mismatched types + --> $DIR/show_module.rs:14:5 + | +LL | fn foo() -> Foo { + | --- expected `baz::Foo` because of return type +LL | meh::Foo + | ^^^^^^^^ expected struct `baz::Foo`, found struct `meh::Foo` + | + = note: struct `meh::Foo` and struct `baz::Foo` have similar names, but are actually distinct types +note: struct `meh::Foo` is defined in module ::meh of the current crate + --> $DIR/show_module.rs:8:5 + | +LL | pub struct Foo; + | ^^^^^^^^^^^^^^ +note: struct `baz::Foo` is defined in module ::blah::baz of the current crate + --> $DIR/show_module.rs:3:9 + | +LL | pub struct Foo; + | ^^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/mismatched_types/similar_paths.stderr b/src/test/ui/mismatched_types/similar_paths.stderr index c12afd20b9c..16f33e55fea 100644 --- a/src/test/ui/mismatched_types/similar_paths.stderr +++ b/src/test/ui/mismatched_types/similar_paths.stderr @@ -7,12 +7,12 @@ LL | Some(42_u8) | ^^^^^^^^^^^ expected enum `Option`, found enum `std::option::Option` | = note: enum `std::option::Option` and enum `Option` have similar names, but are actually distinct types -note: enum `std::option::Option` is defined in the standard library. +note: enum `std::option::Option` is defined in crate `core` --> $SRC_DIR/core/src/option.rs:LL:COL | LL | pub enum Option { | ^^^^^^^^^^^^^^^^^^ -note: enum `Option` is defined in the current crate. +note: enum `Option` is defined in the current crate --> $DIR/similar_paths.rs:1:1 | LL | enum Option{ diff --git a/src/test/ui/mismatched_types/similar_paths_primitive.rs b/src/test/ui/mismatched_types/similar_paths_primitive.rs new file mode 100644 index 00000000000..8f5b7cce469 --- /dev/null +++ b/src/test/ui/mismatched_types/similar_paths_primitive.rs @@ -0,0 +1,10 @@ +#![allow(non_camel_case_types)] + +struct bool; + +fn foo(_: bool) {} + +fn main() { + foo(true); + //~^ ERROR mismatched types [E0308] +} diff --git a/src/test/ui/mismatched_types/similar_paths_primitive.stderr b/src/test/ui/mismatched_types/similar_paths_primitive.stderr new file mode 100644 index 00000000000..8a2f73945e8 --- /dev/null +++ b/src/test/ui/mismatched_types/similar_paths_primitive.stderr @@ -0,0 +1,24 @@ +error[E0308]: mismatched types + --> $DIR/similar_paths_primitive.rs:8:9 + | +LL | foo(true); + | --- ^^^^ expected struct `bool`, found `bool` + | | + | arguments to this function are incorrect + | + = note: bool and struct `bool` have similar names, but are actually distinct types + = note: bool is a primitive defined by the language +note: struct `bool` is defined in the current crate + --> $DIR/similar_paths_primitive.rs:3:1 + | +LL | struct bool; + | ^^^^^^^^^^^ +note: function defined here + --> $DIR/similar_paths_primitive.rs:5:4 + | +LL | fn foo(_: bool) {} + | ^^^ ------- + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/type/type-mismatch-same-crate-name.stderr b/src/test/ui/type/type-mismatch-same-crate-name.stderr index 38a36e8940f..fcafd315ebf 100644 --- a/src/test/ui/type/type-mismatch-same-crate-name.stderr +++ b/src/test/ui/type/type-mismatch-same-crate-name.stderr @@ -7,12 +7,12 @@ LL | a::try_foo(foo2); | arguments to this function are incorrect | = note: struct `main::a::Foo` and struct `main::a::Foo` have similar names, but are actually distinct types -note: struct `main::a::Foo` is defined in crate `crate_a2`. +note: struct `main::a::Foo` is defined in crate `crate_a2` --> $DIR/auxiliary/crate_a2.rs:1:1 | LL | pub struct Foo; | ^^^^^^^^^^^^^^ -note: struct `main::a::Foo` is defined in crate `crate_a1`. +note: struct `main::a::Foo` is defined in crate `crate_a1` --> $DIR/auxiliary/crate_a1.rs:1:1 | LL | pub struct Foo; -- cgit 1.4.1-3-g733a5 From 14e98930239e0a419d9662cde6e4a3aac6564f5a Mon Sep 17 00:00:00 2001 From: mejrs <> Date: Sun, 18 Sep 2022 02:59:32 +0200 Subject: Print out the proper crate path --- compiler/rustc_infer/src/infer/error_reporting/mod.rs | 7 ++----- compiler/rustc_infer/src/lib.rs | 1 - src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr | 4 ++-- src/test/ui/mismatched_types/show_module.stderr | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src/test') diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs index d4e8e267bab..dbe068ff174 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs @@ -1779,11 +1779,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { .tcx .parent_module_from_def_id(defid.expect_local()) .to_def_id(); - let module_name = - self.tcx.def_path(module).to_string_no_crate_verbose(); - format!( - "{name} is defined in module {module_name} of the current crate" - ) + let module_name = self.tcx.def_path(module).to_string_no_crate_verbose(); + format!("{name} is defined in module `crate{module_name}` of the current crate") } else if defid.is_local() { format!("{name} is defined in the current crate") } else { diff --git a/compiler/rustc_infer/src/lib.rs b/compiler/rustc_infer/src/lib.rs index 5b14e5bdb78..909a597e221 100644 --- a/compiler/rustc_infer/src/lib.rs +++ b/compiler/rustc_infer/src/lib.rs @@ -20,7 +20,6 @@ #![cfg_attr(bootstrap, feature(label_break_value))] #![feature(let_chains)] #![cfg_attr(bootstrap, feature(let_else))] -#![feature(let_else)] #![feature(if_let_guard)] #![feature(min_specialization)] #![feature(never_type)] diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr index 94c34cf9d04..a8f23f81dea 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr @@ -7,12 +7,12 @@ LL | return x; | ^ expected enum `y::Foo`, found enum `x::Foo` | = note: enum `x::Foo` and enum `y::Foo` have similar names, but are actually distinct types -note: enum `x::Foo` is defined in module ::x of the current crate +note: enum `x::Foo` is defined in module `crate::x` of the current crate --> $DIR/fully-qualified-type-name2.rs:4:5 | LL | pub enum Foo { } | ^^^^^^^^^^^^ -note: enum `y::Foo` is defined in module ::y of the current crate +note: enum `y::Foo` is defined in module `crate::y` of the current crate --> $DIR/fully-qualified-type-name2.rs:8:5 | LL | pub enum Foo { } diff --git a/src/test/ui/mismatched_types/show_module.stderr b/src/test/ui/mismatched_types/show_module.stderr index 6d8986d1cad..5e48e0955aa 100644 --- a/src/test/ui/mismatched_types/show_module.stderr +++ b/src/test/ui/mismatched_types/show_module.stderr @@ -7,12 +7,12 @@ LL | meh::Foo | ^^^^^^^^ expected struct `baz::Foo`, found struct `meh::Foo` | = note: struct `meh::Foo` and struct `baz::Foo` have similar names, but are actually distinct types -note: struct `meh::Foo` is defined in module ::meh of the current crate +note: struct `meh::Foo` is defined in module `crate::meh` of the current crate --> $DIR/show_module.rs:8:5 | LL | pub struct Foo; | ^^^^^^^^^^^^^^ -note: struct `baz::Foo` is defined in module ::blah::baz of the current crate +note: struct `baz::Foo` is defined in module `crate::blah::baz` of the current crate --> $DIR/show_module.rs:3:9 | LL | pub struct Foo; -- cgit 1.4.1-3-g733a5 From c65866000e07270817465f3cbb8b1d01ecdb9a20 Mon Sep 17 00:00:00 2001 From: mejrs <> Date: Mon, 19 Sep 2022 17:19:45 +0200 Subject: Incorporate feedback --- .../rustc_infer/src/infer/error_reporting/mod.rs | 115 +++++++-------------- compiler/rustc_middle/src/ty/sty.rs | 31 +++++- src/test/ui/mismatched_types/show_module.rs | 8 +- src/test/ui/mismatched_types/similar_paths.rs | 6 +- src/test/ui/mismatched_types/similar_paths.stderr | 4 +- 5 files changed, 75 insertions(+), 89 deletions(-) (limited to 'src/test') diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs index dbe068ff174..aba2447fa68 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs @@ -1656,82 +1656,39 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { }; enum Similar<'tcx> { - Adts(ty::AdtDef<'tcx>, ty::AdtDef<'tcx>), - PrimitiveFound(Ty<'tcx>, ty::AdtDef<'tcx>), - PrimitiveExpected(ty::AdtDef<'tcx>, Ty<'tcx>), - } - - let primitive_sym = |kind: &_| match kind { - ty::Bool => Some(sym::bool), - ty::Char => Some(sym::char), - ty::Float(f) => match f { - ty::FloatTy::F32 => Some(sym::f32), - ty::FloatTy::F64 => Some(sym::f64), - }, - ty::Int(f) => match f { - ty::IntTy::Isize => Some(sym::isize), - ty::IntTy::I8 => Some(sym::i8), - ty::IntTy::I16 => Some(sym::i16), - ty::IntTy::I32 => Some(sym::i32), - ty::IntTy::I64 => Some(sym::i64), - ty::IntTy::I128 => Some(sym::i128), - }, - ty::Uint(f) => match f { - ty::UintTy::Usize => Some(sym::usize), - ty::UintTy::U8 => Some(sym::u8), - ty::UintTy::U16 => Some(sym::u16), - ty::UintTy::U32 => Some(sym::u32), - ty::UintTy::U64 => Some(sym::u64), - ty::UintTy::U128 => Some(sym::u128), - }, - _ => None, - }; - - let similarity = |e: ExpectedFound>| { - let (fk, ek) = (e.found.kind(), e.expected.kind()); - match (fk, ek) { - ( - ty::Adt(adt, _), - ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_), - ) => { - let path = self.tcx.def_path(adt.did()).data; - let name = path.last().unwrap().data.get_opt_name(); - let prim_sym = primitive_sym(ek); + Adts { expected: ty::AdtDef<'tcx>, found: ty::AdtDef<'tcx> }, + PrimitiveFound { expected: ty::AdtDef<'tcx>, found: Ty<'tcx> }, + PrimitiveExpected { expected: Ty<'tcx>, found: ty::AdtDef<'tcx> }, + } - if name == prim_sym { - return Some(Similar::PrimitiveExpected(*adt, e.expected)); - } - None + let similarity = |ExpectedFound { expected, found }: ExpectedFound>| { + if let ty::Adt(expected, _) = expected.kind() && let Some(primitive) = found.primitive_symbol() { + let path = self.tcx.def_path(expected.did()).data; + let name = path.last().unwrap().data.get_opt_name(); + if name == Some(primitive) { + return Some(Similar::PrimitiveFound { expected: *expected, found }); } - ( - ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_), - ty::Adt(adt, _), - ) => { - let path = self.tcx.def_path(adt.did()).data; - let name = path.last().unwrap().data.get_opt_name(); - let prim_sym = primitive_sym(fk); - - if name == prim_sym { - return Some(Similar::PrimitiveFound(e.expected, *adt)); - } - None + } else if let Some(primitive) = expected.primitive_symbol() && let ty::Adt(found, _) = found.kind() { + let path = self.tcx.def_path(found.did()).data; + let name = path.last().unwrap().data.get_opt_name(); + if name == Some(primitive) { + return Some(Similar::PrimitiveExpected { expected, found: *found }); } - (ty::Adt(f, _), ty::Adt(e, _)) => { - if !f.did().is_local() && f.did().krate == e.did().krate { - // Most likely types from different versions of the same crate - // are in play, in which case this message isn't so helpful. - // A "perhaps two different versions..." error is already emitted for that. - return None; - } - let e_path = self.tcx.def_path(e.did()).data; - let f_path = self.tcx.def_path(f.did()).data; - if let (Some(e_last), Some(f_last)) = (e_path.last(), f_path.last()) && e_last == f_last { - return Some(Similar::Adts(*f, *e)); - } - None + } else if let ty::Adt(expected, _) = expected.kind() && let ty::Adt(found, _) = found.kind() { + if !expected.did().is_local() && expected.did().krate == found.did().krate { + // Most likely types from different versions of the same crate + // are in play, in which case this message isn't so helpful. + // A "perhaps two different versions..." error is already emitted for that. + return None; + } + let f_path = self.tcx.def_path(found.did()).data; + let e_path = self.tcx.def_path(expected.did()).data; + + if let (Some(e_last), Some(f_last)) = (e_path.last(), f_path.last()) && e_last == f_last { + return Some(Similar::Adts{expected: *expected, found: *found}); } - _ => None, } + None }; match terr { @@ -1759,8 +1716,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { }; let diagnose_adts = - |found_adt: ty::AdtDef<'tcx>, - expected_adt: ty::AdtDef<'tcx>, + |expected_adt : ty::AdtDef<'tcx>, + found_adt: ty::AdtDef<'tcx>, diagnostic: &mut Diagnostic| { let found_name = values.found.sort_string(self.tcx); let expected_name = values.expected.sort_string(self.tcx); @@ -1792,14 +1749,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { }; match s { - Similar::Adts(found_adt, expected_adt) => { - diagnose_adts(found_adt, expected_adt, diag) + Similar::Adts{expected, found} => { + diagnose_adts(expected, found, diag) } - Similar::PrimitiveFound(prim, e) => { - diagnose_primitive(prim, values.expected, e.did(), diag) + Similar::PrimitiveFound{expected, found: prim} => { + diagnose_primitive(prim, values.expected, expected.did(), diag) } - Similar::PrimitiveExpected(f, prim) => { - diagnose_primitive(prim, values.found, f.did(), diag) + Similar::PrimitiveExpected{expected: prim, found} => { + diagnose_primitive(prim, values.found, found.did(), diag) } } } diff --git a/compiler/rustc_middle/src/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs index 36e56085039..6583e61931a 100644 --- a/compiler/rustc_middle/src/ty/sty.rs +++ b/compiler/rustc_middle/src/ty/sty.rs @@ -19,7 +19,7 @@ use rustc_hir as hir; use rustc_hir::def_id::DefId; use rustc_index::vec::Idx; use rustc_macros::HashStable; -use rustc_span::symbol::{kw, Symbol}; +use rustc_span::symbol::{kw, sym, Symbol}; use rustc_target::abi::VariantIdx; use rustc_target::spec::abi; use std::borrow::Cow; @@ -2274,6 +2274,35 @@ impl<'tcx> Ty<'tcx> { } } } + + // If `self` is a primitive, return its [`Symbol`]. + pub fn primitive_symbol(self) -> Option { + match self.kind() { + ty::Bool => Some(sym::bool), + ty::Char => Some(sym::char), + ty::Float(f) => match f { + ty::FloatTy::F32 => Some(sym::f32), + ty::FloatTy::F64 => Some(sym::f64), + }, + ty::Int(f) => match f { + ty::IntTy::Isize => Some(sym::isize), + ty::IntTy::I8 => Some(sym::i8), + ty::IntTy::I16 => Some(sym::i16), + ty::IntTy::I32 => Some(sym::i32), + ty::IntTy::I64 => Some(sym::i64), + ty::IntTy::I128 => Some(sym::i128), + }, + ty::Uint(f) => match f { + ty::UintTy::Usize => Some(sym::usize), + ty::UintTy::U8 => Some(sym::u8), + ty::UintTy::U16 => Some(sym::u16), + ty::UintTy::U32 => Some(sym::u32), + ty::UintTy::U64 => Some(sym::u64), + ty::UintTy::U128 => Some(sym::u128), + }, + _ => None, + } + } } /// Extra information about why we ended up with a particular variance. diff --git a/src/test/ui/mismatched_types/show_module.rs b/src/test/ui/mismatched_types/show_module.rs index 97d45b377bc..61550b88755 100644 --- a/src/test/ui/mismatched_types/show_module.rs +++ b/src/test/ui/mismatched_types/show_module.rs @@ -1,10 +1,10 @@ -pub mod blah{ - pub mod baz{ +pub mod blah { + pub mod baz { pub struct Foo; } } -pub mod meh{ +pub mod meh { pub struct Foo; } @@ -15,4 +15,4 @@ fn foo() -> Foo { //~^ ERROR mismatched types [E0308] } -fn main(){} +fn main() {} diff --git a/src/test/ui/mismatched_types/similar_paths.rs b/src/test/ui/mismatched_types/similar_paths.rs index 4d3a2a1fcc6..4b9157f39bf 100644 --- a/src/test/ui/mismatched_types/similar_paths.rs +++ b/src/test/ui/mismatched_types/similar_paths.rs @@ -1,11 +1,11 @@ -enum Option{ +enum Option { Some(T), None, } -pub fn foo() -> Option{ +pub fn foo() -> Option { Some(42_u8) //~^ ERROR mismatched types [E0308] } -fn main(){} +fn main() {} diff --git a/src/test/ui/mismatched_types/similar_paths.stderr b/src/test/ui/mismatched_types/similar_paths.stderr index 16f33e55fea..e65ae58d4ce 100644 --- a/src/test/ui/mismatched_types/similar_paths.stderr +++ b/src/test/ui/mismatched_types/similar_paths.stderr @@ -1,7 +1,7 @@ error[E0308]: mismatched types --> $DIR/similar_paths.rs:7:5 | -LL | pub fn foo() -> Option{ +LL | pub fn foo() -> Option { | ---------- expected `Option` because of return type LL | Some(42_u8) | ^^^^^^^^^^^ expected enum `Option`, found enum `std::option::Option` @@ -15,7 +15,7 @@ LL | pub enum Option { note: enum `Option` is defined in the current crate --> $DIR/similar_paths.rs:1:1 | -LL | enum Option{ +LL | enum Option { | ^^^^^^^^^^^^^^ error: aborting due to previous error -- cgit 1.4.1-3-g733a5 From 3d8b3e6ca179dc2ac79c038ad607b2321be70e8d Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 21 Sep 2022 10:24:16 -0500 Subject: Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py' --- src/test/ui/intrinsics/const-eval-select-backtrace-std.rs | 1 + src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr | 2 +- src/test/ui/intrinsics/const-eval-select-backtrace.rs | 1 + src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/test') diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs b/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs index 29aefe07162..1164a3a5b01 100644 --- a/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs +++ b/src/test/ui/intrinsics/const-eval-select-backtrace-std.rs @@ -1,6 +1,7 @@ // See issue #100696. // run-fail // check-run-results +// exec-env:RUST_BACKTRACE=0 fn main() { &""[1..]; } diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr b/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr index e53e6034620..463cd52c5aa 100644 --- a/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr +++ b/src/test/ui/intrinsics/const-eval-select-backtrace-std.run.stderr @@ -1,2 +1,2 @@ -thread 'main' panicked at 'byte index 1 is out of bounds of ``', $DIR/const-eval-select-backtrace-std.rs:5:6 +thread 'main' panicked at 'byte index 1 is out of bounds of ``', $DIR/const-eval-select-backtrace-std.rs:6:6 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace.rs b/src/test/ui/intrinsics/const-eval-select-backtrace.rs index 99f0725200c..ef1c7c4195b 100644 --- a/src/test/ui/intrinsics/const-eval-select-backtrace.rs +++ b/src/test/ui/intrinsics/const-eval-select-backtrace.rs @@ -2,6 +2,7 @@ // See issue #100696. // run-fail // check-run-results +// exec-env:RUST_BACKTRACE=0 #[track_caller] fn uhoh() { diff --git a/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr b/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr index 2fd730ac7a6..54e28db5e53 100644 --- a/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr +++ b/src/test/ui/intrinsics/const-eval-select-backtrace.run.stderr @@ -1,2 +1,2 @@ -thread 'main' panicked at 'Aaah!', $DIR/const-eval-select-backtrace.rs:16:9 +thread 'main' panicked at 'Aaah!', $DIR/const-eval-select-backtrace.rs:17:9 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace -- cgit 1.4.1-3-g733a5 From f528d49c23c8d1f50152cbbebe0f1920136fa956 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Wed, 21 Sep 2022 17:29:47 -0700 Subject: rustdoc: update test case for headers without max-width --- src/test/rustdoc-gui/notable-trait.goml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test') diff --git a/src/test/rustdoc-gui/notable-trait.goml b/src/test/rustdoc-gui/notable-trait.goml index 69088a0774f..7eb00d825a5 100644 --- a/src/test/rustdoc-gui/notable-trait.goml +++ b/src/test/rustdoc-gui/notable-trait.goml @@ -83,7 +83,7 @@ assert-position: ( ) // Checking on very small mobile. The `i` should be on its own line. -size: (410, 600) +size: (365, 600) compare-elements-position-false: ( "//*[@id='method.create_an_iterator_from_read']//a[text()='NotableStructWithLongName']", "//*[@id='method.create_an_iterator_from_read']//*[@class='notable-traits']", -- cgit 1.4.1-3-g733a5 From d0a07495be4906db5028a605f650aafeabee1879 Mon Sep 17 00:00:00 2001 From: Dan Johnson Date: Thu, 18 Aug 2022 16:27:16 -0700 Subject: Split out async_fn_in_trait into a separate feature PR #101224 added support for async fn in trait desuraging behind the return_position_impl_trait_in_trait feature. Split this out so that it's behind its own feature gate, since async fn in trait doesn't need to follow the same stabilization schedule. --- compiler/rustc_ast_lowering/src/lib.rs | 23 +++++++++--- compiler/rustc_feature/src/active.rs | 2 ++ compiler/rustc_span/src/symbol.rs | 1 + src/test/ui/async-await/async-trait-fn.stderr | 6 ++-- .../async-await/edition-deny-async-fns-2015.stderr | 2 +- .../async-await/feature-gate-async_fn_in_trait.rs | 25 +++++++++++++ .../feature-gate-async_fn_in_trait.stderr | 42 ++++++++++++++++++++++ src/test/ui/async-await/issues/issue-95307.stderr | 2 +- ...ure-gate-return_position_impl_trait_in_trait.rs | 13 +++++++ ...gate-return_position_impl_trait_in_trait.stderr | 22 ++++++++++-- src/test/ui/parser/fn-header-semantic-fail.stderr | 8 ++--- ...sue-70736-async-fn-no-body-def-collector.stderr | 4 +-- ...2021-incompatible-closure-captures-93117.stderr | 2 +- 13 files changed, 133 insertions(+), 19 deletions(-) create mode 100644 src/test/ui/async-await/feature-gate-async_fn_in_trait.rs create mode 100644 src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr (limited to 'src/test') diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index e9c05eb5f45..a11721ba021 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -332,6 +332,15 @@ impl FnDeclKind { _ => false, } } + + fn async_fn_allowed(&self, tcx: TyCtxt<'_>) -> bool { + match self { + FnDeclKind::Fn | FnDeclKind::Inherent => true, + FnDeclKind::Impl if tcx.features().async_fn_in_trait => true, + FnDeclKind::Trait if tcx.features().async_fn_in_trait => true, + _ => false, + } + } } #[derive(Copy, Clone)] @@ -1692,14 +1701,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { })); let output = if let Some((ret_id, span)) = make_ret_async { - if !kind.impl_trait_allowed(self.tcx) { + if !kind.async_fn_allowed(self.tcx) { match kind { FnDeclKind::Trait | FnDeclKind::Impl => { self.tcx .sess .create_feature_err( TraitFnAsync { fn_span, span }, - sym::return_position_impl_trait_in_trait, + sym::async_fn_in_trait, ) .emit(); } @@ -1917,9 +1926,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { let future_bound = this.lower_async_fn_output_type_to_future_bound( output, span, - ImplTraitContext::ReturnPositionOpaqueTy { - origin: hir::OpaqueTyOrigin::FnReturn(fn_def_id), - in_trait, + if in_trait && !this.tcx.features().return_position_impl_trait_in_trait { + ImplTraitContext::Disallowed(ImplTraitPosition::TraitReturn) + } else { + ImplTraitContext::ReturnPositionOpaqueTy { + origin: hir::OpaqueTyOrigin::FnReturn(fn_def_id), + in_trait, + } }, ); diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs index ad28595ca82..4c891fbf16e 100644 --- a/compiler/rustc_feature/src/active.rs +++ b/compiler/rustc_feature/src/active.rs @@ -312,6 +312,8 @@ declare_features! ( (active, associated_type_defaults, "1.2.0", Some(29661), None), /// Allows `async || body` closures. (active, async_closure, "1.37.0", Some(62290), None), + /// Alows async functions to be declared, implemented, and used in traits. + (incomplete, async_fn_in_trait, "CURRENT_RUSTC_VERSION", Some(91611), None), /// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries. (active, c_unwind, "1.52.0", Some(74990), None), /// Allows using C-variadics. diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 7785d29c15f..502ef67fc67 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -396,6 +396,7 @@ symbols! { assume_init, async_await, async_closure, + async_fn_in_trait, atomic, atomic_mod, atomics, diff --git a/src/test/ui/async-await/async-trait-fn.stderr b/src/test/ui/async-await/async-trait-fn.stderr index e5c584e31e8..4fa54c6e369 100644 --- a/src/test/ui/async-await/async-trait-fn.stderr +++ b/src/test/ui/async-await/async-trait-fn.stderr @@ -9,7 +9,7 @@ LL | async fn foo() {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/async-trait-fn.rs:5:5 @@ -22,7 +22,7 @@ LL | async fn bar(&self) {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/async-trait-fn.rs:7:5 @@ -35,7 +35,7 @@ LL | async fn baz() { = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0308]: mismatched types --> $DIR/async-trait-fn.rs:3:20 diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr b/src/test/ui/async-await/edition-deny-async-fns-2015.stderr index 8c2902d9b00..62a243e69e7 100644 --- a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr +++ b/src/test/ui/async-await/edition-deny-async-fns-2015.stderr @@ -90,7 +90,7 @@ LL | async fn foo() {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0308]: mismatched types --> $DIR/edition-deny-async-fns-2015.rs:18:20 diff --git a/src/test/ui/async-await/feature-gate-async_fn_in_trait.rs b/src/test/ui/async-await/feature-gate-async_fn_in_trait.rs new file mode 100644 index 00000000000..792f378cb57 --- /dev/null +++ b/src/test/ui/async-await/feature-gate-async_fn_in_trait.rs @@ -0,0 +1,25 @@ +// edition:2021 + +// RPITIT is not enough to allow use of async functions +#![allow(incomplete_features)] +#![feature(return_position_impl_trait_in_trait)] + +trait T { + async fn foo(); //~ ERROR functions in traits cannot be declared `async` +} + +// Both return_position_impl_trait_in_trait and async_fn_in_trait are required for this (see also +// feature-gate-return_position_impl_trait_in_trait.rs) +trait T2 { + async fn foo() -> impl Sized; //~ ERROR functions in traits cannot be declared `async` +} + +trait T3 { + fn foo() -> impl std::future::Future; +} + +impl T3 for () { + async fn foo() {} //~ ERROR functions in traits cannot be declared `async` +} + +fn main() {} diff --git a/src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr b/src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr new file mode 100644 index 00000000000..2a5fbd1ecd0 --- /dev/null +++ b/src/test/ui/async-await/feature-gate-async_fn_in_trait.stderr @@ -0,0 +1,42 @@ +error[E0706]: functions in traits cannot be declared `async` + --> $DIR/feature-gate-async_fn_in_trait.rs:8:5 + | +LL | async fn foo(); + | -----^^^^^^^^^^ + | | + | `async` because of this + | + = note: `async` trait functions are not currently supported + = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait + = note: see issue #91611 for more information + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable + +error[E0706]: functions in traits cannot be declared `async` + --> $DIR/feature-gate-async_fn_in_trait.rs:14:5 + | +LL | async fn foo() -> impl Sized; + | -----^^^^^^^^^^^^^^^^^^^^^^^^ + | | + | `async` because of this + | + = note: `async` trait functions are not currently supported + = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait + = note: see issue #91611 for more information + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable + +error[E0706]: functions in traits cannot be declared `async` + --> $DIR/feature-gate-async_fn_in_trait.rs:22:5 + | +LL | async fn foo() {} + | -----^^^^^^^^^ + | | + | `async` because of this + | + = note: `async` trait functions are not currently supported + = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait + = note: see issue #91611 for more information + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0706`. diff --git a/src/test/ui/async-await/issues/issue-95307.stderr b/src/test/ui/async-await/issues/issue-95307.stderr index 1c12f1e4862..a497cebe3c3 100644 --- a/src/test/ui/async-await/issues/issue-95307.stderr +++ b/src/test/ui/async-await/issues/issue-95307.stderr @@ -9,7 +9,7 @@ LL | async fn new() -> [u8; _]; = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error: in expressions, `_` can only be used on the left-hand side of an assignment --> $DIR/issue-95307.rs:7:28 diff --git a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs b/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs index de7966c66b0..637765fff11 100644 --- a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs +++ b/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.rs @@ -1,5 +1,18 @@ +// edition:2021 + +// async_fn_in_trait is not enough to allow use of RPITIT +#![allow(incomplete_features)] +#![feature(async_fn_in_trait)] + trait Foo { fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return + fn baz() -> Box; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return +} + +// Both return_position_impl_trait_in_trait and async_fn_in_trait are required for this (see also +// feature-gate-async_fn_in_trait.rs) +trait AsyncFoo { + async fn bar() -> impl Sized; //~ ERROR `impl Trait` only allowed in function and inherent method return types, not in trait method return } fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr b/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr index 36177bbe158..aeabed4a6ab 100644 --- a/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr +++ b/src/test/ui/feature-gates/feature-gate-return_position_impl_trait_in_trait.stderr @@ -1,5 +1,5 @@ error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return - --> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:2:17 + --> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:8:17 | LL | fn bar() -> impl Sized; | ^^^^^^^^^^ @@ -7,6 +7,24 @@ LL | fn bar() -> impl Sized; = note: see issue #91611 for more information = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable -error: aborting due to previous error +error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return + --> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:9:21 + | +LL | fn baz() -> Box; + | ^^^^^^^^^^^^^^^^^^^^^^ + | + = note: see issue #91611 for more information + = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + +error[E0562]: `impl Trait` only allowed in function and inherent method return types, not in trait method return + --> $DIR/feature-gate-return_position_impl_trait_in_trait.rs:15:23 + | +LL | async fn bar() -> impl Sized; + | ^^^^^^^^^^ + | + = note: see issue #91611 for more information + = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + +error: aborting due to 3 previous errors For more information about this error, try `rustc --explain E0562`. diff --git a/src/test/ui/parser/fn-header-semantic-fail.stderr b/src/test/ui/parser/fn-header-semantic-fail.stderr index 36304779df3..800b5a43a00 100644 --- a/src/test/ui/parser/fn-header-semantic-fail.stderr +++ b/src/test/ui/parser/fn-header-semantic-fail.stderr @@ -147,7 +147,7 @@ LL | async fn ft1(); = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/fn-header-semantic-fail.rs:21:9 @@ -160,7 +160,7 @@ LL | const async unsafe extern "C" fn ft5(); = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/fn-header-semantic-fail.rs:29:9 @@ -173,7 +173,7 @@ LL | async fn ft1() {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/fn-header-semantic-fail.rs:33:9 @@ -186,7 +186,7 @@ LL | const async unsafe extern "C" fn ft5() {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0391]: cycle detected when computing type of `main::ff5::{opaque#0}` --> $DIR/fn-header-semantic-fail.rs:12:44 diff --git a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr b/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr index 55c3b66f136..1354abb4f14 100644 --- a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr +++ b/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr @@ -33,7 +33,7 @@ LL | async fn associated(); = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error[E0706]: functions in traits cannot be declared `async` --> $DIR/issue-70736-async-fn-no-body-def-collector.rs:15:5 @@ -46,7 +46,7 @@ LL | async fn associated(); = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable error: aborting due to 5 previous errors diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr b/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr index 3814c568e72..2c1fa7b36b6 100644 --- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr +++ b/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr @@ -51,7 +51,7 @@ LL | trait C{async fn new(val: T) {} = note: `async` trait functions are not currently supported = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait = note: see issue #91611 for more information - = help: add `#![feature(return_position_impl_trait_in_trait)]` to the crate attributes to enable + = help: add `#![feature(async_fn_in_trait)]` to the crate attributes to enable warning: changes to closure capture in Rust 2021 will affect drop order --> $DIR/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs:6:57 -- cgit 1.4.1-3-g733a5