From a4e6009bf07545e63b64a98f8fb9e85bbe5d74cc Mon Sep 17 00:00:00 2001 From: Andrew Cann Date: Wed, 3 Aug 2016 13:59:27 +0800 Subject: [PATCH] Minor fixups based on feedback --- src/librustc_const_eval/check_match.rs | 2 +- src/libsyntax/print/pprust.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_const_eval/check_match.rs b/src/librustc_const_eval/check_match.rs index d80e152248f..4049a2b815d 100644 --- a/src/librustc_const_eval/check_match.rs +++ b/src/librustc_const_eval/check_match.rs @@ -218,7 +218,7 @@ fn check_expr(cx: &mut MatchCheckCtxt, ex: &hir::Expr) { if !pat_ty.is_uninhabited(cx.tcx) { // We know the type is inhabited, so this must be wrong let mut err = struct_span_err!(cx.tcx.sess, ex.span, E0002, - "non-exhaustive patterns: type {} is inhabited", + "non-exhaustive patterns: type {} is non-empty", pat_ty); span_help!(&mut err, ex.span, "Please ensure that all possible cases are being handled; \ diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 24d8198191e..a77c678248b 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -977,7 +977,7 @@ pub fn print_type(&mut self, ty: &ast::Ty) -> io::Result<()> { try!(self.print_mt(mt)); } ast::TyKind::Never => { - word(&mut self.s, "!")?; + try!(word(&mut self.s, "!")); }, ast::TyKind::Tup(ref elts) => { try!(self.popen()); -- 2.44.0