use ? to simplify TransitiveRelation.maybe_map
#53271
Merged
Conversation
This file contains hidden or 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
llogiq
commented
Aug 11, 2018
| @@ -59,6 +59,7 @@ impl<T: Clone + Debug + Eq + Hash> TransitiveRelation<T> { | |||
| edges: vec![], | |||
| closure: Lock::new(None), | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Oops, I added this by mistake.
a09846d to
2fac7df
Compare
|
@llogiq Please don't backmerge master into your feature branch. If you need to update your feature branch, please rebase it instead. |
|
For some reason, when I try to review lines of your commit, I get this:
In any case: please drop the change to Apart from that, this looks great. |
a496942 to
05ddad3
Compare
|
This is what happens when one uses the UI (I was on mobile earlier). The history should now be fixed. |
|
@bors r+ |
|
📌 Commit 05ddad3 has been approved by |
|
@bors rollup |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 15, 2018
…iplett use ? to simplify `TransitiveRelation.maybe_map` I think this looks much clearer than the original.
bors
added a commit
that referenced
this pull request
Aug 15, 2018
Rollup of 8 pull requests Successful merges: - #52453 (improve diagnostics for tests with custom return values) - #53271 (use ? to simplify `TransitiveRelation.maybe_map`) - #53279 (Extend documentation of `rustc_on_unimplemented`) - #53342 (fix error for unsized packed struct field) - #53344 (Add doc examples for std::alloc::{alloc,alloc_zeroed}.) - #53368 (Ignore test that fails on stage1) - #53388 (Fix links' color) - #53396 (Fix since of Iterator::flatten to be a proper semver) Failed merges: r? @ghost
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.
I think this looks much clearer than the original.