Rollup merge of #24460 - bytewiseand:master, r=alexcrichton

Closes #24197
Closes #24375

These ICEs are fixed on nightly.

2 files changed, 32 insertions, 0 deletions

diff --git a/src/test/parse-fail/issue-24197.rs b/src/test/parse-fail/issue-24197.rs
new file mode 100644
index 00000000000..37d62182612
--- /dev/null
+++ b/src/test/parse-fail/issue-24197.rs
@@ -0,0 +1,13 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let buf[0] = 0; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
+}
diff --git a/src/test/parse-fail/issue-24375.rs b/src/test/parse-fail/issue-24375.rs
new file mode 100644
index 00000000000..8723423325c
--- /dev/null
+++ b/src/test/parse-fail/issue-24375.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+static tmp : [&'static str; 2]  = ["hello", "he"];
+
+fn main() {
+    let z = "hello";
+    match z {
+        tmp[0] => {} //~ ERROR expected one of `=>`, `@`, `if`, or `|`, found `[`
+        _ => {}
+    }
+}