-
Notifications
You must be signed in to change notification settings - Fork 12.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adjust orphan rules to consider all input types, not just self type.
Fixes #18222.
- Loading branch information
1 parent
3d2cf60
commit aeba2cc
Showing
3 changed files
with
42 additions
and
3 deletions.
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,14 @@ | ||
// Copyright 2014 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. | ||
|
||
pub trait TheTrait<T> { | ||
fn the_fn(&self); | ||
} | ||
|
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,25 @@ | ||
// Copyright 2014 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. | ||
|
||
// aux-build:coherence-orphan-lib.rs | ||
|
||
extern crate "coherence-orphan-lib" as lib; | ||
|
||
use lib::TheTrait; | ||
|
||
struct TheType; | ||
|
||
impl TheTrait<uint> for int { } //~ ERROR E0117 | ||
|
||
impl TheTrait<TheType> for int { } | ||
|
||
impl TheTrait<int> for TheType { } | ||
|
||
fn main() { } |
aeba2cc
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 pcwalton
at nikomatsakis@aeba2cc
aeba2cc
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 nikomatsakis/rust/coherence-orphan-18222 = aeba2cc into auto
aeba2cc
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.
nikomatsakis/rust/coherence-orphan-18222 = aeba2cc merged ok, testing candidate = d44ea720
aeba2cc
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/1909
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1908
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1901
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1908
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1903
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1902
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1902
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1906
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1899
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1899
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1902
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1558
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1558
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1560
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/398
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/397
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/389
aeba2cc
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 = d44ea720