From 446285e45c02f71392c7084328dc167d2e1ff58c Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Thu, 5 Apr 2018 18:12:01 +0100 Subject: [PATCH 1/3] Removed 'proc' from the reserved keywords list --- src/libsyntax_pos/symbol.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 0cba094da641d..7ab4ac9794d9f 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -314,7 +314,6 @@ declare_keywords! { (46, Offsetof, "offsetof") (47, Override, "override") (48, Priv, "priv") - (49, Proc, "proc") (50, Pure, "pure") (51, Sizeof, "sizeof") (52, Typeof, "typeof") From 16e75e356603dac9c01711945790aa08fd7b415e Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Wed, 11 Apr 2018 13:27:43 +0100 Subject: [PATCH 2/3] Reenumerated symbols --- src/libsyntax_pos/symbol.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index ce269e69b8b1c..ff36cb06ec43a 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -318,23 +318,23 @@ declare_keywords! { (46, Offsetof, "offsetof") (47, Override, "override") (48, Priv, "priv") - (50, Pure, "pure") - (51, Sizeof, "sizeof") - (52, Typeof, "typeof") - (53, Unsized, "unsized") - (54, Virtual, "virtual") - (55, Yield, "yield") + (49, Pure, "pure") + (50, Sizeof, "sizeof") + (51, Typeof, "typeof") + (52, Unsized, "unsized") + (53, Virtual, "virtual") + (54, Yield, "yield") // Special lifetime names - (56, UnderscoreLifetime, "'_") - (57, StaticLifetime, "'static") + (55, UnderscoreLifetime, "'_") + (56, StaticLifetime, "'static") // Weak keywords, have special meaning only in specific contexts. - (58, Auto, "auto") - (59, Catch, "catch") - (60, Default, "default") - (61, Dyn, "dyn") - (62, Union, "union") + (57, Auto, "auto") + (58, Catch, "catch") + (59, Default, "default") + (60, Dyn, "dyn") + (61, Union, "union") } // If an interner exists, return it. Otherwise, prepare a fresh one. From 7f58d2ff6621911d25c5e84d32fde53e47494506 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Wed, 11 Apr 2018 15:14:32 +0100 Subject: [PATCH 3/3] Removed proc test --- src/test/parse-fail/obsolete-proc.rs | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/test/parse-fail/obsolete-proc.rs diff --git a/src/test/parse-fail/obsolete-proc.rs b/src/test/parse-fail/obsolete-proc.rs deleted file mode 100644 index 648c46d246cbc..0000000000000 --- a/src/test/parse-fail/obsolete-proc.rs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2014 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. - -// compile-flags: -Z parse-only - -// Test that we generate obsolete syntax errors around usages of `proc`. - -fn foo(p: proc()) { } //~ ERROR expected type, found reserved keyword `proc` - -fn bar() { proc() 1; } //~ ERROR expected expression, found reserved keyword `proc` - -fn main() { }