about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorTomasz Miąsko <tomasz.miasko@gmail.com>2016-02-06 18:42:17 +0100
committerTomasz Miąsko <tomasz.miasko@gmail.com>2016-02-08 21:26:48 +0100
commitcecf83f5926898c86c305c7aff104fcc900a87a2 (patch)
tree1ee7cff9363f77cd6a53b0026689b1c9d06652b5 /src/test
parent695c907dcc7c81c5fc052f426f7764476c12cf15 (diff)
downloadrust-cecf83f5926898c86c305c7aff104fcc900a87a2.tar.gz
rust-cecf83f5926898c86c305c7aff104fcc900a87a2.zip
Breaking tokens into pieces should behave similar to Parser::bump.
Previously when breaking tokens into smaller pieces, the replace_token
function have been used. It replaced current token and updated span
information, but it did not clear the list of expected tokens, neither
did it update remaining info about last token. This could lead to
incorrect error message, like one described in the issue #24780:

  expected one of ... `>` ...  found `>`
Diffstat (limited to 'src/test')
-rw-r--r--src/test/parse-fail/issue-24780.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/test/parse-fail/issue-24780.rs b/src/test/parse-fail/issue-24780.rs
new file mode 100644
index 00000000000..56b91699478
--- /dev/null
+++ b/src/test/parse-fail/issue-24780.rs
@@ -0,0 +1,20 @@
+// Copyright 2016 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.
+
+// Verify that '>' is not both expected and found at the same time, as it used
+// to happen in #24780. For example, following should be an error:
+// expected one of ..., `>`, ... found `>`
+//
+// compile-flags: -Z parse-only
+
+fn foo() -> Vec<usize>> {
+    //~^ ERROR expected one of `!`, `::`, `where`, or `{`, found `>`
+    Vec::new()
+}