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

Implement RFC 1234: Ignore PhantomData when checking CoerceUnsized implementations #28381

Merged
merged 1 commit into from
Sep 17, 2015

Conversation

ebfull
Copy link
Contributor

@ebfull ebfull commented Sep 13, 2015

#27483 redux at Gankro's request.

Fixes #26905, Closes #28239

r? @nrc

@@ -4373,6 +4373,13 @@ impl<'tcx> TyS<'tcx> {
}
}

pub fn is_phantom_data(&self, cx: &ctxt<'tcx>) -> bool {
if let &TyStruct(def_id, _) = &self.sty {
return Some(def_id.did) == cx.lang_items.phantom_data();
Copy link
Contributor

Choose a reason for hiding this comment

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

def.is_phantom_data()

@nrc
Copy link
Member

nrc commented Sep 15, 2015

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 15, 2015

📌 Commit e15985c has been approved by nrc

@bors
Copy link
Contributor

bors commented Sep 15, 2015

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

@ebfull ebfull force-pushed the aint-fraid-a-no-ghosts-redux branch from e15985c to b096403 Compare September 15, 2015 04:36
@ebfull
Copy link
Contributor Author

ebfull commented Sep 16, 2015

@nrc This was rebased.

@nrc
Copy link
Member

nrc commented Sep 17, 2015

@bors: r=me

@bors
Copy link
Contributor

bors commented Sep 17, 2015

📌 Commit b096403 has been approved by me

bors added a commit that referenced this pull request Sep 17, 2015
@bors
Copy link
Contributor

bors commented Sep 17, 2015

⌛ Testing commit b096403 with merge 89faafc...

@bors bors merged commit b096403 into rust-lang:master Sep 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants