Skip to content

Rollup of 6 pull requests - #68078

Merged
bors merged 54 commits into
rust-lang:masterfrom
Centril:rollup-qvq052k
Jan 10, 2020
Merged

Rollup of 6 pull requests#68078
bors merged 54 commits into
rust-lang:masterfrom
Centril:rollup-qvq052k

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

oli-obkand others added 30 commits January 7, 2020 15:41
…PlaceTy::dangling`) so you can't get the address back out.
Co-Authored-By: Ralf Jung <post@ralfj.de>
ecstatic-morseand others added 9 commits January 9, 2020 16:47
…e-types, r=Centril
Point at opaque and closure type definitions in type errors
Fixesrust-lang#57266, fixesrust-lang#67117.
Parse the syntax described in RFC 2632
This adds support for both `impl const Trait for Ty` and `?const Trait` bound syntax from rust-lang/rfcs#2632 to the parser. For now, both modifiers end up in a newly-added `constness` field on `ast::TraitRef`, although this may change once the implementation is fleshed out.
I was planning on using `delay_span_bug` when this syntax is encountered during lowering, but I can't write `should-ice` UI tests. I emit a normal error instead, which causes duplicates when the feature gate is not enabled (see the `.stderr` files for the feature gate tests). Not sure what the desired approach is; Maybe just do nothing when the syntax is encountered with the feature gate is enabled?
@oli-obk I went with `const_trait_impl` and `const_trait_bound_opt_out` for the names of these features. Are these to your liking?
cc rust-lang#67792rust-lang#67794
r? @Centril
…enkov
rustc_ast_lowering: misc cleanup & rustc dep reductions
- The first two commits do some code simplification.
- The next three do some file splitting (getting `lib.rs` below the 3kloc tidy lint).
- The remaining commits reduce the number of `rustc::` imports. This works towards making lowering independent of the `rustc` crate.
r? @oli-obk cc @Zoxc
Extend support of `_` in type parameters
- Account for `impl Trait<_>`.
- Provide a reasonable `Span` for empty `Generics` in `impl`s.
- Account for `fn foo<_>(_: _) {}` to suggest `fn foo<T>(_: T) {}`.
- Fixrust-lang#67995. Follow up to rust-lang#67597.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6f3f1c5 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 10, 2020
@CentrilCentril added the rollup A PR which is a rollup label Jan 10, 2020
@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6f3f1c5 with merge 2d8d559...

bors added a commit that referenced this pull request Jan 10, 2020
Rollup of 6 pull requests
Successful merges:
- #66463 (Point at opaque and closure type definitions in type errors)
- #67501 (Reduce special treatment for zsts)
- #67820 (Parse the syntax described in RFC 2632)
- #67922 (rustc_ast_lowering: misc cleanup & rustc dep reductions)
- #68071 (Extend support of `_` in type parameters)
- #68073 (expect `fn` after `const unsafe` / `const extern`)
Failed merges:
r? @ghost
@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 2d8d559 to master...

@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #68078!

Tested on commit 2d8d559.
Direct link to PR: #68078

💔 miri on windows: test-pass → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 10, 2020
Tested on commit rust-lang/rust@2d8d559.
Direct link to PR: <rust-lang/rust#68078>
💔 miri on windows: test-pass → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
@Centril
Centril deleted the rollup-qvq052k branch January 10, 2020 05:55
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.

6 participants

@Centril@bors@rust-highfive@oli-obk@estebank@ecstatic-morse