user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore the old behavior of the rustdoc keyword check + Fix rebase

Browse source
This commit is contained in:
Vadim Petrochenkov 2019-05-13 22:46:20 +03:00
parent c389a39c97
commit a1885cdba3
13 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustdoc/html/highlight.rs
View file

@ -15,6 +15,7 @@ use syntax::source_map::{SourceMap, FilePathMapping};
use syntax::parse::lexer::{self, TokenAndSpan};
use syntax::parse::token;
use syntax::parse;
use syntax::symbol::{kw, sym};
use syntax_pos::{Span, FileName};
/// Highlights `src`, returning the HTML output.
@ -325,16 +326,15 @@ impl<'a> Classifier<'a> {
// Keywords are also included in the identifier set.
token::Ident(ident, is_raw) => {
match &*ident.as_str() {
"ref" | "mut" if !is_raw => Class::RefKeyWord,
match ident.name {
kw::Ref | kw::Mut if !is_raw => Class::RefKeyWord,
"self" | "Self" => Class::Self_,
"false" | "true" if !is_raw => Class::Bool,
kw::SelfLower | kw::SelfUpper => Class::Self_,
kw::False | kw::True if !is_raw => Class::Bool,
"Option" | "Result" => Class::PreludeTy,
"Some" | "None" | "Ok" | "Err" => Class::PreludeVal,
sym::Option | sym::Result => Class::PreludeTy,
sym::Some | sym::None | sym::Ok | sym::Err => Class::PreludeVal,
"$crate" => Class::KeyWord,
_ if tas.tok.is_reserved_ident() => Class::KeyWord,
_ => {

2
src/librustdoc/html/layout.rs
View file

@ -44,7 +44,7 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\
<meta name=\"generator\" content=\"rustdoc\">\
<meta name=\"description\" content=\"{description}\">\
<meta name=\"keywords\" content=\"{kw}\">\
<meta name=\"keywords\" content=\"{keywords}\">\
<title>{title}</title>\
<link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}normalize{suffix}.css\">\
<link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}rustdoc{suffix}.css\" \