squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix rebase conflict

Browse source
This commit is contained in:
leonardo.yvens 2017-11-01 09:47:18 -02:00
parent 27efe126e0
commit 5e74353981
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1871,7 +1871,7 @@ impl Item_ {
ItemEnum(_, ref generics) | ItemEnum(_, ref generics) |
ItemStruct(_, ref generics) | ItemStruct(_, ref generics) |
ItemUnion(_, ref generics) | ItemUnion(_, ref generics) |
ItemTrait(_, ref generics, _, _) | ItemTrait(_, _, ref generics, _, _) |
ItemImpl(_, _, _, ref generics, _, _, _)=> generics, ItemImpl(_, _, _, ref generics, _, _, _)=> generics,
_ => return None _ => return None
}) })