Skip to content

Fix ICE when attempting to print closure generics - #37459

Merged
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:closure-ice
Oct 31, 2016
Merged

Fix ICE when attempting to print closure generics#37459
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:closure-ice

Conversation

@Mark-Simulacrum

@Mark-SimulacrumMark-Simulacrum commented Oct 28, 2016•
edited
Loading

Copy link
Copy Markdown
Member

@Mark-SimulacrumMark-Simulacrum changed the title Fix ICE on printing closure types(?).Fix ICE when attempting to print closure genericsOct 28, 2016
eddyb
eddyb suggested changes Oct 28, 2016
View reviewed changes

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with nits fixed.

Comment threadsrc/librustc/mir/repr.rs Outdated

@eddybeddybOct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this fit on a single line?

Comment threadsrc/librustc/util/ppaux.rs Outdated

@eddybeddybOct 28, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This talks about item types but we care only about generics

@Mark-Simulacrum
Mark-Simulacrumforce-pushed the closure-ice branch 2 times, most recently from 944257b to 45fddcdCompareOctober 28, 2016 23:24
@eddyb

eddyb commented Oct 28, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 28, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 45fddcd has been approved by eddyb

@eddyb

eddyb commented Oct 28, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 28, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit b538e26 has been approved by eddyb

@eddyb

eddyb commented Oct 29, 2016

Copy link
Copy Markdown
Contributor

@bors r- (Travis failed)

@eddyb

eddyb commented Oct 29, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 29, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 4a6a811 has been approved by eddyb

@bors

bors commented Oct 30, 2016

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #37400) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum

Mark-Simulacrum commented Oct 30, 2016

Copy link
Copy Markdown
MemberAuthor

@eddyb Rebased; Re-r+?

@petrochenkov

petrochenkov commented Oct 30, 2016

Copy link
Copy Markdown
Contributor

@bors r=eddyb

@bors

bors commented Oct 30, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit bdb399d has been approved by eddyb

@bors

bors commented Oct 30, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bdb399d with merge ea20ab1...

bors added a commit that referenced this pull request Oct 30, 2016
@bors
Auto merge of#37459- Mark-Simulacrum:closure-ice, r=eddyb
ea20ab1
Fix ICE when attempting to print closure generics
Fixes#36622.
r? @eddyb or @arielb1
@bors

bors commented Oct 31, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing ea20ab1 to master...

@bors
bors merged commit bdb399d into rust-lang:masterOct 31, 2016
@eddybeddyb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 31, 2016
@eddyb

eddyb commented Oct 31, 2016

Copy link
Copy Markdown
Contributor

Sadly this is incomplete (it can cause a call of item_name on a closure which won't work).

@eddybeddyb removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 31, 2016
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Oct 31, 2016
Merged
bors added a commit that referenced this pull request Nov 1, 2016
@bors
Auto merge of#37491- Mark-Simulacrum:closure-ice, r=eddyb
7c69b0d
Fix ICE when printing closures, and other similar types
Follow-up of #37459, further fixes those problems.
Potentially actually fixes#36622, though @eddyb may want to not let that close if the rename of RUST_LOG is deemed part of that issue.
Potentially should be beta-nominated as well?
r? @eddyb
@brsonbrson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 3, 2016
@brson

brson commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

Nominating because this is required for #37491.

@brsonbrson mentioned this pull request Nov 3, 2016
Merged
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 3, 2016
@nikomatsakis

nikomatsakis commented Nov 3, 2016

Copy link
Copy Markdown
Contributor

Approved for backport because @eddyb said so. =)

cc @rust-lang/compiler

@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 3, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Mark-Simulacrum@eddyb@bors@petrochenkov@brson@nikomatsakis