Rollup of 5 pull requests #27082
Merged
Rollup of 5 pull requests #27082
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Manishearth
commented
Jul 17, 2015
Manishearth
commented
- Successful merges: Detect duplicate implementations of assoc. types and constants. #25993, Fix documentation IP ranges: e.g., 192.0.2.* instead of 192.*.2.*. #27038, Fix stability attribute typo. #27069, debuginfo: Fix type description generic enum discriminants. #27070, Fixed typo #27080
- Failed merges: TRPL: minimize diff between examples in "Error Handling" #27034, std: Add IntoRaw{Fd,Handle,Socket} traits #27064
Expands E0201 to be used for any duplicate associated items, not just duplicate methods/functions. It also correctly detects when two different kinds of items (like a constant and a method) have the same name. Fixes rust-lang#23969.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=100 force |
|
📌 Commit e6b9380 has been approved by |
|
⌛ Testing commit e6b9380 with merge ac44f72... |
|
💔 Test failed - auto-mac-64-opt |
|
@bors r+ p=100 force |
|
📌 Commit cf91389 has been approved by |
|
⌛ Testing commit cf91389 with merge 2b7ea4c... |
|
💔 Test failed - auto-mac-64-opt |
I fixed a single character typo. r? @steveklabnik
|
@bors r+ force |
|
📌 Commit ed8b7ea has been approved by |
bors
added a commit
that referenced
this pull request
Jul 17, 2015
Adds two error codes, one for duplicate associated constants and one for types. I'm not certain these should each have their own code, but E0201 is already solely for duplicate associated functions so at least it kinda matches. This will lead to somewhat redundant error explanations, but that's nothing new! Fixes rust-lang#23969.
…hton Pretty sure this should apply to the module. r? @alexcrichton
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.