Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Search for implemented kinds recursively on Trait types. Fixes #15155 …
…and #13155.
- Loading branch information
Showing
2 changed files
with
50 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
trait TraitWithSend: Send {} | ||
trait IndirectTraitWithSend: TraitWithSend {} | ||
|
||
// Check struct instantiation (Box<TraitWithSend> will only have Send if TraitWithSend has Send) | ||
#[allow(dead_code)] | ||
struct Blah { x: Box<TraitWithSend> } | ||
impl TraitWithSend for Blah {} | ||
|
||
// Struct instantiation 2-levels deep | ||
#[allow(dead_code)] | ||
struct IndirectBlah { x: Box<IndirectTraitWithSend> } | ||
impl TraitWithSend for IndirectBlah {} | ||
impl IndirectTraitWithSend for IndirectBlah {} | ||
|
||
fn test_trait<Sized? T: Send>() { println!("got here!") } | ||
|
||
fn main() { | ||
test_trait::<TraitWithSend>(); | ||
test_trait::<IndirectTraitWithSend>(); | ||
} | ||
|
||
|
729bf44
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.
saw approval from nikomatsakis
at ricky26@729bf44
729bf44
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.
merging ricky26/rust/trait_supertraits = 729bf44 into auto
729bf44
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.
ricky26/rust/trait_supertraits = 729bf44 merged ok, testing candidate = eedfc07
729bf44
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.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2448
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2445
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2438
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2445
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2439
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2438
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2438
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2442
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2435
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2434
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2437
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2099
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2095
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2101
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/938
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/932
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/927
729bf44
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.
fast-forwarding master to auto = eedfc07