Skip to content

Change inherent overlap error to a warning for now, to ease the breakage #32309

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
Merged
merged 1 commit into from
Mar 18, 2016
Merged

Change inherent overlap error to a warning for now, to ease the breakage #32309

merged 1 commit into from
Mar 18, 2016

Conversation

aturon
Copy link
Member

@aturon aturon commented Mar 17, 2016

Closes #32247

r? @nikomatsakis

@nikomatsakis
Copy link
Contributor

So we usually use "forward compat" lints for these warnings now. It should be easy to modify, just grep around for MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT and follow its lead. There are a few things you have to do:

// define the lint and register it:
librustc/lint/builtin.rs:140:9:    pub MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT,
librustc/lint/builtin.rs:184:13:            MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT,

// define the forward compat details
librustc_lint/lib.rs:170:28:            id: LintId::of(MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT),

// issue the lint
librustc_typeck/check/_match.rs:605:38:        sess.add_lint(lint::builtin::MATCH_OF_UNIT_VARIANT_VIA_PAREN_DOTDOT,

@aturon
Copy link
Member Author

aturon commented Mar 17, 2016

Done; re-r?

nikomatsakis
nikomatsakis reviewed Mar 17, 2016
View reviewed changes
src/librustc_typeck/coherence/overlap.rs
msg);
// span_note!(&mut warn, self.span_of_def_id(item2.def_id()),
// "conflicting definition is here:");
// warn.emit();
Copy link
Contributor

Choose a reason for hiding this comment

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

ah well, probably obvious most of the time?

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 17, 2016

📌 Commit 0f2bcb6 has been approved by nikomatsakis

@aturon
Copy link
Member Author

aturon commented Mar 17, 2016

Oops, errant commented-out code included.

High priority due to wanting to hit nightly ASAP.

@bors: r=nikomatsakis p=1

@bors
Copy link
Collaborator

bors commented Mar 17, 2016

📌 Commit b8cedfc has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 17, 2016

⌛ Testing commit b8cedfc with merge 5cfc2d8...

@bors
Copy link
Collaborator

bors commented Mar 17, 2016

💔 Test failed - auto-win-msvc-32-opt

@aturon
Copy link
Member Author

aturon commented Mar 17, 2016

@bors: r=nikomatsakis p=1

@bors
Copy link
Collaborator

bors commented Mar 17, 2016

📌 Commit 4d05800 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⌛ Testing commit 4d05800 with merge 3f2813a...

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⌛ Testing commit 4d05800 with merge bf77000...

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⌛ Testing commit 4d05800 with merge 17fd16c...

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⌛ Testing commit 4d05800 with merge 029acf6...

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

💔 Test failed - auto-win-msvc-32-opt

@aturon
Copy link
Member Author

aturon commented Mar 18, 2016

@bors: r=nikomatsakis p=1

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

📌 Commit e477703 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 18, 2016

⌛ Testing commit e477703 with merge fc9e1d0...

bors added a commit that referenced this pull request Mar 18, 2016
@bors
Auto merge of #32309 - aturon:overlap-warning, r=nikomatsakis
fc9e1d0 
Change inherent overlap error to a warning for now, to ease the breakage

Closes #32247

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Mar 18, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit e477703 into rust-lang:master Mar 18, 2016
@bors bors mentioned this pull request Mar 18, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aturon @nikomatsakis @bors