Skip to content

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented Dec 22, 2019

Successful merges:

Failed merges:

r? @ghost

mati865 and others added 30 commits December 18, 2019 22:48
The code is dead because `check_pat_slice` will never have `expected = ty::Ref(...)` due to default-binding-modes (see `is_non_ref_pat`, `peel_off_references`). Moreover, if the type is not `ty::Array(_) | ty::Slice(_)` then `check_pat_slice` enters an error branch.
Also use `types.err` when matching on `expected.kind`s which don't match `ty::Array(..) | ty::Slice(_)`.
Avoid calling `.node_type(...)` again.
After rust-lang#62550, it is no longer possible for `slice` to be other than `None | Some(Binding(..) | Wild)`. In particular, `lower_pat_slice` may never generate `Some(Array(..) | Slice(..))` and so there is nothing to flatten into `slice`.
(The backticks were rendering badly in VSCode.)
Centril and others added 16 commits December 21, 2019 19:20
 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
…lacrum Reenable static linking of libstdc++ on windows-gnu Fixes rust-lang#67408 Verified locally that `rustc_driver` is now statically linked to libstdc++.
…jasper Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck Following up on rust-lang#67318, in this PR, the HAIR lowering of patterns (`lower_pattern_unadjusted`) is cleaned up with a focus on slice patterns (in particular, some dead code is removed). Moreover, `check_pat_slice` is refactored some more. r? @matthewjasper
…-0-part-2, r=Centril Require issue = "none" over issue = "0" in unstable attributes These changes make the use of `issue = "none"` required in unstable attributes throughout the compiler. Notes: - rust-lang#66299 is now in beta so `issue = "none"` is accepted. - The `tidy` tool now fails on `issue = "0"`. - Tests that used `issue = "0"` were changed to use `issue = "none"`, except for _one_ that asserts `issue = "0"` can still be used. - The compiler still allows `issue = "0"` because some submodules require it, this could be disallowed once these are updated. Resolves rust-lang#41260 r? @varkor
…rns, r=Centril Tweak non_shorthand_field_patterns' suggestion Fixes rust-lang#66434 r? @estebank
…=Centril Warn against relying on ?Sized being last Fixes rust-lang#62522
@Centril
Copy link
Contributor Author

Centril commented Dec 22, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Collaborator

bors commented Dec 22, 2019

📌 Commit ca528fc has been approved by Centril

@bors
Copy link
Collaborator

bors commented Dec 22, 2019

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

@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 Dec 22, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 22, 2019
@bors
Copy link
Collaborator

bors commented Dec 22, 2019

⌛ Testing commit ca528fc with merge 3982d35...

bors added a commit that referenced this pull request Dec 22, 2019
Rollup of 6 pull requests Successful merges: - #67148 ( Refactor type & bounds parsing thoroughly) - #67410 (Reenable static linking of libstdc++ on windows-gnu) - #67439 (Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck) - #67480 (Require issue = "none" over issue = "0" in unstable attributes) - #67500 (Tweak non_shorthand_field_patterns' suggestion) - #67504 (Warn against relying on ?Sized being last) Failed merges: r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 22, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 3982d35 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2019
@bors bors merged commit ca528fc into rust-lang:master Dec 22, 2019
@Centril Centril deleted the rollup-7win7ty branch December 22, 2019 11:38
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. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

7 participants