Skip to content

Commit 8d4655d

Browse files
committed
Rename NestedMetaItem::name_value_literal.
It's a highly misleading name, because it's completely different to `MetaItem::name_value_literal`. Specifically, it doesn't match `MetaItemKind::NameValue` (e.g. `#[foo = 3]`), it matches `MetaItemKind::List` (e.g. `#[foo(3)]`).
1 parent d5ec9b4 commit 8d4655d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

compiler/rustc_ast/src/attr/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,9 @@ impl NestedMetaItem {
464464
self.meta_item().and_then(|meta_item| meta_item.meta_item_list())
465465
}
466466

467-
/// Returns a name and single literal value tuple of the `MetaItem`.
468-
pub fn name_value_literal(&self) -> Option<(Symbol, &MetaItemLit)> {
467+
/// If it's a singleton list of the form `foo(lit)`, returns the `foo` and
468+
/// the `lit`.
469+
pub fn singleton_lit_list(&self) -> Option<(Symbol, &MetaItemLit)> {
469470
self.meta_item().and_then(|meta_item| {
470471
meta_item.meta_item_list().and_then(|meta_item_list| {
471472
if meta_item_list.len() == 1

compiler/rustc_attr/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
986986
recognised = true;
987987
acc.push(h);
988988
}
989-
} else if let Some((name, value)) = item.name_value_literal() {
989+
} else if let Some((name, value)) = item.singleton_lit_list() {
990990
let mut literal_error = None;
991991
let mut err_span = item.span();
992992
if name == sym::align {

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
435435
sym::repr => {
436436
codegen_fn_attrs.alignment = if let Some(items) = attr.meta_item_list()
437437
&& let [item] = items.as_slice()
438-
&& let Some((sym::align, literal)) = item.name_value_literal()
438+
&& let Some((sym::align, literal)) = item.singleton_lit_list()
439439
{
440440
rustc_attr::parse_alignment(&literal.kind)
441441
.map_err(|msg| {

0 commit comments

Comments
 (0)