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.

Sign up for GitHub

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

Jump to bottom

Resolve E0584 conflict #73122

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Resolve E0584 conflict #73122

merged 2 commits into from
Jun 10, 2020

Conversation

doctorn
Copy link
Contributor

@doctorn doctorn commented Jun 8, 2020

Adds a new error code (E0761) to indicate ambiguity in module file names and an accompanying expanded description to resolve a conflict over E0584.

Resolves #73116

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 8, 2020
varkor
varkor approved these changes Jun 9, 2020
View reviewed changes
Copy link
Member

@varkor varkor left a comment

Choose a reason for hiding this comment

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

r=me after resolving the comment.

src/librustc_error_codes/error_codes/E0761.md Outdated Show resolved Hide resolved
@doctorn doctorn mentioned this pull request Jun 9, 2020
Merged
@varkor
Copy link
Member

varkor commented Jun 9, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 9, 2020

📌 Commit 039da0b has been approved by varkor

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 9, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 9, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 10, 2020
@bors
Auto merge of rust-lang#73190 - Dylan-DPC:rollup-9wbyh4y, r=Dylan-DPC
bb86748 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#72417 (Remove `RawVec::reserve_in_place`.)
 - rust-lang#73098 (Add Item::is_fake for rustdoc)
 - rust-lang#73122 (Resolve E0584 conflict)
 - rust-lang#73123 (Clean up E0647 explanation)
 - rust-lang#73133 (Enforce unwind invariants)
 - rust-lang#73148 (Fix a typo (size of the size))
 - rust-lang#73149 (typo: awailable -> available)
 - rust-lang#73161 (Add mailmap entry)

Failed merges:

r? @ghost
@bors bors merged commit 95479d4 into rust-lang:master Jun 10, 2020
@doctorn doctorn deleted the issue-73116 branch June 10, 2020 07:33
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@varkor varkor varkor approved these changes

Assignees

@varkor varkor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.

Duplicate error E0584 in codebase
5 participants
@doctorn @rust-highfive @varkor @bors @cuviper