Skip to content

Conversation

llogiq
Copy link
Contributor

@llogiq llogiq commented Aug 11, 2018

I think this looks much clearer than the original.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(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 Aug 11, 2018
@@ -59,6 +59,7 @@ impl<T: Clone + Debug + Eq + Hash> TransitiveRelation<T> {
edges: vec![],
closure: Lock::new(None),
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, I added this by mistake.

@llogiq llogiq force-pushed the simplify-maybe-map branch from a09846d to 2fac7df Compare August 11, 2018 16:09
@llogiq
Copy link
Contributor Author

llogiq commented Aug 13, 2018

r? @joshtriplett

@joshtriplett
Copy link
Member

@llogiq Please don't backmerge master into your feature branch. If you need to update your feature branch, please rebase it instead.

@joshtriplett
Copy link
Member

For some reason, when I try to review lines of your commit, I get this:

Start commit oid is not part of the pull request

In any case: please drop the change to add_index, which seems unrelated to the change described in the commit message.

Apart from that, this looks great.

@llogiq llogiq force-pushed the simplify-maybe-map branch from a496942 to 05ddad3 Compare August 13, 2018 21:12
@llogiq
Copy link
Contributor Author

llogiq commented Aug 13, 2018

This is what happens when one uses the UI (I was on mobile earlier). The history should now be fixed.

@llogiq
Copy link
Contributor Author

llogiq commented Aug 14, 2018

@joshtriplett r?

@joshtriplett
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 14, 2018

📌 Commit 05ddad3 has been approved by joshtriplett

@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 Aug 14, 2018
@dtolnay
Copy link
Member

dtolnay commented Aug 15, 2018

@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
@bors bors merged commit 05ddad3 into rust-lang:master Aug 15, 2018
@llogiq llogiq deleted the simplify-maybe-map branch August 15, 2018 23:00
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants