From 0308884416867110aa713b1daa10d12ff44a275a Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Mon, 6 Aug 2012 16:16:08 -0700 Subject: [PATCH] s/alt/match/... again. --- src/test/compile-fail/pat-ref-enum.rs | 2 +- .../resolve-inconsistent-binding-mode.rs | 12 ++++++------ src/test/compile-fail/resolve-inconsistent-names.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/compile-fail/pat-ref-enum.rs b/src/test/compile-fail/pat-ref-enum.rs index 9978e06e045..398a95d194c 100644 --- a/src/test/compile-fail/pat-ref-enum.rs +++ b/src/test/compile-fail/pat-ref-enum.rs @@ -1,5 +1,5 @@ fn matcher(x: option) { - alt x { + match x { ref some(i) => {} //~ ERROR expected identifier, found enum pattern none => {} } diff --git a/src/test/compile-fail/resolve-inconsistent-binding-mode.rs b/src/test/compile-fail/resolve-inconsistent-binding-mode.rs index 18631e9d259..e806bd6a637 100644 --- a/src/test/compile-fail/resolve-inconsistent-binding-mode.rs +++ b/src/test/compile-fail/resolve-inconsistent-binding-mode.rs @@ -3,28 +3,28 @@ enum opts { } fn matcher1(x: opts) { - alt x { + match x { a(ref i) | b(copy i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1 c(_) => {} } } fn matcher2(x: opts) { - alt x { + match x { a(ref i) | b(i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1 c(_) => {} } } fn matcher3(x: opts) { - alt x { + match x { a(ref mut i) | b(ref const i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1 c(_) => {} } } fn matcher4(x: opts) { - alt x { + match x { a(ref mut i) | b(ref i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1 c(_) => {} } @@ -32,10 +32,10 @@ fn matcher4(x: opts) { fn matcher5(x: opts) { - alt x { + match x { a(ref i) | b(ref i) => {} c(_) => {} } } -fn main() {} \ No newline at end of file +fn main() {} diff --git a/src/test/compile-fail/resolve-inconsistent-names.rs b/src/test/compile-fail/resolve-inconsistent-names.rs index f82588c1df5..2c1ade056ad 100644 --- a/src/test/compile-fail/resolve-inconsistent-names.rs +++ b/src/test/compile-fail/resolve-inconsistent-names.rs @@ -1,6 +1,6 @@ fn main() { let y = 1; - alt y { + match y { a | b => {} //~ ERROR variable `a` from pattern #1 is not bound in pattern #2 //~^ ERROR variable `b` from pattern #2 is not bound in pattern #1 }