From 20c50444650f90f266ab2a46afd5089b4c01a28c Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Mon, 10 Aug 2020 22:27:48 +0300
Subject: [PATCH 1/2] Introduce `rustc_lexer::is_ident` and use it in couple of
places
---
Cargo.lock | 1 +
src/librustc_attr/Cargo.toml | 1 +
src/librustc_attr/builtin.rs | 12 ++++++++++++
src/librustc_expand/proc_macro_server.rs | 10 +---------
src/librustc_lexer/src/lib.rs | 10 ++++++++++
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 2685de2244e94..0b545a6347be6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3257,6 +3257,7 @@ dependencies = [
"rustc_data_structures",
"rustc_errors",
"rustc_feature",
+ "rustc_lexer",
"rustc_macros",
"rustc_serialize",
"rustc_session",
diff --git a/src/librustc_attr/Cargo.toml b/src/librustc_attr/Cargo.toml
index 496becb8f1b59..35bdf747f08d7 100644
--- a/src/librustc_attr/Cargo.toml
+++ b/src/librustc_attr/Cargo.toml
@@ -16,6 +16,7 @@ rustc_errors = { path = "../librustc_errors" }
rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" }
+rustc_lexer = { path = "../librustc_lexer" }
rustc_macros = { path = "../librustc_macros" }
rustc_session = { path = "../librustc_session" }
rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_attr/builtin.rs b/src/librustc_attr/builtin.rs
index 552584bb4d0b9..5f131fae385b0 100644
--- a/src/librustc_attr/builtin.rs
+++ b/src/librustc_attr/builtin.rs
@@ -20,6 +20,7 @@ enum AttrError {
MultipleItem(String),
UnknownMetaItem(String, &'static [&'static str]),
MissingSince,
+ NonIdentFeature,
MissingFeature,
MultipleStabilityLevels,
UnsupportedLiteral(&'static str, /* is_bytestr */ bool),
@@ -40,6 +41,9 @@ fn handle_errors(sess: &ParseSess, span: Span, error: AttrError) {
AttrError::MissingSince => {
struct_span_err!(diag, span, E0542, "missing 'since'").emit();
}
+ AttrError::NonIdentFeature => {
+ struct_span_err!(diag, span, E0546, "'feature' is not an identifier").emit();
+ }
AttrError::MissingFeature => {
struct_span_err!(diag, span, E0546, "missing 'feature'").emit();
}
@@ -344,6 +348,14 @@ where
match (feature, reason, issue) {
(Some(feature), reason, Some(_)) => {
+ if !rustc_lexer::is_ident(&feature.as_str()) {
+ handle_errors(
+ &sess.parse_sess,
+ attr.span,
+ AttrError::NonIdentFeature,
+ );
+ continue;
+ }
let level = Unstable { reason, issue: issue_num, is_soft };
if sym::unstable == meta_name {
stab = Some(Stability { level, feature });
diff --git a/src/librustc_expand/proc_macro_server.rs b/src/librustc_expand/proc_macro_server.rs
index dc7ba2d0424fc..83a650443bcba 100644
--- a/src/librustc_expand/proc_macro_server.rs
+++ b/src/librustc_expand/proc_macro_server.rs
@@ -319,18 +319,10 @@ pub struct Ident {
}
impl Ident {
- fn is_valid(string: &str) -> bool {
- let mut chars = string.chars();
- if let Some(start) = chars.next() {
- rustc_lexer::is_id_start(start) && chars.all(rustc_lexer::is_id_continue)
- } else {
- false
- }
- }
fn new(sess: &ParseSess, sym: Symbol, is_raw: bool, span: Span) -> Ident {
let sym = nfc_normalize(&sym.as_str());
let string = sym.as_str();
- if !Self::is_valid(&string) {
+ if !rustc_lexer::is_ident(&string) {
panic!("`{:?}` is not a valid identifier", string)
}
if is_raw && !sym.can_be_raw() {
diff --git a/src/librustc_lexer/src/lib.rs b/src/librustc_lexer/src/lib.rs
index 862ffd50d38f6..7949a232b9b35 100644
--- a/src/librustc_lexer/src/lib.rs
+++ b/src/librustc_lexer/src/lib.rs
@@ -274,6 +274,16 @@ pub fn is_id_continue(c: char) -> bool {
|| (c > '\x7f' && unicode_xid::UnicodeXID::is_xid_continue(c))
}
+/// The passed string is lexically an identifier.
+pub fn is_ident(string: &str) -> bool {
+ let mut chars = string.chars();
+ if let Some(start) = chars.next() {
+ is_id_start(start) && chars.all(is_id_continue)
+ } else {
+ false
+ }
+}
+
impl Cursor<'_> {
/// Parses a token from the input string.
fn advance_token(&mut self) -> Token {
From 6bbf4558ac096b6f2cc7cef3920681b8c42e13ef Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Sun, 19 Jul 2020 18:20:01 -0400
Subject: [PATCH 2/2] Feature gate is always present
---
src/librustdoc/clean/mod.rs | 2 +-
src/librustdoc/clean/types.rs | 2 +-
src/librustdoc/html/render/mod.rs | 30 +++++++++++++++---------------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 3afd3671d6ba6..801d06e610169 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -2358,7 +2358,7 @@ impl Clean<Stability> for attr::Stability {
fn clean(&self, _: &DocContext<'_>) -> Stability {
Stability {
level: stability::StabilityLevel::from_attr_level(&self.level),
- feature: Some(self.feature.to_string()).filter(|f| !f.is_empty()),
+ feature: self.feature.to_string(),
since: match self.level {
attr::Stable { ref since } => since.to_string(),
_ => String::new(),
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index 50eca75d7cab2..627f88df45c9f 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -1525,7 +1525,7 @@ pub struct ProcMacro {
#[derive(Clone, Debug)]
pub struct Stability {
pub level: stability::StabilityLevel,
- pub feature: Option<String>,
+ pub feature: String,
pub since: String,
pub unstable_reason: Option<String>,
pub issue: Option<NonZeroU32>,
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 4cbc56333b155..54ad4e8f4ecc4 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -2126,7 +2126,7 @@ fn stability_tags(item: &clean::Item) -> String {
if item
.stability
.as_ref()
- .map(|s| s.level == stability::Unstable && s.feature.as_deref() != Some("rustc_private"))
+ .map(|s| s.level == stability::Unstable && s.feature != "rustc_private")
== Some(true)
{
tags += &tag_html("unstable", "Experimental");
@@ -2177,25 +2177,25 @@ fn short_stability(item: &clean::Item, cx: &Context) -> Vec<String> {
// Render unstable items. But don't render "rustc_private" crates (internal compiler crates).
// Those crates are permanently unstable so it makes no sense to render "unstable" everywhere.
- if let Some(stab) = item.stability.as_ref().filter(|stab| {
- stab.level == stability::Unstable && stab.feature.as_deref() != Some("rustc_private")
- }) {
+ if let Some(stab) = item
+ .stability
+ .as_ref()
+ .filter(|stab| stab.level == stability::Unstable && stab.feature != "rustc_private")
+ {
let mut message =
"<span class='emoji'>🔬</span> This is a nightly-only experimental API.".to_owned();
- if let Some(feature) = stab.feature.as_deref() {
- let mut feature = format!("<code>{}</code>", Escape(&feature));
- if let (Some(url), Some(issue)) = (&cx.shared.issue_tracker_base_url, stab.issue) {
- feature.push_str(&format!(
- " <a href=\"{url}{issue}\">#{issue}</a>",
- url = url,
- issue = issue
- ));
- }
-
- message.push_str(&format!(" ({})", feature));
+ let mut feature = format!("<code>{}</code>", Escape(&stab.feature));
+ if let (Some(url), Some(issue)) = (&cx.shared.issue_tracker_base_url, stab.issue) {
+ feature.push_str(&format!(
+ " <a href=\"{url}{issue}\">#{issue}</a>",
+ url = url,
+ issue = issue
+ ));
}
+ message.push_str(&format!(" ({})", feature));
+
if let Some(unstable_reason) = &stab.unstable_reason {
let mut ids = cx.id_map.borrow_mut();
message = format!(