]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #55646 - GuillaumeGomez:rollup, r=GuillaumeGomez
authorbors <bors@rust-lang.org>
Sat, 3 Nov 2018 14:51:05 +0000 (14:51 +0000)
committerbors <bors@rust-lang.org>
Sat, 3 Nov 2018 14:51:05 +0000 (14:51 +0000)
Rollup of 5 pull requests

Successful merges:

 - #54162 (Hide default impls items)
 - #55555 (Make `-Z ls` list the actual filename of external dependencies)
 - #55567 (add test for deriving Debug on uninhabited enum)
 - #55568 (test that rustdoc doesn't overflow on a big enum)
 - #55598 (publish-toolstate: ping maintainers when a tool builds again)

Failed merges:

r? @ghost

1  2 
src/librustdoc/clean/mod.rs

index e71b3ccb01dbe19b45c69b51a2eabb9f46aae7b1,2d77eaf2effd5f3d2097027f1c68bb3b4d6f0271..9f68fd56c5e04512d023436a9f7b0f5c47479914
@@@ -552,6 -552,14 +552,14 @@@ impl ItemEnum 
              _ => return None,
          })
      }
+     pub fn is_associated(&self) -> bool {
+         match *self {
+             ItemEnum::TypedefItem(_, _) |
+             ItemEnum::AssociatedTypeItem(_, _) => true,
+             _ => false,
+         }
+     }
  }
  
  #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
@@@ -1260,6 -1268,7 +1268,6 @@@ impl Clean<Option<Lifetime>> for ty::Re
              ty::RePlaceholder(..) |
              ty::ReEmpty |
              ty::ReClosureBound(_) |
 -            ty::ReCanonical(_) |
              ty::ReErased => None
          }
      }
@@@ -2732,7 -2741,6 +2740,7 @@@ impl<'tcx> Clean<Type> for Ty<'tcx> 
  
              ty::Closure(..) | ty::Generator(..) => Tuple(vec![]), // FIXME(pcwalton)
  
 +            ty::Bound(..) => panic!("Bound"),
              ty::UnnormalizedProjection(..) => panic!("UnnormalizedProjection"),
              ty::GeneratorWitness(..) => panic!("GeneratorWitness"),
              ty::Infer(..) => panic!("Infer"),