Skip to content

Replace GeneratorSubsts with SubstsRef - #65100

Merged
bors merged 5 commits into
rust-lang:masterfrom
csmoe:generator
Oct 6, 2019
Merged

Replace GeneratorSubsts with SubstsRef#65100
bors merged 5 commits into
rust-lang:masterfrom
csmoe:generator

Conversation

@csmoe

@csmoecsmoe commented Oct 4, 2019

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2019
@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 4, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit afc0bb9 has been approved by nikomatsakis

@borsbors 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 Oct 4, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 4, 2019
bors added a commit that referenced this pull request Oct 4, 2019
Rollup of 7 pull requests
Successful merges:
- #64909 (When encountering chained operators use heuristics to recover from bad turbofish)
- #65020 (Always mark rust and rust-call abi's as unwind)
- #65064 (permit asyncawait-ondeck to be added by anyone)
- #65066 ([const-prop] Fix ICE when trying to eval polymorphic promoted MIR)
- #65100 (Replace GeneratorSubsts with SubstsRef)
- #65101 (Upgrade librustc_macros dependencies)
- #65105 (Split out some passes from librustc)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019
@CentrilCentril mentioned this pull request Oct 4, 2019
@borsbors added the rollup A PR which is a rollup label Oct 4, 2019
@CentrilCentril removed the rollup A PR which is a rollup label Oct 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019
@CentrilCentril mentioned this pull request Oct 4, 2019
bors added a commit that referenced this pull request Oct 5, 2019
Rollup of 8 pull requests
Successful merges:
- #64708 (Stabilize `Option::as_deref` and `Option::as_deref_mut`)
- #64909 (When encountering chained operators use heuristics to recover from bad turbofish)
- #65011 (Do not ICE when dereferencing non-Copy raw pointer)
- #65064 (permit asyncawait-ondeck to be added by anyone)
- #65066 ([const-prop] Fix ICE when trying to eval polymorphic promoted MIR)
- #65100 (Replace GeneratorSubsts with SubstsRef)
- #65105 (Split out some passes from librustc)
- #65106 (Allow unused attributes to avoid incremental bug)
Failed merges:
r? @ghost
tmandry added a commit to tmandry/rust that referenced this pull request Oct 5, 2019
@tmandrytmandry mentioned this pull request Oct 5, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 6, 2019
@tmandrytmandry mentioned this pull request Oct 6, 2019
bors added a commit that referenced this pull request Oct 6, 2019
Rollup of 18 pull requests
This contains changes from all the successful runs that bors marked as timed out, plus a revert of #63649 which appears to be the immediate cause of the timeouts.
Successful merges:
- #64708 (Stabilize `Option::as_deref` and `Option::as_deref_mut`)
- #64728 (Stabilize UdpSocket::peer_addr)
- #64765 (std: Reduce checks for `feature = "backtrace"`)
- #64909 (When encountering chained operators use heuristics to recover from bad turbofish)
- #65011 (Do not ICE when dereferencing non-Copy raw pointer)
- #65064 (permit asyncawait-ondeck to be added by anyone)
- #65066 ([const-prop] Fix ICE when trying to eval polymorphic promoted MIR)
- #65100 (Replace GeneratorSubsts with SubstsRef)
- #65105 (Split out some passes from librustc)
- #65106 (Allow unused attributes to avoid incremental bug)
- #65113 (Fix lonely backtick)
- #65116 (Remove unneeded visit_statement definition)
- #65118 (Update the documented default of -Z mutable-noalias)
- #65123 (Account for macro invocation in `let mut $pat` diagnostic.)
- #65124 (Replace some instances of `as *[const | mut] _` with `.cast()`)
- #65126 (Fix typo on `now()` comments)
- #65130 (lint: extern non-exhaustive types are improper)
- #65151 (Revert #63649 - "Upgrade Emscripten targets to use upstream LLVM backend")
Failed merges:
r? @ghost
@bors
bors merged commit afc0bb9 into rust-lang:masterOct 6, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

[RFC] Refactor types to be a (TypeCore, Substs) pair

5 participants

@csmoe@nikomatsakis@bors@Centril@rust-highfive