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

Rollup of 5 pull requests #71579

Merged
merged 14 commits into from
Apr 26, 2020
Merged

Rollup of 5 pull requests #71579

merged 14 commits into from
Apr 26, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

matthiaskrgr and others added 14 commits April 26, 2020 02:24
clippy::{redundant_pattern_matching, clone_on_copy, iter_cloned_collect, option_as_ref_deref, match_ref_pats}
The referenced `sanitizer-address/Makefile` no longer exists, so perhaps these options are no longer necessary as well.
Even if they are still necessary, they should use `-C relocation-model=static` instead.
Cleanup and document `-C relocation-model`

As the title says, this is mostly a refactoring and documentation.

One potentially observable change here is that `-C relocation-model=default` now takes the default from the Rust target, rather than from the underlying LLVM target. In other words, `-C relocation-model=default` is now equivalent to not specifying the relocation model on command line at all.
Apparently no one used that option because it has other bugs as well, e.g. PIC `default` wasn't treated as PIC in some places.
fix more clippy warnings

clippy::{redundant_pattern_matching, clone_on_copy, iter_cloned_collect, option_as_ref_deref, match_ref_pats}

r? @Dylan-DPC
Fix since attribute for nonzero_bitor impl's

Added in rust-lang#69813, took a while to merge so the since attributes went out of date.
proc_macro: Fix since attributes for new Span methods

Added in rust-lang#69041, took a while to merge so the since attributes went out of date.
Fix stable(since) attribute for BTreeMap::remove_entry

Stabilized in rust-lang#70712.

Maybe checking that the since attributes are added correctly should be automated through tidy? This is the third PR I'm opening that fixes a stable(since) attribute for something meant to be stabilized in 1.43 / 1.44 initially but then only stabilized in 1.45. (the other two are rust-lang#71571, rust-lang#71574)
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 26, 2020

📌 Commit aa9dc69 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 26, 2020
@bors
Copy link
Contributor

bors commented Apr 26, 2020

⌛ Testing commit aa9dc69 with merge 3dd1ca6092ebbee163fb481554e2deec01877101...

@bors
Copy link
Contributor

bors commented Apr 26, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 26, 2020
@Dylan-DPC-zz
Copy link
Author

@bors retry

@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 Apr 26, 2020
@bors
Copy link
Contributor

bors commented Apr 26, 2020

⌛ Testing commit aa9dc69 with merge 7f3b3df...

@bors
Copy link
Contributor

bors commented Apr 26, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 7f3b3df to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 26, 2020
@bors bors merged commit 7f3b3df into rust-lang:master Apr 26, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #71579!

Tested on commit 7f3b3df.
Direct link to PR: #71579

🎉 rustc-dev-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 26, 2020
Tested on commit rust-lang/rust@7f3b3df.
Direct link to PR: <rust-lang/rust#71579>

🎉 rustc-dev-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

None yet

7 participants