rollup merge of #20039: barosl/if-let-friendly-error

Fixes #19991.
2014-12-21 00:04:13 -08:00
parent cfc815bef4 314ed2df09
commit eb47e1e446
10 changed files with 64 additions and 24 deletions
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -32,7 +32,6 @@ pub use self::LitIntType::*;
 pub use self::LocalSource::*;
 pub use self::Mac_::*;
 pub use self::MacStmtStyle::*;
-pub use self::MatchSource::*;
 pub use self::MetaItem_::*;
 pub use self::Method_::*;
 pub use self::Mutability::*;
@@ -760,9 +759,9 @@ pub struct QPath {

 #[deriving(Clone, Copy, PartialEq, Eq, Encodable, Decodable, Hash, Show)]
 pub enum MatchSource {
-    MatchNormal,
-    MatchIfLetDesugar,
-    MatchWhileLetDesugar,
+    Normal,
+    IfLetDesugar { contains_else_clause: bool },
+    WhileLetDesugar,
 }

 #[deriving(Clone, Copy, PartialEq, Eq, Encodable, Decodable, Hash, Show)]