Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolstate: remove redundant beta-week check. #69705

Merged
merged 3 commits into from
Mar 12, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 4, 2020

I made a bit of a mistake in #69624. The "beta regression" doesn't need to be checked twice.

I also rolled up #69693 to avoid merge conflicts.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2020
src/bootstrap/toolstate.rs Outdated Show resolved Hide resolved
src/bootstrap/toolstate.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

RalfJung commented Mar 4, 2020

Looks good. :) But let's see what @Mark-Simulacrum says.

@Mark-Simulacrum
Copy link
Member

Seems good to me as well. Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 4, 2020

📌 Commit a41f1f1 has been approved by Mark-Simulacrum

@bors bors 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 Mar 4, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 5, 2020
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
bors added a commit that referenced this pull request Mar 5, 2020
Rollup of 10 pull requests

Successful merges:

 - #69520 (Make error message clearer about creating new module)
 - #69589 (ast: `Mac`/`Macro` -> `MacCall`)
 - #69614 (`delay_span_bug` when codegen cannot select obligation)
 - #69641 (Update books)
 - #69674 (Rename DefKind::Method and TraitItemKind::Method )
 - #69697 (Add explanation for E0380)
 - #69698 (Use associated constants of integer types)
 - #69705 (Toolstate: remove redundant beta-week check.)
 - #69711 (Update macros.rs: fix documentation typo.)
 - #69713 (more clippy cleanups)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 5, 2020
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
@ehuss
Copy link
Contributor Author

ehuss commented Mar 11, 2020

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Mar 11, 2020
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
Centril added a commit to Centril/rust that referenced this pull request Mar 11, 2020
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
bors added a commit that referenced this pull request Mar 12, 2020
Rollup of 10 pull requests

Successful merges:

 - #68899 (Add Display and Error impls for proc_macro::LexError)
 - #69011 (Document unsafe blocks in core::fmt)
 - #69674 (Rename DefKind::Method and TraitItemKind::Method )
 - #69705 (Toolstate: remove redundant beta-week check.)
 - #69722 (Tweak output for invalid negative impl AST errors)
 - #69747 (Rename rustc guide)
 - #69792 (Implement Error for TryReserveError)
 - #69830 (miri: ICE on invalid terminators)
 - #69921 (rustdoc: remove unused import)
 - #69945 (update outdated comment)

Failed merges:

r? @ghost
@bors bors merged commit 3d23de7 into rust-lang:master Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

5 participants