From c6890e17a0ef16d77a3b1a532991a70b0d13d96b Mon Sep 17 00:00:00 2001 From: Andrew Cann Date: Wed, 3 Aug 2016 14:34:22 +0800 Subject: [PATCH] Revert Ty::is_uninhabited to its original state --- src/librustc/ty/sty.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs index d52208c05d5..9680632ec4d 100644 --- a/src/librustc/ty/sty.rs +++ b/src/librustc/ty/sty.rs @@ -906,10 +906,10 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> { // more complete. match self.sty { TyEnum(def, _) | TyStruct(def, _) => def.is_empty(), - TyNever => true, - // FIXME(canndrew): There's no reason why this can't be uncommented, it's tested and it - // doesn't break anything. But I'm keeping my changes small for now. + // FIXME(canndrew): There's no reason why these can't be uncommented, they're tested + // and they don't break anything. But I'm keeping my changes small for now. + //TyNever => true, //TyTuple(ref tys) => tys.iter().any(|ty| ty.is_uninhabited(cx)), // FIXME(canndrew): this line breaks core::fmt