Skip to content
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.

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

Cleanup #24958 #52480

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Cleanup #24958 #52480

merged 1 commit into from
Jul 19, 2018

Conversation

ljedrz
Copy link
Contributor

@ljedrz ljedrz commented Jul 18, 2018

Since #24958 was closed we might want to remove the workarounds it introduced for android, arm and aarch64.

@rust-highfive
Copy link
Collaborator

r? @aturon

(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 Jul 18, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Jul 18, 2018

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 18, 2018

📌 Commit ef2bac4 has been approved by oli-obk

@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 Jul 18, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jul 18, 2018
Cleanup rust-lang#24958

Since rust-lang#24958 was closed we might want to remove the workarounds it introduced for android, arm and aarch64.
bors added a commit that referenced this pull request Jul 19, 2018
Rollup of 13 pull requests

Successful merges:

 - #51628 (use checked write in `LineWriter` example)
 - #52116 (Handle array manually in str case conversion methods)
 - #52218 (Amend option.take examples)
 - #52418 (Do not use desugared ident when suggesting adding a type)
 - #52439 (Revert some changes from #51917 to fix custom libdir)
 - #52455 (Fix doc comment: use `?` instead of `.unwrap()`)
 - #52458 (rustc: Fix a suggestion for the `proc_macro` feature)
 - #52464 (Allow clippy to be installed with make install)
 - #52472 (rustc: Enable `use_extern_macros` in 2018 edition)
 - #52477 (Clarify short-circuiting behvaior of Iterator::zip.)
 - #52480 (Cleanup #24958)
 - #52487 (Don't build twice the sanitizers on Linux)
 - #52510 (rustdoc: remove FIXME about macro redirects)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 19, 2018

☔ The latest upstream changes (presumably #52486) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 19, 2018
@bors bors merged commit ef2bac4 into rust-lang:master Jul 19, 2018
@ljedrz ljedrz deleted the cleanup_24958 branch July 19, 2018 05:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants