Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add function to tell the identical errors for ambiguity_errors #105769

Merged
merged 2 commits into from
Dec 22, 2022

Conversation

lyming2007
Copy link

if 2 errors of the kind and ident and span of the ident, b1, b2 and misc1 misc2 are the same we call these 2 ambiguity errors identical
prevent identical ambiguity error from pushing into vector of ambiguity_errors this will fix #105177

@rustbot
Copy link
Collaborator

rustbot commented Dec 16, 2022

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

Please see the contribution instructions for more information.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 16, 2022
Copy link
Contributor

@eholk eholk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! If #[derive(Eq)] works, I think that'd be cleaner, but I'll leave that up to you. Let me know what you want to do and when you're ready and I'll sign off.

@rustbot author

compiler/rustc_resolve/src/lib.rs Show resolved Hide resolved
@rustbot rustbot 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 Dec 16, 2022
…s one in ambiguity_errors

if 2 errors of the kind and ident and span of the ident, b1, b2 and misc1 misc2 are the same
then these 2 ambiguity errors matched
prevent identical ambiguity error from pushing into vector of ambiguity_errors
this will fix rust-lang#105177
compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved
@eholk
Copy link
Contributor

eholk commented Dec 22, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 22, 2022

📌 Commit f20f86e has been approved by eholk

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 22, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 22, 2022
add function to tell the identical errors for ambiguity_errors

if 2 errors of the kind and ident and span of the ident, b1, b2 and misc1 misc2 are the same we call these 2 ambiguity errors identical
prevent identical ambiguity error from pushing into vector of ambiguity_errors this will fix rust-lang#105177
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 22, 2022
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#104741 (Switch `#[track_caller]` back to a no-op unless feature gate is enabled)
 - rust-lang#105769 (add function to tell the identical errors for ambiguity_errors)
 - rust-lang#105843 (Suggest associated const on possible capitalization mistake)
 - rust-lang#105966 (Re-enable `Fn` trait call notation error for non-tuple argument)
 - rust-lang#106002 (codegen tests: adapt patterns to also work with v0 symbol mangling)
 - rust-lang#106010 (Give opaque types a better coherence error)
 - rust-lang#106016 (rustdoc: simplify link anchor to section expand JS)
 - rust-lang#106024 (Fix ICE due to `todo!()` in `rustdoc` for `Term`s)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2cace6a into rust-lang:master Dec 22, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicated diagnostics when import is ambiguous
5 participants