about summary refs log tree commit diff
path: root/src/libsyntax/parse/diagnostics.rs
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-05-13 22:46:20 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-05-22 20:20:12 +0300
commita1885cdba38a63448ceec02f951ddc0844d0ff38 (patch)
tree8c45eb2a7169a49b8a6e66fc3193c8d99ffc7632 /src/libsyntax/parse/diagnostics.rs
parentc389a39c9728d5c912a9ce1bc4c04eb1a3f31fe8 (diff)
downloadrust-a1885cdba38a63448ceec02f951ddc0844d0ff38.tar.gz
rust-a1885cdba38a63448ceec02f951ddc0844d0ff38.zip
Restore the old behavior of the rustdoc keyword check + Fix rebase
Diffstat (limited to 'src/libsyntax/parse/diagnostics.rs')
-rw-r--r--src/libsyntax/parse/diagnostics.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/diagnostics.rs b/src/libsyntax/parse/diagnostics.rs
index 1a2393be806..d48fcbbd672 100644
--- a/src/libsyntax/parse/diagnostics.rs
+++ b/src/libsyntax/parse/diagnostics.rs
@@ -6,7 +6,7 @@ use crate::parse::PResult;
 use crate::parse::Parser;
 use crate::print::pprust;
 use crate::ptr::P;
-use crate::symbol::keywords;
+use crate::symbol::kw;
 use crate::ThinVec;
 use errors::{Applicability, DiagnosticBuilder};
 use syntax_pos::Span;
@@ -405,7 +405,7 @@ impl<'a> Parser<'a> {
 
     /// Recover from `pub` keyword in places where it seems _reasonable_ but isn't valid.
     crate fn eat_bad_pub(&mut self) {
-        if self.token.is_keyword(keywords::Pub) {
+        if self.token.is_keyword(kw::Pub) {
             match self.parse_visibility(false) {
                 Ok(vis) => {
                     self.diagnostic()