Skip to content

Revert #49767 #50837

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 18, 2018
Merged

Revert #49767 #50837

merged 1 commit into from
May 18, 2018

Conversation

steveklabnik
Copy link
Member

There was some confusion and I accidentally merged a PR that wasn't ready.

@rust-highfive
Copy link
Contributor

r? @joshtriplett

(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 May 17, 2018
@steveklabnik
Copy link
Member Author

Dont merge this yet, please.

There was [some confusion](rust-lang#49767 (comment)) and I accidentally merged a PR that wasn't ready.
@steveklabnik
Copy link
Member Author

This is now ready to go

@QuietMisdreavus
Copy link
Member

r=me pending travis

@Mark-Simulacrum
Copy link
Member

@bors r=QuietMisdreavus

@bors
Copy link
Collaborator

bors commented May 17, 2018

📌 Commit eac94d1 has been approved by QuietMisdreavus

@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 May 17, 2018
@Mark-Simulacrum
Copy link
Member

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 17, 2018
…isdreavus

Revert rust-lang#49767

There was [some confusion](rust-lang#49767 (comment)) and I accidentally merged a PR that wasn't ready.
bors added a commit that referenced this pull request May 18, 2018
Rollup of 10 pull requests

Successful merges:

 - #50387 (Remove leftover tab in libtest outputs)
 - #50553 (Add Option::xor method)
 - #50610 (Improve format string errors)
 - #50649 (Tweak `nearest_common_ancestor()`.)
 - #50790 (Fix grammar documentation wrt Unicode identifiers)
 - #50791 (Fix null exclusions in grammar docs)
 - #50806 (Add `bless` x.py subcommand for easy ui test replacement)
 - #50818 (Speed up `opt_normalize_projection_type`)
 - #50837 (Revert #49767)
 - #50839 (Make sure people know the book is free oline)

Failed merges:
@bors bors merged commit eac94d1 into rust-lang:master May 18, 2018
# for free to join this conversation on GitHub. Already have an account? # 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