user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #18223 : nikomatsakis/rust/coherence-orphan-18222, r=pcwalton

Browse source 
Adjust orphan rules to consider all input types, not just self type.

Fixes #18222.

r? @pcwalton
This commit is contained in:
bors 2014-10-22 09:22:09 +00:00
commit d44ea720fa
3 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/middle/traits/coherence.rs
View file

@ -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,