Skip to content

Rollup of 7 pull requests - #67485

Merged
bors merged 23 commits into
rust-lang:masterfrom
Centril:rollup-gt0opvr
Dec 21, 2019
Merged

Rollup of 7 pull requests#67485
bors merged 23 commits into
rust-lang:masterfrom
Centril:rollup-gt0opvr

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

TommasoBianchiand others added 23 commits December 5, 2019 12:28
The same effect can be achieved by `-Cllvm-args=-disable-preinline`.
2. mir::Mutability -> ast::Mutability.
…felix
Fix too restrictive checks on Drop impls
Fixesrust-lang#34426. Fixesrust-lang#58311.
This PR completes and extends rust-lang#59497 (which has been inactive for a while now).
The problem generating both issues was that when checking that the `Predicate`s of the `Drop` impl are exactly the same as the ones of the struct definition, the check was essentially performed by a simple `==` operator, which was not handling correctly HRTBs and involved `Fn` types.
The implemented solution relies on the `relate` machinery to more correctly equate `Predicate`s, and on `anonymize_late_bound_regions` to handle HRTB in a more general way. As the `Relate` trait currently is implemented only for `TraitPredicate` and `ProjectionPredicate` (and as they were the ones generating problems), `relate` is used only for them while for other `Predicate`s the equality check is kept. I'm currently considering whether it would make sense to implement the `Relate` trait also for all other `Predicate`s to render the proposed solution more general.
Merge `ast::Mutability` and `mir::Mutability`
r? @oli-obk
…, r=varkor
Enable opting out of specific default LLVM arguments.
`rustc` by default adds a few arguments to LLVM (like `-mergefunc-use-aliases` for example). With this PR `rustc` will only emit these arguments if the same argument has not already been specified by the user via `-Cllvm-args`. This enables opting out of these defaults.
The PR also removes a PGO specific `-Z` flag the effect of which can also be easily achieved by `-Cllvm-args`.
Fixesrust-lang#64310.
…ts, r=dtolnay
Make ptr::slice_from_raw_parts a const fn available under a feature flag
A first step in the direction of rust-lang#67456 .
This makes `ptr::slice_from_raw_parts` and `ptr::slice_from_raw_parts_mut` available as a const fn under a feature flag.
…r=oli-obk
Test slice patterns more
Adds tests for const evaluation and some more borrow checking tests.
Fixes some bugs in const eval for subslice patterns.
closesrust-lang#66934
r? @oli-obk
cc @Centril
Fix src/libcore/str/mod.rs doc comments
Fix grammar in src/libcore/str/mod.rs doc comments. r? @steveklabnik
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=200 rollup=never

@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 466fdea has been approved by Centril

@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 21, 2019
@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 466fdea with merge 0a440b1...

bors added a commit that referenced this pull request Dec 21, 2019
Rollup of 7 pull requests
Successful merges:
- #67059 (Fix too restrictive checks on Drop impls)
- #67355 (Merge `ast::Mutability` and `mir::Mutability`)
- #67393 (Enable opting out of specific default LLVM arguments.)
- #67422 (Cleanup err codes)
- #67462 (Make ptr::slice_from_raw_parts a const fn available under a feature flag)
- #67467 (Test slice patterns more)
- #67478 (Fix src/libcore/str/mod.rs doc comments)
Failed merges:
r? @ghost
@bors

bors commented Dec 21, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 0a440b1 to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

9 participants

@Centril@bors@JohnTitor@TommasoBianchi@GuillaumeGomez@Dylan-DPC@michaelwoerister@matthewjasper@brunobell