Skip to content

Fix soundness bug described in #29859 #35745

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 7 commits into from
Sep 8, 2016

Conversation

jroesch
Copy link
Member

@jroesch jroesch commented Aug 17, 2016

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.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@bors
Copy link
Collaborator

bors commented Aug 17, 2016

☔ 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
Copy link
Contributor

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/

@jroesch jroesch force-pushed the soundness-fix-29859 branch from 87ccbb9 to da2451e Compare August 18, 2016 01:17
} 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")
Copy link
Contributor

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

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

📌 Commit 26c6439 has been approved by nikomatsakis

@jroesch jroesch force-pushed the soundness-fix-29859 branch from 6da7b17 to feff760 Compare August 18, 2016 19:49
@jroesch
Copy link
Member Author

jroesch commented Aug 18, 2016

@bors r=nikomatsakis

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

📌 Commit feff760 has been approved by nikomatsakis

@jroesch jroesch force-pushed the soundness-fix-29859 branch from feff760 to fad75e6 Compare August 19, 2016 00:31
@jroesch
Copy link
Member Author

jroesch commented Aug 19, 2016

@bors r=nikomatsakis

@alexcrichton
Copy link
Member

@bors: retry force clean

@jroesch
Copy link
Member Author

jroesch commented Aug 22, 2016

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.

@nikomatsakis
Copy link
Contributor

Huh. What is happening with bors here. :)

@nikomatsakis
Copy link
Contributor

@bors r-

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 22, 2016

📌 Commit fad75e6 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Aug 22, 2016

⌛ Testing commit fad75e6 with merge 71b0f61...

@bors
Copy link
Collaborator

bors commented Aug 22, 2016

💔 Test failed - auto-mac-64-opt

@jroesch jroesch force-pushed the soundness-fix-29859 branch from 01d509e to dba5cbe Compare August 29, 2016 09:40
@jroesch
Copy link
Member Author

jroesch commented Aug 29, 2016

@bors r-

@jroesch
Copy link
Member Author

jroesch commented Aug 29, 2016

@bors r=nikomatsakis

@bors
Copy link
Collaborator

bors commented Aug 29, 2016

📌 Commit dba5cbe has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Aug 29, 2016

⌛ Testing commit dba5cbe with merge b58dddd...

bors added a commit that referenced this pull request Aug 29, 2016
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.
@bors
Copy link
Collaborator

bors commented Aug 29, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@arielb1
Copy link
Contributor

arielb1 commented Aug 29, 2016

@bors retry

@bors
Copy link
Collaborator

bors commented Sep 1, 2016

⌛ Testing commit dba5cbe with merge e98a1a4...

@bors
Copy link
Collaborator

bors commented Sep 1, 2016

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@jroesch jroesch force-pushed the soundness-fix-29859 branch from dba5cbe to 9510add Compare September 2, 2016 18:58
@nikomatsakis
Copy link
Contributor

Travis failure:

rustc: x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd
LD_LIBRARY_PATH=/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH x86_64-unknown-linux-gnu/stage0/bin/tidy /build/src
/build/src/test/compile-fail/typeck-auto-trait-no-supertraits.rs:26: trailing whitespace
/build/src/test/compile-fail/typeck-auto-trait-no-supertraits.rs:38: trailing whitespace
/build/src/test/compile-fail/typeck-auto-trait-no-supertraits-2.rs:14: trailing whitespace
duplicate error code: 565
/build/src/libsyntax/diagnostic_list.rs:164: E0565: r##"
/build/src/librustc_typeck/diagnostics.rs:4075:     E0565, // auto-traits can not have predicates,
duplicate error code: 566
/build/src/librustc/diagnostics.rs:1807:     E0566  // conflicting representation hints
/build/src/librustc_typeck/diagnostics.rs:4076:     E0566, // auto traits can not have type parameters
thread 'main' panicked at 'some tidy checks failed', /build/src/tools/tidy/src/main.rs:53
note: Run with `RUST_BACKTRACE=1` for a backtrace.
make: *** [tidy] Error 101
/build/mk/tests.mk:247: recipe for target 'tidy' failed

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 8, 2016

📌 Commit a254282 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Sep 8, 2016

⌛ Testing commit a254282 with merge 384969e...

@bors
Copy link
Collaborator

bors commented Sep 8, 2016

💔 Test failed - auto-linux-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Sep 8, 2016 at 7:20 AM, bors notifications@github.com wrote:

💔 Test failed - auto-linux-32-nopt-t
https://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/10455


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#35745 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95Nb03OZhOLd0TnBejjOD7bE3aXOzks5qoBnIgaJpZM4JmHk0
.

@bors
Copy link
Collaborator

bors commented Sep 8, 2016

⌛ Testing commit a254282 with merge ea45edf...

bors added a commit that referenced this pull request Sep 8, 2016
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.
@bors bors merged commit a254282 into rust-lang:master Sep 8, 2016
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants