Note if mismatched types have a similar name #101664

mejrs · 2022-09-10T22:32:24Z

If users get a type error between similarly named types, it will point out that these are actually different types, and where they were defined.

rust-highfive · 2022-09-10T22:32:27Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @fee1-dead (or someone else) soon.

Please see the contribution instructions for more information.

compiler/rustc_infer/src/infer/error_reporting/mod.rs

jyn514 · 2022-09-10T23:28:46Z

compiler/rustc_infer/src/infer/error_reporting/mod.rs

+                    let found_name = values.found.sort_string(self.tcx);
+                    let expected_name = values.expected.sort_string(self.tcx);
+
+                    diag.note(format!("{found_name} and {expected_name} have similar names, but are actually distinct types"));


how does this interact with the existing "help: maybe two different crates are being used?" message? IMO we should probably only show one or the other; it would be nice to add a test case.

It shows both; see src/test/ui/type/type-mismatch-same-crate-name. Its output got updated with this PR.

compiler/rustc_infer/src/infer/error_reporting/mod.rs

fee1-dead · 2022-09-11T04:38:17Z

@rustbot author

rustbot · 2022-09-11T04:38:18Z

Error: The "Author" shortcut only works on pull requests.

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

mejrs · 2022-09-12T19:29:03Z

@rustbot ready

src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr

bors · 2022-09-17T14:17:12Z

☔ The latest upstream changes (presumably #101938) made this pull request unmergeable. Please resolve the merge conflicts.

mejrs · 2022-09-18T02:05:28Z

@rustbot ready

fee1-dead

Left a few nits. Should be good to go after reviews are addressed. Sorry for the late review!

fee1-dead · 2022-09-18T08:38:39Z

compiler/rustc_infer/src/infer/error_reporting/mod.rs

+            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,
+            };


This should be an associated function for TyKind.

I don't think it can be an associated function on TyKind (or Symbol for that matter) because that leads to cyclic dependencies. But I'm happy to make it a free function/trait somewhere, or an associated function on rustc_middle::ty::Ty

fee1-dead · 2022-09-18T08:45:59Z

compiler/rustc_infer/src/infer/error_reporting/mod.rs

+                match (fk, ek) {
+                    (
+                        ty::Adt(adt, _),
+                        ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_),


This could use is_primitive instead.

fee1-dead · 2022-09-18T08:46:47Z

compiler/rustc_infer/src/infer/error_reporting/mod.rs

+                        None
+                    }
+                    (
+                        ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_),


same above. I think you can also use an if-let guard to extract the primitive sym in this match statement directly.

fee1-dead · 2022-09-18T08:51:31Z

src/test/ui/mismatched_types/similar_paths.rs

+enum Option<T>{
+    Some(T),
+    None,
+}
+
+pub fn foo() -> Option<u8>{


Suggested change

enum Option<T>{

Some(T),

None,

}

pub fn foo() -> Option<u8>{

enum Option<T> {

Some(T),

None,

}

pub fn foo() -> Option<u8> {

fee1-dead · 2022-09-18T08:51:58Z

src/test/ui/mismatched_types/show_module.rs

+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(){}


Suggested change

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(){}

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() {}

mejrs · 2022-09-19T15:20:30Z

Thank you for the review. I have:

formatted the tests
moved primitive_sym to a method on rustc_middle::ty::Ty
(not your feedback but) changed the Similar enum to use named fields rather than tuple fields
changed the rest of the code to work using the above.

fee1-dead

LGTM! Thanks

fee1-dead · 2022-09-22T11:59:17Z

@bors r+

bors · 2022-09-22T11:59:18Z

📌 Commit c658660 has been approved by fee1-dead

It is now in the queue for this repository.

Note if mismatched types have a similar name If users get a type error between similarly named types, it will point out that these are actually different types, and where they were defined.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#100734 (Split out async_fn_in_trait into a separate feature) - rust-lang#101664 (Note if mismatched types have a similar name) - rust-lang#101815 (Migrated the rustc_passes annotation without effect diagnostic infrastructure) - rust-lang#102042 (Distribute rust-docs-json via rustup.) - rust-lang#102066 (rustdoc: remove unnecessary `max-width` on headers) - rust-lang#102095 (Deduplicate two functions that would soon have been three) - rust-lang#102104 (Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests) - rust-lang#102112 (Allow full relro on powerpc64-unknown-linux-gnu) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned fee1-dead Sep 10, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 10, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 10, 2022

jyn514 suggested changes Sep 10, 2022

View reviewed changes

fee1-dead added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 11, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 12, 2022

jyn514 reviewed Sep 12, 2022

View reviewed changes

src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr Outdated Show resolved Hide resolved

mejrs added 2 commits September 18, 2022 02:43

Note if mismatched types have a similar name

8477b9b

Address feedback

3699c24

This comment has been minimized.

Sign in to view

Print out the proper crate path

14e9893

fee1-dead reviewed Sep 18, 2022

View reviewed changes

Incorporate feedback

c658660

fee1-dead approved these changes Sep 22, 2022

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 22, 2022

matthiaskrgr mentioned this pull request Sep 22, 2022

Rollup of 9 pull requests #102153

Closed

matthiaskrgr mentioned this pull request Sep 23, 2022

Rollup of 8 pull requests #102165

Merged

bors merged commit c2d2535 into rust-lang:master Sep 23, 2022

rustbot added this to the 1.66.0 milestone Sep 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Note if mismatched types have a similar name #101664

Note if mismatched types have a similar name #101664

mejrs commented Sep 10, 2022

rust-highfive commented Sep 10, 2022

jyn514 Sep 10, 2022

mejrs Sep 10, 2022

fee1-dead commented Sep 11, 2022

rustbot commented Sep 11, 2022

mejrs commented Sep 12, 2022

bors commented Sep 17, 2022

This comment has been minimized.

mejrs commented Sep 18, 2022

fee1-dead left a comment

fee1-dead Sep 18, 2022 •

edited

Loading

mejrs Sep 18, 2022

fee1-dead Sep 18, 2022

fee1-dead Sep 18, 2022

fee1-dead Sep 18, 2022

fee1-dead Sep 18, 2022

mejrs commented Sep 19, 2022

fee1-dead left a comment

fee1-dead commented Sep 22, 2022

bors commented Sep 22, 2022

Note if mismatched types have a similar name #101664

Note if mismatched types have a similar name #101664

Conversation

mejrs commented Sep 10, 2022

rust-highfive commented Sep 10, 2022

jyn514 Sep 10, 2022

Choose a reason for hiding this comment

mejrs Sep 10, 2022

Choose a reason for hiding this comment

fee1-dead commented Sep 11, 2022

rustbot commented Sep 11, 2022

mejrs commented Sep 12, 2022

bors commented Sep 17, 2022

This comment has been minimized.

mejrs commented Sep 18, 2022

fee1-dead left a comment

Choose a reason for hiding this comment

fee1-dead Sep 18, 2022 • edited Loading

Choose a reason for hiding this comment

mejrs Sep 18, 2022

Choose a reason for hiding this comment

fee1-dead Sep 18, 2022

Choose a reason for hiding this comment

fee1-dead Sep 18, 2022

Choose a reason for hiding this comment

fee1-dead Sep 18, 2022

Choose a reason for hiding this comment

fee1-dead Sep 18, 2022

Choose a reason for hiding this comment

mejrs commented Sep 19, 2022

fee1-dead left a comment

Choose a reason for hiding this comment

fee1-dead commented Sep 22, 2022

bors commented Sep 22, 2022

fee1-dead Sep 18, 2022 •

edited

Loading