bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update with response to feedback

Browse source
This commit is contained in:
Sean Griffin 2017-03-03 09:09:09 -05:00 • committed by Corey Farwell
parent 4aca540018
commit ddcca79d25
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/ty/mod.rs
View file

@ -2227,7 +2227,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
queries::impl_trait_ref::get(self, DUMMY_SP, id) queries::impl_trait_ref::get(self, DUMMY_SP, id)
} }
/// Returns true if the impl is positive and is for a triat which contains /// Returns true if the impl is positive and is for a trait which contains
/// no items /// no items
pub fn impl_always_allowed_to_overlap(self, def_id: DefId) -> bool { pub fn impl_always_allowed_to_overlap(self, def_id: DefId) -> bool {
self.trait_impl_polarity(def_id) == hir::ImplPolarity::Positive self.trait_impl_polarity(def_id) == hir::ImplPolarity::Positive

1
src/test/run-pass/overlap-permitted-for-marker-traits.rs
View file

@ -19,5 +19,6 @@ fn foo<T: MyMarker>(t: T) -> T {
fn main() { fn main() {
assert_eq!(1, foo(1)); assert_eq!(1, foo(1));
assert_eq!(2.0, foo(2.0));
assert_eq!(vec![1], foo(vec![1])); assert_eq!(vec![1], foo(vec![1]));
} }