-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 soundness bug described in #29859 #35745
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
☔ The latest upstream changes (presumably #35605) made this pull request unmergeable. Please resolve the merge conflicts. |
{ | ||
let predicates = self.tcx().lookup_predicates(trait_def_id); | ||
|
||
// If we must exclude the Self : Trait predicate contained by all |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: s/If we/We/
87ccbb9
to
da2451e
Compare
} else if has_predicates { | ||
span_err!(self.tcx().sess, span, E0565, | ||
"traits with auto impls (`e.g. unsafe impl \ | ||
Trait for ..`) can not have predicates") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: s/can not/cannot/, also let's make if impl Trait for ..
and not unsafe impl Trait
@bors r+ |
📌 Commit 26c6439 has been approved by |
6da7b17
to
feff760
Compare
@bors r=nikomatsakis |
📌 Commit feff760 has been approved by |
feff760
to
fad75e6
Compare
@bors r=nikomatsakis |
Thanks @alexcrichton, not really sure why it wasn't building, been moving apartments this weekend so haven't had any time to chase it down. |
Huh. What is happening with bors here. :) |
@bors r- |
@bors r+ |
📌 Commit fad75e6 has been approved by |
⌛ Testing commit fad75e6 with merge 71b0f61... |
💔 Test failed - auto-mac-64-opt |
01d509e
to
dba5cbe
Compare
@bors r- |
@bors r=nikomatsakis |
📌 Commit dba5cbe has been approved by |
Fix soundness bug described in #29859 This is an attempt at fixing the problems described in #29859 based on an IRC conversation between @nikomatsakis and I today. I'm waiting on a full build to come back, otherwise both tests trigger the correct error.
💔 Test failed - auto-mac-64-opt-rustbuild |
@bors retry |
⌛ Testing commit dba5cbe with merge e98a1a4... |
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
dba5cbe
to
9510add
Compare
Travis failure:
|
@bors r+ |
📌 Commit a254282 has been approved by |
⌛ Testing commit a254282 with merge 384969e... |
💔 Test failed - auto-linux-32-nopt-t |
@bors: retry On Thu, Sep 8, 2016 at 7:20 AM, bors notifications@github.com wrote:
|
Fix soundness bug described in #29859 This is an attempt at fixing the problems described in #29859 based on an IRC conversation between @nikomatsakis and I today. I'm waiting on a full build to come back, otherwise both tests trigger the correct error.
This is an attempt at fixing the problems described in #29859 based on an IRC conversation between @nikomatsakis and I today. I'm waiting on a full build to come back, otherwise both tests trigger the correct error.