auto merge of #14483 : ahmedcharles/rust/patbox, r=alexcrichton

2014-05-29 12:11:40 -07:00
parent 50b8528970 4e3db5e0f4
commit 729ee20338
14 changed files with 20 additions and 20 deletions
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -347,7 +347,7 @@ pub enum Pat_ {
                                     * we don't bind the fields to names */
    PatStruct(Path, Vec<FieldPat> , bool),
    PatTup(Vec<@Pat> ),
-    PatUniq(@Pat),
+    PatBox(@Pat),
    PatRegion(@Pat), // reference pattern
    PatLit(@Expr),
    PatRange(@Expr, @Expr),