Skip to content

Commit

Permalink
Adjust orphan rules to consider all input types, not just self type.
Browse files Browse the repository at this point in the history
Fixes #18222.
  • Loading branch information
nikomatsakis committed Oct 22, 2014
1 parent 3d2cf60 commit aeba2cc
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/librustc/middle/traits/coherence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ pub fn impl_is_local(tcx: &ty::ctxt,
return true;
}

// Otherwise, self type must be local to the crate.
let self_ty = ty::lookup_item_type(tcx, impl_def_id).ty;
return ty_is_local(tcx, self_ty);
// Otherwise, at least one of the input types must be local to the
// crate.
trait_ref.input_types().iter().any(|&t| ty_is_local(tcx, t))
}

pub fn ty_is_local(tcx: &ty::ctxt,
Expand Down
14 changes: 14 additions & 0 deletions src/test/auxiliary/coherence-orphan-lib.rs
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);
}

25 changes: 25 additions & 0 deletions src/test/compile-fail/coherence-orphan.rs
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() { }

5 comments on commit aeba2cc

@bors
Copy link
Contributor

@bors bors commented on aeba2cc Oct 22, 2014

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

@bors
Copy link
Contributor

@bors bors commented on aeba2cc Oct 22, 2014

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

@bors
Copy link
Contributor

@bors bors commented on aeba2cc Oct 22, 2014

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

@bors
Copy link
Contributor

@bors bors commented on aeba2cc Oct 22, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on aeba2cc Oct 22, 2014

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

Please sign in to comment.