Merge E0412 into E0425 #148678

xonx4l · 2025-11-07T23:57:55Z

This PR merge E0412 into E0425 as both mean the same thing to users.

This fixes #148558.

rustbot · 2025-11-07T23:57:58Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

This PR modifies tests/ui/issues/. If this PR is adding new tests to tests/ui/issues/,
please refrain from doing so, and instead add it to more descriptive subdirectories.

rustbot · 2025-11-07T23:58:01Z

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

mu001999 · 2025-11-08T03:20:30Z

compiler/rustc_resolve/src/late.rs

                // Thus (since we're in expression-position at this point), not to
                // confuse the user, we want to keep the *message* from E0433 (so
-                // `parent_err`), but we want *hints* from E0412 (so `err`).
+                // `parent_err`), but we want *hints* from the unified E0425 (so `err`).


Why not just E0425 here

You're right, that was an inconsistency on my part. I'll change it to just E0425 to match the rest of the PR.

mu001999 · 2025-11-08T03:27:42Z

compiler/rustc_error_codes/src/error_codes/E0412.md

@@ -1,64 +1,6 @@
-A used type name is not in scope.
+This error code is no longer emitted by the compiler.


Add note on the top is good enough, see E0001.md for an example.

Ok,Thanks .

jieyouxu · 2025-11-08T07:27:11Z

@rustbot reroll

bors · 2025-11-09T03:17:55Z

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

rustbot · 2025-11-09T19:39:39Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Kivooeo

Thanks, some questions

View changes since this review

compiler/rustc_error_codes/src/error_codes/E0412.md

Kivooeo · 2025-11-09T19:31:15Z

compiler/rustc_resolve/src/late.rs


                // There are two different error messages user might receive at
                // this point:
-                // - E0412 cannot find type `{}` in this scope


Not sure why "type" was removed here?

It's a mistake will fix this.

Kivooeo · 2025-11-09T19:44:54Z

compiler/rustc_resolve/src/late/diagnostics.rs


                self.suggest_ident_hidden_by_hygiene(err, path, span);
-            } else if err_code == E0412 {
+            } else if err_code == E0425 {


if err_code == E0425 { ... } else if err_code == E0425 { ... }

How is this supposed to work?

This is a mistake that I did in hurry due to resolve conflict but previously I proposed this

} else if err_code == E0412 { -> ELIMINATE // cannot find type in this scope -> PROPOSED

if we can backtrack to changes idk how you will see in that commit I made the proposed change . I did this but in hurry thinking of a simple E0412 replacement issue I just changed it to resolve conflict .

Can we delete this branch entirely?

branch?? then all changes will be removed .

Before this, we had two branches, for 0412 and 0425

So after this change, we want to remove 0412 and keep only 0425 by replacing 0412 with 0425, so now, logically it should have only one if err_code == E0425 and else if that was originally for 0412 removed? Because we now don't have 0412 and this branch will be never reached

If you see this different I'd love to hear your opinion

Yes I see the difference and Yes we can delete this branch but we have to first move the logic we want to keep from E0412 into E0425 branch. Because we are not completely getting rid of E0412 but the goal is to merge E0412 into E0425.

but we have to first move the logic we want to keep from E0412 into E0425 branch

Can you explain more about this logic that you want to keep and move into E0425, because neither original issue or description of this pull request explaining this, so it's not obvious what exactly are we trying to do

The logic that I want to keep is this line: if let Some(correct) = Self::likely_rust_type(path) as I think it gives suggestions for misspelled types.

Like did you mean String? when one types string.

Kivooeo · 2025-11-09T19:47:17Z

tests/ui/lint/use_suggestion_json.stderr

I'm not sure why you changed this file so much? I think that previous examples and explanations was fine

Kivooeo · 2025-11-09T19:53:04Z

tests/ui/parallel-rustc/ty-variance-issue-124423.stderr

Can you add new line to end of this file, not sure why is this missed

rustbot · 2025-11-09T21:12:49Z

Some changes occurred in src/tools/cargo

cc @ehuss

rustbot · 2025-11-09T21:12:51Z

⚠️ Warning ⚠️

Some commits in this PR modify submodules.

If this was not intentional, see I changed a submodule on accident in the rustc dev guide.

mu001999 · 2025-11-10T00:54:51Z

compiler/rustc_error_codes/src/error_codes/E0412.md

@@ -1,64 +1,6 @@
-A used type name is not in scope.


Retain all original content, no need to edit it.

Kivooeo · 2025-11-10T14:32:03Z

src/tools/cargo

For some reasons this get into commit, so you need to manage to remove it somehow

Kivooeo · 2025-11-10T14:34:19Z

compiler/rustc_resolve/src/late/diagnostics.rs

                if let Some(correct) = Self::likely_rust_type(path) {
                    err.span_suggestion(
                        span,
                        "perhaps you intended to use this type",
                        correct,
                        Applicability::MaybeIncorrect,
                    );
                }


I just very curious, can you please try to remove it, and see if there will be any changes in test outputs? I really wonder if this do anything or not, just for science

Ok will share the output .

So I did and it went something like this -:
I removed this if let Some(correct) = Self::likely_rust_type(path) -> this caused the "dead code" error for likely_rust_type -> I then removed the likely_rust_type function itself to fix the error -> After all that I ran the tests and everything passed successfully.

Yeah, since there is no actual changes in the output after removing this part this would be reasonable to remove this dead code since it's never emitted,

That's interesting that this is the only place where likely_rust_type is used, so feel free to remove it

bors · 2025-11-11T13:33:39Z

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

rustbot assigned jieyouxu Nov 7, 2025

mu001999 reviewed Nov 8, 2025

View reviewed changes

rustbot assigned madsmtm and unassigned jieyouxu Nov 8, 2025

This was referenced Nov 9, 2025

E0412 and E0425 are redundant #148558

Open

Merge redundant error codes E0412 and E0425 #148758

Closed

Kivooeo assigned Kivooeo and unassigned madsmtm Nov 9, 2025

This comment has been minimized.

Sign in to view

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 9, 2025

Kivooeo reviewed Nov 9, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

xonx4l and others added 4 commits November 9, 2025 21:09

EO412_replacement_with_EO425

15ddd4c

fix typo

d7f61e3

fixing errors

ebe1b47

cleanup

eee16cc

xonx4l force-pushed the EO412_replacement_with_EO425 branch from 28386ac to eee16cc Compare November 9, 2025 21:12

rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 9, 2025

mu001999 reviewed Nov 10, 2025

View reviewed changes

Kivooeo reviewed Nov 10, 2025

View reviewed changes

		@@ -1,64 +1,6 @@
		A used type name is not in scope.
		This error code is no longer emitted by the compiler.

Merge E0412 into E0425 #148678

Are you sure you want to change the base?

Merge E0412 into E0425 #148678

Uh oh!

Conversation

xonx4l commented Nov 7, 2025 • edited by madsmtm Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 7, 2025

Uh oh!

rustbot commented Nov 7, 2025

Uh oh!

mu001999 Nov 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Nov 8, 2025

Uh oh!

bors commented Nov 9, 2025

Uh oh!

rustbot commented Nov 9, 2025

Uh oh!

This comment has been minimized.

Kivooeo left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xonx4l Nov 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kivooeo Nov 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

rustbot commented Nov 9, 2025

Uh oh!

rustbot commented Nov 9, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

xonx4l commented Nov 7, 2025 •

edited by madsmtm

Loading

mu001999 Nov 8, 2025 •

edited

Loading

Kivooeo left a comment •

edited by rustbot

Loading

xonx4l Nov 9, 2025 •

edited

Loading

Kivooeo Nov 9, 2025 •

edited

Loading