Skip to content

avoid type-check body of DefId - #60073

Merged
bors merged 1 commit into
rust-lang:masterfrom
rchaser53:issue-60049
Apr 19, 2019
Merged

avoid type-check body of DefId#60073
bors merged 1 commit into
rust-lang:masterfrom
rchaser53:issue-60049

Conversation

@rchaser53

@rchaser53rchaser53 commented Apr 18, 2019•
edited by pnkfelix
Loading

Copy link
Copy Markdown
Contributor

fix: #60049
related: PR #59798

@rust-highfive

rust-highfive commented Apr 18, 2019

Copy link
Copy Markdown
Contributor

r? @estebank

(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 Apr 18, 2019
hellow554
hellow554 reviewed Apr 18, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-59488.rs Outdated
@rchaser53rchaser53 mentioned this pull request Apr 18, 2019
Closed
@estebank

estebank commented Apr 18, 2019

Copy link
Copy Markdown
Contributor

Please remove the merge commit and rebase on top of master

estebank
estebank approved these changes Apr 18, 2019
View reviewed changes

@estebankestebank 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.

After rebasing r=me

@rchaser53

rchaser53 commented Apr 18, 2019

Copy link
Copy Markdown
ContributorAuthor

Sorry. I removed the merge commit and rebased on top of master.

@bors

bors commented Apr 19, 2019

Copy link
Copy Markdown
Collaborator

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

@estebank

estebank commented Apr 19, 2019

Copy link
Copy Markdown
Contributor

@rchaser53 you'll have to rebase again :(

@rchaser53

rchaser53 commented Apr 19, 2019

Copy link
Copy Markdown
ContributorAuthor

Oh! I rebased again.

@estebank

estebank commented Apr 19, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 19, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0ce131b 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 Apr 19, 2019
@bors

bors commented Apr 19, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0ce131b with merge 6c22051...

bors added a commit that referenced this pull request Apr 19, 2019
@bors
Auto merge of#60073- rchaser53:issue-60049, r=estebank
6c22051
avoid type-check body of DefId
fix: #60049
related: PR #59798
@bors

bors commented Apr 19, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: estebank
Pushing 6c22051 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2019
@bors
bors merged commit 0ce131b into rust-lang:masterApr 19, 2019
@rchaser53
rchaser53 deleted the issue-60049 branch April 19, 2019 10:13
@hellow554hellow554 mentioned this pull request Jul 5, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank approved these changes
+1 more reviewer
@hellow554hellow554hellow554 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@estebankestebank

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ICE: can't type-check body of DefId

5 participants

@rchaser53@rust-highfive@estebank@bors@hellow554