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

Fix ICE in assertion macro #50474

Merged
merged 1 commit into from
May 6, 2018
Merged

Fix ICE in assertion macro #50474

merged 1 commit into from
May 6, 2018

Conversation

sinkuu
Copy link
Contributor

@sinkuu sinkuu commented May 6, 2018

Fixes #50471. Needs beta-backport (stable-to-beta/nightly regression).

  • panic with single argument does not need escaping { and }
  • Instead of unescaping \u{...} manually, just use escape_debug in pprust

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 May 6, 2018
@rust-highfive

This comment has been minimized.

@sinkuu sinkuu force-pushed the fix_assert_ice branch from 08f5095 to 39df223 Compare May 6, 2018 03:13
@pietroalbini pietroalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 6, 2018
@Mark-Simulacrum
Copy link
Member

cc @rust-lang/compiler Could someone review this? It's a beta regression which needs to be backported in the next ~36 hours or so if it's to be in time...

@alexcrichton
Copy link
Member

@bors: r+ p=4

@bors
Copy link
Contributor

bors commented May 6, 2018

📌 Commit 39df223 has been approved by alexcrichton

@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 May 6, 2018
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 6, 2018
@pietroalbini
Copy link
Member

Added this PR to #50478.

@bors
Copy link
Contributor

bors commented May 6, 2018

⌛ Testing commit 39df223 with merge fb9e058...

bors added a commit that referenced this pull request May 6, 2018
Fix ICE in assertion macro

Fixes #50471. Needs beta-backport (stable-to-beta/nightly regression).

* `panic` with single argument does not need escaping `{` and `}`
* Instead of unescaping `\u{...}` manually, just use `escape_debug` in pprust
@eddyb
Copy link
Member

eddyb commented May 6, 2018

cc @nnethercote

@bors
Copy link
Contributor

bors commented May 6, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing fb9e058 to master...

@bors bors merged commit 39df223 into rust-lang:master May 6, 2018
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 6, 2018
bors added a commit that referenced this pull request May 6, 2018
[beta] Process backports

* #50419: rustdoc: Resolve nested `impl Trait`s
* #50474: Fix ICE in assertion macro

r? @Mark-Simulacrum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants