auto merge of #6773 : lkuper/rust/alt-to-match, r=thestinger

RIP `alt`.

65 files changed, 0 insertions, 0 deletions

diff --git a/src/test/compile-fail/bad-alt.rs b/src/test/compile-fail/bad-match.rs
index 041f84bc6ee..041f84bc6ee 100644
--- a/src/test/compile-fail/bad-alt.rs
+++ b/src/test/compile-fail/bad-match.rs
diff --git a/src/test/compile-fail/alt-arrows-block-then-binop.rs b/src/test/compile-fail/match-arrows-block-then-binop.rs
index b6b2313aa09..b6b2313aa09 100644
--- a/src/test/compile-fail/alt-arrows-block-then-binop.rs
+++ b/src/test/compile-fail/match-arrows-block-then-binop.rs
diff --git a/src/test/compile-fail/alt-join.rs b/src/test/compile-fail/match-join.rs
index 3caac6dbcfe..3caac6dbcfe 100644
--- a/src/test/compile-fail/alt-join.rs
+++ b/src/test/compile-fail/match-join.rs
diff --git a/src/test/compile-fail/alt-pattern-field-mismatch-2.rs b/src/test/compile-fail/match-pattern-field-mismatch-2.rs
index 3e704ede159..3e704ede159 100644
--- a/src/test/compile-fail/alt-pattern-field-mismatch-2.rs
+++ b/src/test/compile-fail/match-pattern-field-mismatch-2.rs
diff --git a/src/test/compile-fail/alt-pattern-field-mismatch.rs b/src/test/compile-fail/match-pattern-field-mismatch.rs
index ce52d03465e..ce52d03465e 100644
--- a/src/test/compile-fail/alt-pattern-field-mismatch.rs
+++ b/src/test/compile-fail/match-pattern-field-mismatch.rs
diff --git a/src/test/compile-fail/alt-range-fail-dominate.rs b/src/test/compile-fail/match-range-fail-dominate.rs
index 3f484511859..3f484511859 100644
--- a/src/test/compile-fail/alt-range-fail-dominate.rs
+++ b/src/test/compile-fail/match-range-fail-dominate.rs
diff --git a/src/test/compile-fail/alt-range-fail.rs b/src/test/compile-fail/match-range-fail.rs
index dc7ebaefd01..dc7ebaefd01 100644
--- a/src/test/compile-fail/alt-range-fail.rs
+++ b/src/test/compile-fail/match-range-fail.rs
diff --git a/src/test/compile-fail/alt-tag-nullary.rs b/src/test/compile-fail/match-tag-nullary.rs
index 2b0c3dbf8e8..2b0c3dbf8e8 100644
--- a/src/test/compile-fail/alt-tag-nullary.rs
+++ b/src/test/compile-fail/match-tag-nullary.rs
diff --git a/src/test/compile-fail/alt-tag-unary.rs b/src/test/compile-fail/match-tag-unary.rs
index a129ff19ac6..a129ff19ac6 100644
--- a/src/test/compile-fail/alt-tag-unary.rs
+++ b/src/test/compile-fail/match-tag-unary.rs
diff --git a/src/test/compile-fail/alt-vec-invalid.rs b/src/test/compile-fail/match-vec-invalid.rs
index 2cf2d5b93b0..2cf2d5b93b0 100644
--- a/src/test/compile-fail/alt-vec-invalid.rs
+++ b/src/test/compile-fail/match-vec-invalid.rs
diff --git a/src/test/compile-fail/alt-vec-mismatch-2.rs b/src/test/compile-fail/match-vec-mismatch-2.rs
index 6ea0300cf1e..6ea0300cf1e 100644
--- a/src/test/compile-fail/alt-vec-mismatch-2.rs
+++ b/src/test/compile-fail/match-vec-mismatch-2.rs
diff --git a/src/test/compile-fail/alt-vec-mismatch.rs b/src/test/compile-fail/match-vec-mismatch.rs
index 85ed8761ee9..85ed8761ee9 100644
--- a/src/test/compile-fail/alt-vec-mismatch.rs
+++ b/src/test/compile-fail/match-vec-mismatch.rs
diff --git a/src/test/compile-fail/alt-vec-unreachable.rs b/src/test/compile-fail/match-vec-unreachable.rs
index 2719d84b2dd..2719d84b2dd 100644
--- a/src/test/compile-fail/alt-vec-unreachable.rs
+++ b/src/test/compile-fail/match-vec-unreachable.rs
diff --git a/src/test/pretty/alt-naked-expr-long.rs b/src/test/pretty/match-naked-expr-long.rs
index 66ad3d55820..66ad3d55820 100644
--- a/src/test/pretty/alt-naked-expr-long.rs
+++ b/src/test/pretty/match-naked-expr-long.rs
diff --git a/src/test/pretty/alt-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs
index 4ae129c7b73..4ae129c7b73 100644
--- a/src/test/pretty/alt-naked-expr-medium.rs
+++ b/src/test/pretty/match-naked-expr-medium.rs
diff --git a/src/test/pretty/alt-naked-expr.rs b/src/test/pretty/match-naked-expr.rs
index 15c49cd4115..15c49cd4115 100644
--- a/src/test/pretty/alt-naked-expr.rs
+++ b/src/test/pretty/match-naked-expr.rs
diff --git a/src/test/run-fail/expr-alt-fail-fn.rs b/src/test/run-fail/expr-match-fail-fn.rs
index 6476e57a35b..6476e57a35b 100644
--- a/src/test/run-fail/expr-alt-fail-fn.rs
+++ b/src/test/run-fail/expr-match-fail-fn.rs
diff --git a/src/test/run-fail/expr-alt-fail.rs b/src/test/run-fail/expr-match-fail.rs
index e2bf6052a10..e2bf6052a10 100644
--- a/src/test/run-fail/expr-alt-fail.rs
+++ b/src/test/run-fail/expr-match-fail.rs
diff --git a/src/test/run-fail/alt-bot-fail.rs b/src/test/run-fail/match-bot-fail.rs
index 2ba78e21374..2ba78e21374 100644
--- a/src/test/run-fail/alt-bot-fail.rs
+++ b/src/test/run-fail/match-bot-fail.rs
diff --git a/src/test/run-fail/alt-disc-bot.rs b/src/test/run-fail/match-disc-bot.rs
index 13ccd118c61..13ccd118c61 100644
--- a/src/test/run-fail/alt-disc-bot.rs
+++ b/src/test/run-fail/match-disc-bot.rs
diff --git a/src/test/run-fail/alt-wildcards.rs b/src/test/run-fail/match-wildcards.rs
index 306357b0001..306357b0001 100644
--- a/src/test/run-fail/alt-wildcards.rs
+++ b/src/test/run-fail/match-wildcards.rs
diff --git a/src/test/run-fail/unwind-alt.rs b/src/test/run-fail/unwind-match.rs
index a9761017c73..a9761017c73 100644
--- a/src/test/run-fail/unwind-alt.rs
+++ b/src/test/run-fail/unwind-match.rs
diff --git a/src/test/run-pass/expr-alt-box.rs b/src/test/run-pass/expr-match-box.rs
index 84a78637187..84a78637187 100644
--- a/src/test/run-pass/expr-alt-box.rs
+++ b/src/test/run-pass/expr-match-box.rs
diff --git a/src/test/run-pass/expr-alt-fail-all.rs b/src/test/run-pass/expr-match-fail-all.rs
index 5234f58578e..5234f58578e 100644
--- a/src/test/run-pass/expr-alt-fail-all.rs
+++ b/src/test/run-pass/expr-match-fail-all.rs
diff --git a/src/test/run-pass/expr-alt-fail.rs b/src/test/run-pass/expr-match-fail.rs
index 3e1b96763e1..3e1b96763e1 100644
--- a/src/test/run-pass/expr-alt-fail.rs
+++ b/src/test/run-pass/expr-match-fail.rs
diff --git a/src/test/run-pass/expr-alt-generic-box1.rs b/src/test/run-pass/expr-match-generic-box1.rs
index 4ea2d0fba9b..4ea2d0fba9b 100644
--- a/src/test/run-pass/expr-alt-generic-box1.rs
+++ b/src/test/run-pass/expr-match-generic-box1.rs
diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-match-generic-box2.rs
index c5c89b42825..c5c89b42825 100644
--- a/src/test/run-pass/expr-alt-generic-box2.rs
+++ b/src/test/run-pass/expr-match-generic-box2.rs
diff --git a/src/test/run-pass/expr-alt-generic-unique1.rs b/src/test/run-pass/expr-match-generic-unique1.rs
index 085d52d6d7f..085d52d6d7f 100644
--- a/src/test/run-pass/expr-alt-generic-unique1.rs
+++ b/src/test/run-pass/expr-match-generic-unique1.rs
diff --git a/src/test/run-pass/expr-alt-generic-unique2.rs b/src/test/run-pass/expr-match-generic-unique2.rs
index 7ef1fb8cab8..7ef1fb8cab8 100644
--- a/src/test/run-pass/expr-alt-generic-unique2.rs
+++ b/src/test/run-pass/expr-match-generic-unique2.rs
diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-match-generic.rs
index 04a229f2280..04a229f2280 100644
--- a/src/test/run-pass/expr-alt-generic.rs
+++ b/src/test/run-pass/expr-match-generic.rs
diff --git a/src/test/run-pass/expr-alt-struct.rs b/src/test/run-pass/expr-match-struct.rs
index 57483d96e8b..57483d96e8b 100644
--- a/src/test/run-pass/expr-alt-struct.rs
+++ b/src/test/run-pass/expr-match-struct.rs
diff --git a/src/test/run-pass/expr-alt-unique.rs b/src/test/run-pass/expr-match-unique.rs
index cdd4e45877a..cdd4e45877a 100644
--- a/src/test/run-pass/expr-alt-unique.rs
+++ b/src/test/run-pass/expr-match-unique.rs
diff --git a/src/test/run-pass/expr-alt.rs b/src/test/run-pass/expr-match.rs
index a6324b98ebc..a6324b98ebc 100644
--- a/src/test/run-pass/expr-alt.rs
+++ b/src/test/run-pass/expr-match.rs
diff --git a/src/test/run-pass/fat-arrow-alt.rs b/src/test/run-pass/fat-arrow-match.rs
index f6b49960fad..f6b49960fad 100644
--- a/src/test/run-pass/fat-arrow-alt.rs
+++ b/src/test/run-pass/fat-arrow-match.rs
diff --git a/src/test/run-pass/generic-tag-alt.rs b/src/test/run-pass/generic-tag-match.rs
index 752dded83c4..752dded83c4 100644
--- a/src/test/run-pass/generic-tag-alt.rs
+++ b/src/test/run-pass/generic-tag-match.rs
diff --git a/src/test/run-pass/alt-borrowed_str.rs b/src/test/run-pass/match-borrowed_str.rs
index 1a58174a3fb..1a58174a3fb 100644
--- a/src/test/run-pass/alt-borrowed_str.rs
+++ b/src/test/run-pass/match-borrowed_str.rs
diff --git a/src/test/run-pass/alt-bot-2.rs b/src/test/run-pass/match-bot-2.rs
index ba897bd92c0..ba897bd92c0 100644
--- a/src/test/run-pass/alt-bot-2.rs
+++ b/src/test/run-pass/match-bot-2.rs
diff --git a/src/test/run-pass/alt-bot.rs b/src/test/run-pass/match-bot.rs
index 78892a1e4b8..78892a1e4b8 100644
--- a/src/test/run-pass/alt-bot.rs
+++ b/src/test/run-pass/match-bot.rs
diff --git a/src/test/run-pass/alt-implicit-copy-unique.rs b/src/test/run-pass/match-implicit-copy-unique.rs
index 0497f11202f..0497f11202f 100644
--- a/src/test/run-pass/alt-implicit-copy-unique.rs
+++ b/src/test/run-pass/match-implicit-copy-unique.rs
diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/match-join.rs
index 66b64768060..66b64768060 100644
--- a/src/test/run-pass/alt-join.rs
+++ b/src/test/run-pass/match-join.rs
diff --git a/src/test/run-pass/alt-naked-record-expr.rs b/src/test/run-pass/match-naked-record-expr.rs
index 649bdd202df..649bdd202df 100644
--- a/src/test/run-pass/alt-naked-record-expr.rs
+++ b/src/test/run-pass/match-naked-record-expr.rs
diff --git a/src/test/run-pass/alt-naked-record.rs b/src/test/run-pass/match-naked-record.rs
index 4d89fdc6910..4d89fdc6910 100644
--- a/src/test/run-pass/alt-naked-record.rs
+++ b/src/test/run-pass/match-naked-record.rs
diff --git a/src/test/run-pass/alt-path.rs b/src/test/run-pass/match-path.rs
index 3da6bb93486..3da6bb93486 100644
--- a/src/test/run-pass/alt-path.rs
+++ b/src/test/run-pass/match-path.rs
diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/match-pattern-drop.rs
index 71bbb1768e8..71bbb1768e8 100644
--- a/src/test/run-pass/alt-pattern-drop.rs
+++ b/src/test/run-pass/match-pattern-drop.rs
diff --git a/src/test/run-pass/alt-pattern-lit.rs b/src/test/run-pass/match-pattern-lit.rs
index 3e01253094b..3e01253094b 100644
--- a/src/test/run-pass/alt-pattern-lit.rs
+++ b/src/test/run-pass/match-pattern-lit.rs
diff --git a/src/test/run-pass/alt-pattern-no-type-params.rs b/src/test/run-pass/match-pattern-no-type-params.rs
index feabf7a8f4d..feabf7a8f4d 100644
--- a/src/test/run-pass/alt-pattern-no-type-params.rs
+++ b/src/test/run-pass/match-pattern-no-type-params.rs
diff --git a/src/test/run-pass/alt-pattern-simple.rs b/src/test/run-pass/match-pattern-simple.rs
index f4056008103..f4056008103 100644
--- a/src/test/run-pass/alt-pattern-simple.rs
+++ b/src/test/run-pass/match-pattern-simple.rs
diff --git a/src/test/run-pass/alt-phi.rs b/src/test/run-pass/match-phi.rs
index 40d21588350..40d21588350 100644
--- a/src/test/run-pass/alt-phi.rs
+++ b/src/test/run-pass/match-phi.rs
diff --git a/src/test/run-pass/alt-range.rs b/src/test/run-pass/match-range.rs
index 6b02b21a084..6b02b21a084 100644
--- a/src/test/run-pass/alt-range.rs
+++ b/src/test/run-pass/match-range.rs
diff --git a/src/test/run-pass/alt-ref-binding-in-guard-3256.rs b/src/test/run-pass/match-ref-binding-in-guard-3256.rs
index ed7a6316374..ed7a6316374 100644
--- a/src/test/run-pass/alt-ref-binding-in-guard-3256.rs
+++ b/src/test/run-pass/match-ref-binding-in-guard-3256.rs
diff --git a/src/test/run-pass/alt-ref-binding-mut-option.rs b/src/test/run-pass/match-ref-binding-mut-option.rs
index 8d1e483bcd8..8d1e483bcd8 100644
--- a/src/test/run-pass/alt-ref-binding-mut-option.rs
+++ b/src/test/run-pass/match-ref-binding-mut-option.rs
diff --git a/src/test/run-pass/alt-ref-binding-mut.rs b/src/test/run-pass/match-ref-binding-mut.rs
index 266f7cdde11..266f7cdde11 100644
--- a/src/test/run-pass/alt-ref-binding-mut.rs
+++ b/src/test/run-pass/match-ref-binding-mut.rs
diff --git a/src/test/run-pass/alt-ref-binding.rs b/src/test/run-pass/match-ref-binding.rs
index 0b613df18ee..0b613df18ee 100644
--- a/src/test/run-pass/alt-ref-binding.rs
+++ b/src/test/run-pass/match-ref-binding.rs
diff --git a/src/test/run-pass/alt-str.rs b/src/test/run-pass/match-str.rs
index 8bbcc507f18..8bbcc507f18 100644
--- a/src/test/run-pass/alt-str.rs
+++ b/src/test/run-pass/match-str.rs
diff --git a/src/test/run-pass/alt-tag.rs b/src/test/run-pass/match-tag.rs
index 9eeb12d9c45..9eeb12d9c45 100644
--- a/src/test/run-pass/alt-tag.rs
+++ b/src/test/run-pass/match-tag.rs
diff --git a/src/test/run-pass/alt-unique-bind.rs b/src/test/run-pass/match-unique-bind.rs
index 997cc1ee9ff..997cc1ee9ff 100644
--- a/src/test/run-pass/alt-unique-bind.rs
+++ b/src/test/run-pass/match-unique-bind.rs
diff --git a/src/test/run-pass/alt-value-binding-in-guard-3291.rs b/src/test/run-pass/match-value-binding-in-guard-3291.rs
index 33785b2fbb0..33785b2fbb0 100644
--- a/src/test/run-pass/alt-value-binding-in-guard-3291.rs
+++ b/src/test/run-pass/match-value-binding-in-guard-3291.rs
diff --git a/src/test/run-pass/alt-with-ret-arm.rs b/src/test/run-pass/match-with-ret-arm.rs
index f46521f1d55..f46521f1d55 100644
--- a/src/test/run-pass/alt-with-ret-arm.rs
+++ b/src/test/run-pass/match-with-ret-arm.rs
diff --git a/src/test/run-pass/nested-exhaustive-alt.rs b/src/test/run-pass/nested-exhaustive-match.rs
index e5ecd82be1d..e5ecd82be1d 100644
--- a/src/test/run-pass/nested-exhaustive-alt.rs
+++ b/src/test/run-pass/nested-exhaustive-match.rs
diff --git a/src/test/run-pass/nested-alts.rs b/src/test/run-pass/nested-matchs.rs
index dfbd583f16e..dfbd583f16e 100644
--- a/src/test/run-pass/nested-alts.rs
+++ b/src/test/run-pass/nested-matchs.rs
diff --git a/src/test/run-pass/simple-generic-alt.rs b/src/test/run-pass/simple-generic-match.rs
index 3f3b1c8b783..3f3b1c8b783 100644
--- a/src/test/run-pass/simple-generic-alt.rs
+++ b/src/test/run-pass/simple-generic-match.rs
diff --git a/src/test/run-pass/simple-alt-generic-tag.rs b/src/test/run-pass/simple-match-generic-tag.rs
index 6f7f2af6820..6f7f2af6820 100644
--- a/src/test/run-pass/simple-alt-generic-tag.rs
+++ b/src/test/run-pass/simple-match-generic-tag.rs
diff --git a/src/test/run-pass/unique-alt-discrim.rs b/src/test/run-pass/unique-match-discrim.rs
index 1f0b13dfd01..1f0b13dfd01 100644
--- a/src/test/run-pass/unique-alt-discrim.rs
+++ b/src/test/run-pass/unique-match-discrim.rs
diff --git a/src/test/run-pass/use-uninit-alt.rs b/src/test/run-pass/use-uninit-match.rs
index f4943ed09bd..f4943ed09bd 100644
--- a/src/test/run-pass/use-uninit-alt.rs
+++ b/src/test/run-pass/use-uninit-match.rs
diff --git a/src/test/run-pass/use-uninit-alt2.rs b/src/test/run-pass/use-uninit-match2.rs
index 802c861f88b..802c861f88b 100644
--- a/src/test/run-pass/use-uninit-alt2.rs
+++ b/src/test/run-pass/use-uninit-match2.rs