From cecf83f5926898c86c305c7aff104fcc900a87a2 Mon Sep 17 00:00:00 2001 From: Tomasz Miąsko Date: Sat, 6 Feb 2016 18:42:17 +0100 Subject: 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 `>` --- src/test/parse-fail/issue-24780.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/test/parse-fail/issue-24780.rs (limited to 'src/test/parse-fail') 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 or the MIT license +// , 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> { + //~^ ERROR expected one of `!`, `::`, `where`, or `{`, found `>` + Vec::new() +} -- cgit 1.4.1-3-g733a5