Rollup of 5 pull requests #67479

Centril · 2019-12-21T11:09:10Z

Successful merges:

Fix too restrictive checks on Drop impls #67059 (Fix too restrictive checks on Drop impls)
Refactor type & bounds parsing thoroughly #67148 ( Refactor type & bounds parsing thoroughly)
Enable opting out of specific default LLVM arguments. #67393 (Enable opting out of specific default LLVM arguments.)
Cleanup err codes #67422 (Cleanup err codes)
Make ptr::slice_from_raw_parts a const fn available under a feature flag #67462 (Make ptr::slice_from_raw_parts a const fn available under a feature flag)

Failed merges:

The same effect can be achieved by `-Cllvm-args=-disable-preinline`.

…felix Fix too restrictive checks on Drop impls Fixes rust-lang#34426. Fixes rust-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.

@estebank

Refactor type & bounds parsing thoroughly PR is based on rust-lang#67131 with first one from this PR being ` extract parse_ty_tuple_or_parens`. Also fixes rust-lang#67146. r? @estebank

…, 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`. Fixes rust-lang#64310.

@Dylan-DPC

…=Dylan-DPC Cleanup err codes r? @Dylan-DPC

…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.

Centril · 2019-12-21T11:09:39Z

@bors p=198 rollup=never

Centril · 2019-12-21T11:09:51Z

@bors r+

bors · 2019-12-21T11:09:52Z

📌 Commit a3cc9b4 has been approved by Centril

bors · 2019-12-21T14:21:55Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-powu9mn (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-powu9mn --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/librustc_parse/parser/item.rs
CONFLICT (content): Merge conflict in src/librustc_parse/parser/item.rs
Auto-merging src/librustc_parse/parser/expr.rs
CONFLICT (content): Merge conflict in src/librustc_parse/parser/expr.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-12-21T14:24:41Z

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

TommasoBianchi and others added 30 commits December 5, 2019 12:28

Add regression tests

2bd28d9

Fix too restrictive checks on Drop impls

042d855

Formatting fixes

b08d697

Clean up E0120 long explanation

020be74

Clean up E0121 long explanation

94d207f

Update E0120.md

7f0741d

Update E0121.md

dce0f06

Allow -Cllvm-args to override rustc's default LLVM args.

963f20d

Remove rarely used -Zdisable_instrumentation_preinliner flag.

1ca145c

The same effect can be achieved by `-Cllvm-args=-disable-preinline`.

Make ptr::slice_from_raw_parts a const fn available under a feature flag

382d370

extract parse_ty_tuple_or_parens

c59588f

refactor parse_ty_tuple_or_parens

e68db0a

parse_ptr -> parse_ty_ptr & refactor

6d678b1

extract parse_array_or_slice_ty

f085637

extract parse_typeof_ty

b42b85f

extract parse_impl_ty

d47de3e

extract parse_dyn_ty

1fa8f70

extract parse_path_start_ty

c0561cf

extract error_illegal_c_variadic_ty

6b92be2

parse_ty_common: .fatal -> .struct_span_err

0e74022

parser/ty.rs: minor formatting tweaks

3b63465

extract error_opt_out_lifetime

8e8ac02

extract recover_paren_lifetime

56b54fb

parse_generic_bounds_common: dedent

e8b6769

extract can_begin_bound

7294804

extract parse_generic_bound

229560b

functionalize parse_generic_bound

2ca6181

parse_generic_bound: leave a FIXME

f87ff0f

extract parse_generic_ty_bound

8f33bdc

extract parse_generic_lt_bound

8123211

Centril added 13 commits December 20, 2019 23:21

simplify negative bound diagnostic

90f7d8b

simplify 'let question = ...;'

765df3a

parse_generic_bounds: account for negative lifetime bounds

51bbdeb

extract error_negative_bounds

f02fd50

document parse_late_bound_lifetime_defs

0ebd421

parse_ty_bare_fn: improve docs

d977e5b

unwrap -> expect

cabe665

span_suggestion_hidden -> tool_only_span_suggestion

690b0b3

Rollup merge of rust-lang#67148 - Centril:ty-polish, r=estebank

2e44898

Refactor type & bounds parsing thoroughly PR is based on rust-lang#67131 with first one from this PR being ` extract parse_ty_tuple_or_parens`. Also fixes rust-lang#67146. r? @estebank

Rollup merge of rust-lang#67422 - GuillaumeGomez:cleanup-err-codes, r…

dfe712c

…=Dylan-DPC Cleanup err codes r? @Dylan-DPC

bors 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

Centril added the rollup A PR which is a rollup label Dec 21, 2019

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 Dec 21, 2019

Centril closed this Dec 21, 2019

Centril deleted the rollup-powu9mn branch December 21, 2019 14:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #67479

Rollup of 5 pull requests #67479

Centril commented Dec 21, 2019

Centril commented Dec 21, 2019

Centril commented Dec 21, 2019

bors commented Dec 21, 2019

bors commented Dec 21, 2019

bors commented Dec 21, 2019

Rollup of 5 pull requests #67479

Rollup of 5 pull requests #67479

Conversation

Centril commented Dec 21, 2019

Centril commented Dec 21, 2019

Centril commented Dec 21, 2019

bors commented Dec 21, 2019

bors commented Dec 21, 2019

bors commented Dec 21, 2019