Skip to content

Fix #62660 - #62668

Merged
bors merged 1 commit into
rust-lang:masterfrom
goodmanjonathan:fix-62660
Jul 16, 2019
Merged

Fix #62660#62668
bors merged 1 commit into
rust-lang:masterfrom
goodmanjonathan:fix-62660

Conversation

@goodmanjonathan

Copy link
Copy Markdown
Contributor

If the explicitly given type of a self parameter fails to parse correctly, we need to propagate the error rather than dropping it and causing an ICE.

Fixes#62660.

If the explicitly given type of a `self` parameter fails to parse correctly,
we need to propagate the error rather than dropping it and causing an ICE.
Fixesrust-lang#62660.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @petrochenkov

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2019
@goodmanjonathan

Copy link
Copy Markdown
ContributorAuthor

r? @estebank

@estebank

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 7111328 has been approved by estebank

@borsbors 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 Jul 14, 2019
@estebankestebank added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 14, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 15, 2019
Fixrust-lang#62660
If the explicitly given type of a `self` parameter fails to parse correctly, we need to propagate the error rather than dropping it and causing an ICE.
Fixesrust-lang#62660.
bors added a commit that referenced this pull request Jul 16, 2019
Rollup of 14 pull requests
Successful merges:
- #62103 (Add debug assertions to write_bytes and copy*)
- #62405 (Remove never_type feature requirement for exhaustive patterns)
- #62491 (Fix Pin urls in Option documentation)
- #62533 (Add missing links for CannotReallocInPlace type)
- #62634 (Less unsafe in the array example of MaybeUninit docs)
- #62639 (Make VaListImpl<'f> invariant over the 'f lifetime)
- #62646 (Tweak wording in feature gate errors)
- #62662 (add spaces in front of trait requirements in libcore/cell.rs)
- #62668 (Fix#62660)
- #62673 (miri validation: better error messages for dangling references)
- #62680 (Actually call `visit_block_entry` in `DataflowResultsConsumer`)
- #62685 (Add info about undefined behavior to as_ref suggestions)
- #62689 (Fix typo in RawWaker::new documentation)
- #62698 (SGX target: don't pretend to be GNU/Linux to LLVM)
Failed merges:
r? @ghost
@bors
bors merged commit 7111328 into rust-lang:masterJul 16, 2019
@goodmanjonathan
goodmanjonathan deleted the fix-62660 branch July 16, 2019 17:26
@nagisanagisa added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 18, 2019
@nagisa

Copy link
Copy Markdown
Member

Decided to not backport to stable as the fix is for a stable-to-stable regression and the issue being fixed is not too impactful.

@nagisanagisa removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jul 18, 2019
goodmanjonathan added a commit to goodmanjonathan/rust that referenced this pull request Jul 19, 2019
Beta backport of rust-lang#62668.
If the explicitly given type of a `self` parameter fails to parse correctly,
we need to propagate the error rather than dropping it and causing an ICE.
@goodmanjonathangoodmanjonathan mentioned this pull request Jul 19, 2019
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 22, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

ICE with wrong method receiver as second parameter

7 participants

@goodmanjonathan@rust-highfive@estebank@bors@nagisa@emilyalbini@petrochenkov