fix rebase conflict

diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index 8b75735c61cfc26731ccad14a3eef13154216b5a..c9b1d70e7b60df57d2ebecc1c137384714a6ad97 100644 (file)
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -1871,7 +1871,7 @@ pub fn generics(&self) -> Option<&Generics> {
             ItemEnum(_, ref generics) |
             ItemStruct(_, ref generics) |
             ItemUnion(_, ref generics) |
-            ItemTrait(_, ref generics, _, _) |
+            ItemTrait(_, _, ref generics, _, _) |
             ItemImpl(_, _, _, ref generics, _, _, _)=> generics,
             _ => return None
         })