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

Use correct edition for panic in [debug_]assert!(). #89622

Merged
merged 2 commits into from
Oct 8, 2021

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Oct 7, 2021

@m-ou-se m-ou-se added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-edition-2021 Area: The 2021 edition labels Oct 7, 2021
@m-ou-se m-ou-se added this to the 1.56.0 milestone Oct 7, 2021
@rust-highfive
Copy link
Collaborator

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2021
@m-ou-se m-ou-se force-pushed the debug-assert-2021 branch from a30f18d to a9b33be Compare October 7, 2021 12:13
@m-ou-se m-ou-se changed the title Use correct edition for panic in debug_assert!(). Use correct edition for panic in [debug_]assert!(). Oct 7, 2021
@m-ou-se m-ou-se force-pushed the debug-assert-2021 branch 2 times, most recently from 58a1352 to 3c7af31 Compare October 7, 2021 12:21
@m-ou-se m-ou-se force-pushed the debug-assert-2021 branch from 3c7af31 to fcd9fa9 Compare October 7, 2021 12:27
@estebank
Copy link
Contributor

estebank commented Oct 7, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2021

📌 Commit fcd9fa9 has been approved by estebank

@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 Oct 7, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 7, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2021
…ingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#87918 (Enable AutoFDO.)
 - rust-lang#88137 (On macOS, make strip="symbols" not pass any options to strip)
 - rust-lang#88772 (Fixed confusing wording on Result::map_or_else.)
 - rust-lang#89025 (Implement `#[link_ordinal(n)]`)
 - rust-lang#89082 (Implement rust-lang#85440 (Random test ordering))
 - rust-lang#89288 (Wrapper for `-Z gcc-ld=lld` to invoke rust-lld with the correct flavor)
 - rust-lang#89476 (Correct decoding of foreign expansions during incr. comp.)
 - rust-lang#89622 (Use correct edition for panic in [debug_]assert!().)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 30e068f into rust-lang:master Oct 8, 2021
@rustbot rustbot removed this from the 1.56.0 milestone Oct 8, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 8, 2021
@m-ou-se m-ou-se deleted the debug-assert-2021 branch October 8, 2021 16:38
@m-ou-se m-ou-se modified the milestones: 1.57.0, 1.56.0 Oct 8, 2021
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 14, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 14, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2021
[beta] backports

- 2229: Consume IfLet expr rust-lang#89282
- Wrapper for -Z gcc-ld=lld to invoke rust-lld with the correct flavor rust-lang#89288
- Fix unsound optimization with explicit variant discriminants rust-lang#89489
- Fix stabilization version for bindings_after_at rust-lang#89605
- Turn vtable_allocation() into a query rust-lang#89619
- Revert "Stabilize Iterator::intersperse()" rust-lang#89638
- Ignore type of projections for upvar capturing rust-lang#89648
- ~~Add Poll::ready and~~ revert stabilization of task::ready! rust-lang#89651
- CI: Use mirror for libisl downloads for more docker dist builds rust-lang#89661
-  Use correct edition for panic in [debug_]assert!(). rust-lang#89622
-  Switch to our own mirror of libisl plus ct-ng oldconfig fixes rust-lang#89599
-  Emit item no type error even if type inference fails rust-lang#89585
-  Revert enum discriminants rust-lang#89884
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-edition-2021 Area: The 2021 edition beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants