diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-24 15:00:09 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-28 15:18:53 +1100 |
| commit | a60e337c884f3201e693e6a5111b663bbc54de27 (patch) | |
| tree | 77b4d972c4bff44fba887c5e1bd8f47ad6a71174 /compiler/rustc_passes/src | |
| parent | 1c65264f3cbfb9b6e4b06ff0a89fc706f2d20a85 (diff) | |
| download | rust-a60e337c884f3201e693e6a5111b663bbc54de27.tar.gz rust-a60e337c884f3201e693e6a5111b663bbc54de27.zip | |
Rename `NestedMetaItem::[Ll]iteral` as `NestedMetaItem::[Ll]it`.
We already use a mix of `Literal` and `Lit`. The latter is better because it is shorter without causing any ambiguity.
Diffstat (limited to 'compiler/rustc_passes/src')
| -rw-r--r-- | compiler/rustc_passes/src/check_attr.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index c3794660d5c..2e2874dbccb 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -715,7 +715,7 @@ impl CheckAttrVisitor<'_> { if let Some(values) = meta.meta_item_list() { let mut errors = 0; for v in values { - match v.literal() { + match v.lit() { Some(l) => match l.kind { LitKind::Str(s, _) => { if !self.check_doc_alias_value(v, s, hir_id, target, true, aliases) { @@ -1355,10 +1355,7 @@ impl CheckAttrVisitor<'_> { return false; }; - if matches!( - &list[..], - &[NestedMetaItem::Literal(MetaItemLit { kind: LitKind::Int(..), .. })] - ) { + if matches!(&list[..], &[NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Int(..), .. })]) { true } else { self.tcx.sess.emit_err(errors::RustcLayoutScalarValidRangeArg { attr_span: attr.span }); @@ -1421,7 +1418,7 @@ impl CheckAttrVisitor<'_> { let arg_count = decl.inputs.len() as u128 + generics.params.len() as u128; let mut invalid_args = vec![]; for meta in list { - if let Some(LitKind::Int(val, _)) = meta.literal().map(|lit| &lit.kind) { + if let Some(LitKind::Int(val, _)) = meta.lit().map(|lit| &lit.kind) { if *val >= arg_count { let span = meta.span(); self.tcx.sess.emit_err(errors::RustcLegacyConstGenericsIndexExceed { |
