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

Revert edition-guide toolstate override #61110

Merged
merged 1 commit into from May 25, 2019

Conversation

Projects
None yet
6 participants
@ehuss
Copy link
Contributor

commented May 24, 2019

Closes #60929

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 24, 2019

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

commented May 24, 2019

Does this need beta backport? r=me if not, otherwise we should not close that issue - r=me if closes is removed from the description

@mati865

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

For the reference PR fixing the issue is nominated for beta #61098

@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented May 24, 2019

I don't think it really matters that it is backported to beta. For me, this is a "nice to have" to get early warning of breakage. The chance that something new breaks it on stable or beta but not master I think would be close to zero. But if the #61098 backport wants to include this, that would be fine, too.

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

commented May 24, 2019

I've accepted for beta backport (but blocked on #61098, presumably).

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

📌 Commit fbc6a4b has been approved by Mark-Simulacrum

Centril added a commit to Centril/rust that referenced this pull request May 24, 2019

Rollup merge of rust-lang#61110 - ehuss:revert-edition-override, r=Ma…
…rk-Simulacrum

Revert edition-guide toolstate override

Closes rust-lang#60929

bors added a commit that referenced this pull request May 24, 2019

Auto merge of #61128 - Centril:rollup-rwjauqz, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61077 (Don't arena-allocate static symbols.)
 - #61094 (Make find_local iterate instead of recurse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61103 (Make find iterate instead of recurse)
 - #61104 (Make eval_place_to_op iterate instead of recurse)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61125 (Updated my mailmap entry)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request May 24, 2019

Auto merge of #61128 - Centril:rollup-rwjauqz, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61077 (Don't arena-allocate static symbols.)
 - #61094 (Make find_local iterate instead of recurse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61103 (Make find iterate instead of recurse)
 - #61104 (Make eval_place_to_op iterate instead of recurse)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61125 (Updated my mailmap entry)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request May 24, 2019

Rollup merge of rust-lang#61110 - ehuss:revert-edition-override, r=Ma…
…rk-Simulacrum

Revert edition-guide toolstate override

Closes rust-lang#60929

bors added a commit that referenced this pull request May 24, 2019

Auto merge of #61131 - Centril:rollup-nb733r3, r=Centril
Rollup of 16 pull requests

Successful merges:

 - #61077 (Don't arena-allocate static symbols.)
 - #61092 (Make sanitize_place iterate instead of recurse)
 - #61094 (Make find_local iterate instead of recurse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61099 (Make ignore_borrow iterate instead of recurse)
 - #61103 (Make find iterate instead of recurse)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61120 (Make eval_place iterate instead of recurse)
 - #61121 (improve debug-printing of scalars)
 - #61125 (Updated my mailmap entry)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019

Rollup merge of rust-lang#61110 - ehuss:revert-edition-override, r=Ma…
…rk-Simulacrum

Revert edition-guide toolstate override

Closes rust-lang#60929

Centril added a commit to Centril/rust that referenced this pull request May 25, 2019

Rollup merge of rust-lang#61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests

Successful merges:

 - rust-lang#61026 (Tweak macro parse errors when reaching EOF during macro call parse)
 - rust-lang#61095 (Update cargo)
 - rust-lang#61096 (tidy: don't short-circuit on license error)
 - rust-lang#61107 (Fix a couple docs typos)
 - rust-lang#61110 (Revert edition-guide toolstate override)
 - rust-lang#61111 (Fixed type-alias-bounds lint doc)
 - rust-lang#61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - rust-lang#61116 (Remove the incorrect warning from README.md)
 - rust-lang#61118 (Dont ICE on an attempt to use GAT without feature gate)
 - rust-lang#61121 (improve debug-printing of scalars)
 - rust-lang#61125 (Updated my mailmap entry)
 - rust-lang#61134 (Annotate each `reverse_bits` with `#[must_use]`)
 - rust-lang#61138 (Move async/await tests to their own folder)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request May 25, 2019

Auto merge of #61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #61026 (Tweak macro parse errors when reaching EOF during macro call parse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61121 (improve debug-printing of scalars)
 - #61125 (Updated my mailmap entry)
 - #61134 (Annotate each `reverse_bits` with `#[must_use]`)
 - #61138 (Move async/await tests to their own folder)

Failed merges:

r? @ghost

@bors bors merged commit fbc6a4b into rust-lang:master May 25, 2019

1 check passed

Travis CI - Pull Request Build Passed
Details

bors added a commit that referenced this pull request Jun 6, 2019

Auto merge of #61602 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Rolled up:

* [beta] Permit unwinding through FFI by default #61569

Cherry-picked:

* upgrade rustdoc's `pulldown-cmark` to 0.5.2 #60802
* Fix overflowing literal lint in loops #61098
* Revert edition-guide toolstate override #61110
* Turn turbo 🐟 🍨 into an error #61189
* Bump hashbrown to 0.4.0 #61388
* Fix regression 61475 #61500

r? @ghost

bors added a commit that referenced this pull request Jun 7, 2019

Auto merge of #61602 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Rolled up:

* [beta] Permit unwinding through FFI by default #61569

Cherry-picked:

* upgrade rustdoc's `pulldown-cmark` to 0.5.2 #60802
* Fix overflowing literal lint in loops #61098
* Revert edition-guide toolstate override #61110
* Turn turbo 🐟 🍨 into an error #61189
* Bump hashbrown to 0.4.0 #61388
* Fix regression 61475 #61500

r? @ghost

bors added a commit that referenced this pull request Jun 7, 2019

Auto merge of #61602 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports

Rolled up:

* [beta] Permit unwinding through FFI by default #61569

Cherry-picked:

* upgrade rustdoc's `pulldown-cmark` to 0.5.2 #60802
* Fix overflowing literal lint in loops #61098
* Revert edition-guide toolstate override #61110
* Turn turbo 🐟 🍨 into an error #61189
* Bump hashbrown to 0.4.0 #61388
* Fix regression 61475 #61500

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.