Skip to content

Commit 88acdb5

Browse files
borsbors
committed
Auto merge of #59259 - petrochenkov:bderval, r=estebank
[beta] Do not accidentally treat multi-segment meta-items as single-segment Partial backport of #58899 to beta
2 parents d049c7b + f8b17c5 commit 88acdb5

File tree

32 files changed

+403
-296
lines changed

32 files changed

+403
-296
lines changed

‎src/librustc/hir/check_attr.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
166166
// ```
167167
let hints: Vec<_> = item.attrs
168168
.iter()
169-
.filter(|attr| attr.name() == "repr")
169+
.filter(|attr| attr.check_name("repr"))
170170
.filter_map(|attr| attr.meta_item_list())
171171
.flatten()
172172
.collect();
@@ -177,15 +177,15 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
177177
let mut is_transparent = false;
178178

179179
for hint in &hints {
180-
let name = if let Some(name) = hint.name() {
180+
let name = if let Some(name) = hint.ident_str() {
181181
name
182182
} else {
183183
// Invalid repr hint like repr(42). We don't check for unrecognized hints here
184184
// (libsyntax does that), so just ignore it.
185185
continue;
186186
};
187187

188-
let (article, allowed_targets) = match &*name.as_str() {
188+
let (article, allowed_targets) = match name {
189189
"C" | "align" => {
190190
is_c |= name == "C";
191191
if target != Target::Struct &&
@@ -313,7 +313,7 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
313313

314314
fn check_used(&self, item: &hir::Item, target: Target) {
315315
for attr in &item.attrs {
316-
if attr.name() == "used" && target != Target::Static {
316+
if attr.check_name("used") && target != Target::Static {
317317
self.tcx.sess
318318
.span_err(attr.span, "attribute must be applied to a `static` variable");
319319
}

‎src/librustc/ich/impls_syntax.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ impl<'a> HashStable<StableHashingContext<'a>> for [ast::Attribute] {
197197
let filtered: SmallVec<[&ast::Attribute; 8]> = self
198198
.iter()
199199
.filter(|attr| {
200-
!attr.is_sugared_doc && !hcx.is_ignored_attr(attr.name())
200+
!attr.is_sugared_doc &&
201+
!attr.ident().map_or(false, |ident| hcx.is_ignored_attr(ident.name))
201202
})
202203
.collect();
203204

@@ -224,7 +225,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for ast::Attribute {
224225
hcx: &mut StableHashingContext<'a>,
225226
hasher: &mut StableHasher<W>) {
226227
// Make sure that these have been filtered out.
227-
debug_assert!(!hcx.is_ignored_attr(self.name()));
228+
debug_assert!(!self.ident().map_or(false, |ident| hcx.is_ignored_attr(ident.name)));
228229
debug_assert!(!self.is_sugared_doc);
229230

230231
let ast::Attribute {

‎src/librustc/lint/levels.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl<'a> LintLevelsBuilder<'a> {
193193
struct_span_err!(sess, span, E0452, "malformed lint attribute")
194194
};
195195
for attr in attrs {
196-
let level = match Level::from_str(&attr.name().as_str()) {
196+
let level = match attr.ident_str().and_then(|name| Level::from_str(name)) {
197197
None => continue,
198198
Some(lvl) => lvl,
199199
};
@@ -254,9 +254,9 @@ impl<'a> LintLevelsBuilder<'a> {
254254
}
255255

256256
for li in metas {
257-
let word = match li.word() {
258-
Some(word) => word,
259-
None => {
257+
let meta_item = match li.meta_item() {
258+
Some(meta_item) if meta_item.is_word() => meta_item,
259+
_ => {
260260
let mut err = bad_attr(li.span);
261261
if let Some(item) = li.meta_item() {
262262
if let ast::MetaItemKind::NameValue(_) = item.node {
@@ -269,23 +269,24 @@ impl<'a> LintLevelsBuilder<'a> {
269269
continue;
270270
}
271271
};
272-
let tool_name = if let Some(lint_tool) = word.is_scoped() {
273-
if !attr::is_known_lint_tool(lint_tool) {
272+
let tool_name = if meta_item.ident.segments.len() > 1 {
273+
let tool_ident = meta_item.ident.segments[0].ident;
274+
if !attr::is_known_lint_tool(tool_ident) {
274275
span_err!(
275276
sess,
276-
lint_tool.span,
277+
tool_ident.span,
277278
E0710,
278279
"an unknown tool name found in scoped lint: `{}`",
279-
word.ident
280+
meta_item.ident
280281
);
281282
continue;
282283
}
283284

284-
Some(lint_tool.as_str())
285+
Some(tool_ident.as_str())
285286
} else {
286287
None
287288
};
288-
let name = word.name();
289+
let name = meta_item.ident.segments.last().expect("empty lint name").ident.name;
289290
match store.check_lint_name(&name.as_str(), tool_name) {
290291
CheckLintNameResult::Ok(ids) => {
291292
let src = LintSource::Node(name, li.span, reason);

‎src/librustc/middle/lib_features.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ impl<'a, 'tcx> LibFeatureCollector<'a, 'tcx> {
6363
for meta in metas {
6464
if let Some(mi) = meta.meta_item() {
6565
// Find the `feature = ".."` meta-item.
66-
match (&*mi.name().as_str(), mi.value_str()) {
67-
("feature", val) => feature = val,
68-
("since", val) => since = val,
66+
match (mi.ident_str(), mi.value_str()) {
67+
(Some("feature"), val) => feature = val,
68+
(Some("since"), val) => since = val,
6969
_ => {}
7070
}
7171
}

‎src/librustc/middle/stability.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,12 @@ impl<'a, 'tcx: 'a> Annotator<'a, 'tcx> {
197197
} else {
198198
// Emit errors for non-staged-api crates.
199199
for attr in attrs {
200-
let tag = attr.name();
201-
if tag == "unstable" || tag == "stable" || tag == "rustc_deprecated" {
202-
attr::mark_used(attr);
203-
self.tcx.sess.span_err(attr.span(), "stability attributes may not be used \
204-
outside of the standard library");
200+
if let Some(tag) = attr.ident_str() {
201+
if tag == "unstable" || tag == "stable" || tag == "rustc_deprecated" {
202+
attr::mark_used(attr);
203+
self.tcx.sess.span_err(attr.span, "stability attributes may not be used \
204+
outside of the standard library");
205+
}
205206
}
206207
}
207208

‎src/librustc/session/config.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,8 @@ pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> ast::CrateConfig {
18101810
error!("argument value must be a string");
18111811
}
18121812
MetaItemKind::NameValue(..) | MetaItemKind::Word => {
1813-
return (meta_item.name(), meta_item.value_str());
1813+
let ident = meta_item.ident().expect("multi-segment cfg key");
1814+
return (ident.name, meta_item.value_str());
18141815
}
18151816
}
18161817
}

‎src/librustc/traits/on_unimplemented.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,12 @@ impl<'a, 'gcx, 'tcx> OnUnimplementedDirective {
177177
for command in self.subcommands.iter().chain(Some(self)).rev() {
178178
if let Some(ref condition) = command.condition {
179179
if !attr::eval_condition(condition, &tcx.sess.parse_sess, &mut |c| {
180-
options.contains(&(
181-
c.name().as_str().to_string(),
182-
c.value_str().map(|s| s.as_str().to_string())
183-
))
180+
c.ident_str().map_or(false, |name| {
181+
options.contains(&(
182+
name.to_string(),
183+
c.value_str().map(|s| s.as_str().to_string())
184+
))
185+
})
184186
}) {
185187
debug!("evaluate: skipping {:?} due to condition", command);
186188
continue

‎src/librustc_incremental/assert_dep_graph.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ impl<'a, 'tcx> IfThisChanged<'a, 'tcx> {
9999
fn argument(&self, attr: &ast::Attribute) -> Option<ast::Name> {
100100
let mut value = None;
101101
for list_item in attr.meta_item_list().unwrap_or_default() {
102-
match list_item.word() {
103-
Some(word) if value.is_none() =>
104-
value = Some(word.name()),
102+
match list_item.ident() {
103+
Some(ident) if list_item.is_word() && value.is_none() =>
104+
value = Some(ident.name),
105105
_ =>
106106
// FIXME better-encapsulate meta_item (don't directly access `node`)
107107
span_bug!(list_item.span(), "unexpected meta-item {:?}", list_item.node),

‎src/librustc_incremental/persist/dirty_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ fn expect_associated_value(tcx: TyCtxt<'_, '_, '_>, item: &NestedMetaItem) -> as
576576
if let Some(value) = item.value_str() {
577577
value
578578
} else {
579-
let msg = if let Some(name) = item.name() {
579+
let msg = if let Some(name) = item.ident_str() {
580580
format!("associated value expected for `{}`", name)
581581
} else {
582582
"expected an associated value".to_string()

‎src/librustc_lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ impl LintPass for DeprecatedAttr {
757757
impl EarlyLintPass for DeprecatedAttr {
758758
fn check_attribute(&mut self, cx: &EarlyContext<'_>, attr: &ast::Attribute) {
759759
for &&(n, _, _, ref g) in &self.depr_attrs {
760-
if attr.name() == n {
760+
if attr.ident_str() == Some(n) {
761761
if let &AttributeGate::Gated(Stability::Deprecated(link, suggestion),
762762
ref name,
763763
ref reason,

‎src/librustc_lint/unused.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -265,19 +265,21 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedAttributes {
265265
}
266266
}
267267

268-
let name = attr.name();
268+
let name = attr.ident_str();
269269
if !attr::is_used(attr) {
270270
debug!("Emitting warning for: {:?}", attr);
271271
cx.span_lint(UNUSED_ATTRIBUTES, attr.span, "unused attribute");
272272
// Is it a builtin attribute that must be used at the crate level?
273273
let known_crate = BUILTIN_ATTRIBUTES.iter()
274-
.find(|&&(builtin, ty, ..)| name == builtin && ty == AttributeType::CrateLevel)
274+
.find(|&&(builtin, ty, ..)| {
275+
name == Some(builtin) && ty == AttributeType::CrateLevel
276+
})
275277
.is_some();
276278

277279
// Has a plugin registered this attribute as one that must be used at
278280
// the crate level?
279281
let plugin_crate = plugin_attributes.iter()
280-
.find(|&&(ref x, t)| name == &**x && AttributeType::CrateLevel == t)
282+
.find(|&&(ref x, t)| name == Some(x) && AttributeType::CrateLevel == t)
281283
.is_some();
282284
if known_crate || plugin_crate {
283285
let msg = match attr.style {

‎src/librustc_passes/layout_test.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ impl<'a, 'tcx> VarianceTest<'a, 'tcx> {
5353
// The `..` are the names of fields to dump.
5454
let meta_items = attr.meta_item_list().unwrap_or_default();
5555
for meta_item in meta_items {
56-
let name = meta_item.word().map(|mi| mi.name().as_str());
57-
let name = name.as_ref().map(|s| &s[..]).unwrap_or("");
58-
56+
let name = meta_item.ident_str().unwrap_or("");
5957
match name {
6058
"abi" => {
6159
self.tcx

‎src/librustc_plugin/load.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ pub fn load_plugins(sess: &Session,
5656

5757
for plugin in plugins {
5858
// plugins must have a name and can't be key = value
59-
match plugin.name() {
59+
match plugin.ident_str() {
6060
Some(name) if !plugin.is_value_str() => {
6161
let args = plugin.meta_item_list().map(ToOwned::to_owned);
62-
loader.load_plugin(plugin.span, &name.as_str(), args.unwrap_or_default());
62+
loader.load_plugin(plugin.span, name, args.unwrap_or_default());
6363
},
6464
_ => call_malformed_plugin_attribute(sess, attr.span),
6565
}

‎src/librustc_resolve/build_reduced_graph.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,9 @@ impl<'a> Resolver<'a> {
466466
if let Some(attr) = attr::find_by_name(&item.attrs, "proc_macro_derive") {
467467
if let Some(trait_attr) =
468468
attr.meta_item_list().and_then(|list| list.get(0).cloned()) {
469-
if let Some(ident) = trait_attr.name().map(Ident::with_empty_ctxt) {
470-
let sp = trait_attr.span;
469+
if let Some(ident) = trait_attr.ident() {
471470
let def = Def::Macro(def.def_id(), MacroKind::ProcMacroStub);
472-
self.define(parent, ident, MacroNS, (def, vis, sp, expansion));
471+
self.define(parent, ident, MacroNS, (def, vis, ident.span, expansion));
473472
}
474473
}
475474
}
@@ -811,9 +810,9 @@ impl<'a> Resolver<'a> {
811810
break;
812811
}
813812
MetaItemKind::List(nested_metas) => for nested_meta in nested_metas {
814-
match nested_meta.word() {
815-
Some(word) => single_imports.push((word.name(), word.span)),
816-
None => ill_formed(nested_meta.span),
813+
match nested_meta.ident() {
814+
Some(ident) if nested_meta.is_word() => single_imports.push(ident),
815+
_ => ill_formed(nested_meta.span),
817816
}
818817
}
819818
MetaItemKind::NameValue(..) => ill_formed(meta.span),
@@ -849,23 +848,23 @@ impl<'a> Resolver<'a> {
849848
self.legacy_import_macro(ident.name, imported_binding, span, allow_shadowing);
850849
});
851850
} else {
852-
for (name, span) in single_imports.iter().cloned() {
853-
let ident = Ident::with_empty_ctxt(name);
851+
for ident in single_imports.iter().cloned() {
854852
let result = self.resolve_ident_in_module(
855853
ModuleOrUniformRoot::Module(module),
856854
ident,
857855
MacroNS,
858856
None,
859857
false,
860-
span,
858+
ident.span,
861859
);
862860
if let Ok(binding) = result {
863-
let directive = macro_use_directive(span);
861+
let directive = macro_use_directive(ident.span);
864862
self.potentially_unused_imports.push(directive);
865863
let imported_binding = self.import(binding, directive);
866-
self.legacy_import_macro(name, imported_binding, span, allow_shadowing);
864+
self.legacy_import_macro(ident.name, imported_binding,
865+
ident.span, allow_shadowing);
867866
} else {
868-
span_err!(self.session, span, E0469, "imported macro not found");
867+
span_err!(self.session, ident.span, E0469, "imported macro not found");
869868
}
870869
}
871870
}

‎src/librustdoc/clean/cfg.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,13 @@ impl Cfg {
5858
/// If the content is not properly formatted, it will return an error indicating what and where
5959
/// the error is.
6060
pub fn parse(cfg: &MetaItem) -> Result<Cfg, InvalidCfgError> {
61-
let name = cfg.name();
61+
let name = match cfg.ident() {
62+
Some(ident) => ident.name,
63+
None => return Err(InvalidCfgError {
64+
msg: "expected a single identifier",
65+
span: cfg.span
66+
}),
67+
};
6268
match cfg.node {
6369
MetaItemKind::Word => Ok(Cfg::Cfg(name, None)),
6470
MetaItemKind::NameValue(ref lit) => match lit.node {

‎src/librustdoc/clean/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ impl Item {
491491

492492
pub fn is_non_exhaustive(&self) -> bool {
493493
self.attrs.other_attrs.iter()
494-
.any(|a| a.name().as_str() == "non_exhaustive")
494+
.any(|a| a.check_name("non_exhaustive"))
495495
}
496496

497497
/// Returns a documentation-level item type from the item.
@@ -3665,7 +3665,7 @@ impl Clean<Vec<Item>> for doctree::ExternCrate {
36653665
fn clean(&self, cx: &DocContext<'_, '_, '_>) -> Vec<Item> {
36663666

36673667
let please_inline = self.vis.node.is_pub() && self.attrs.iter().any(|a| {
3668-
a.name() == "doc" && match a.meta_item_list() {
3668+
a.check_name("doc") && match a.meta_item_list() {
36693669
Some(l) => attr::list_contains_name(&l, "inline"),
36703670
None => false,
36713671
}
@@ -3704,7 +3704,7 @@ impl Clean<Vec<Item>> for doctree::Import {
37043704
// #[doc(no_inline)] attribute is present.
37053705
// Don't inline doc(hidden) imports so they can be stripped at a later stage.
37063706
let mut denied = !self.vis.node.is_pub() || self.attrs.iter().any(|a| {
3707-
a.name() == "doc" && match a.meta_item_list() {
3707+
a.check_name("doc") && match a.meta_item_list() {
37083708
Some(l) => attr::list_contains_name(&l, "no_inline") ||
37093709
attr::list_contains_name(&l, "hidden"),
37103710
None => false,

‎src/librustdoc/core.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,7 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
567567
for attr in krate.module.as_ref().unwrap().attrs.lists("doc") {
568568
let diag = ctxt.sess().diagnostic();
569569

570-
let name = attr.name().map(|s| s.as_str());
571-
let name = name.as_ref().map(|s| &s[..]);
570+
let name = attr.ident_str();
572571
if attr.is_word() {
573572
if name == Some("no_default_passes") {
574573
report_deprecated_attr("no_default_passes", diag);

‎src/librustdoc/html/render.rs

+6-8
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,7 @@ pub fn run(mut krate: clean::Crate,
562562
// going to emit HTML
563563
if let Some(attrs) = krate.module.as_ref().map(|m| &m.attrs) {
564564
for attr in attrs.lists("doc") {
565-
let name = attr.name().map(|s| s.as_str());
566-
match (name.as_ref().map(|s| &s[..]), attr.value_str()) {
565+
match (attr.ident_str(), attr.value_str()) {
567566
(Some("html_favicon_url"), Some(s)) => {
568567
scx.layout.favicon = s.to_string();
569568
}
@@ -3718,19 +3717,19 @@ fn item_enum(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
37183717
}
37193718

37203719
fn render_attribute(attr: &ast::MetaItem) -> Option<String> {
3721-
let name = attr.name();
3720+
let path = attr.ident.to_string();
37223721

37233722
if attr.is_word() {
3724-
Some(name.to_string())
3723+
Some(path)
37253724
} else if let Some(v) = attr.value_str() {
3726-
Some(format!("{} = {:?}", name, v.as_str()))
3725+
Some(format!("{} = {:?}", path, v.as_str()))
37273726
} else if let Some(values) = attr.meta_item_list() {
37283727
let display: Vec<_> = values.iter().filter_map(|attr| {
37293728
attr.meta_item().and_then(|mi| render_attribute(mi))
37303729
}).collect();
37313730

37323731
if display.len() > 0 {
3733-
Some(format!("{}({})", name, display.join(", ")))
3732+
Some(format!("{}({})", path, display.join(", ")))
37343733
} else {
37353734
None
37363735
}
@@ -3754,8 +3753,7 @@ fn render_attributes(w: &mut fmt::Formatter<'_>, it: &clean::Item) -> fmt::Resul
37543753
let mut attrs = String::new();
37553754

37563755
for attr in &it.attrs.other_attrs {
3757-
let name = attr.name();
3758-
if !ATTRIBUTE_WHITELIST.contains(&&*name.as_str()) {
3756+
if !attr.ident_str().map_or(false, |name| ATTRIBUTE_WHITELIST.contains(&name)) {
37593757
continue;
37603758
}
37613759
if let Some(s) = render_attribute(&attr.meta().unwrap()) {

0 commit comments

Comments
 (0)