Use AttrVec
for Arm
, FieldDef
, and Variant
This commit is contained in:
parent
9fef8d91b4
commit
4f8e0ebcc5
7 changed files with 16 additions and 16 deletions
|
@ -1017,7 +1017,7 @@ pub struct Local {
|
||||||
/// ```
|
/// ```
|
||||||
#[derive(Clone, Encodable, Decodable, Debug)]
|
#[derive(Clone, Encodable, Decodable, Debug)]
|
||||||
pub struct Arm {
|
pub struct Arm {
|
||||||
pub attrs: Vec<Attribute>,
|
pub attrs: AttrVec,
|
||||||
/// Match arm pattern, e.g. `10` in `match foo { 10 => {}, _ => {} }`
|
/// Match arm pattern, e.g. `10` in `match foo { 10 => {}, _ => {} }`
|
||||||
pub pat: P<Pat>,
|
pub pat: P<Pat>,
|
||||||
/// Match arm guard, e.g. `n > 10` in `match foo { n if n > 10 => {}, _ => {} }`
|
/// Match arm guard, e.g. `n > 10` in `match foo { n if n > 10 => {}, _ => {} }`
|
||||||
|
@ -2293,7 +2293,7 @@ pub struct EnumDef {
|
||||||
#[derive(Clone, Encodable, Decodable, Debug)]
|
#[derive(Clone, Encodable, Decodable, Debug)]
|
||||||
pub struct Variant {
|
pub struct Variant {
|
||||||
/// Attributes of the variant.
|
/// Attributes of the variant.
|
||||||
pub attrs: Vec<Attribute>,
|
pub attrs: AttrVec,
|
||||||
/// Id of the variant (not the constructor, see `VariantData::ctor_id()`).
|
/// Id of the variant (not the constructor, see `VariantData::ctor_id()`).
|
||||||
pub id: NodeId,
|
pub id: NodeId,
|
||||||
/// Span
|
/// Span
|
||||||
|
@ -2474,7 +2474,7 @@ impl VisibilityKind {
|
||||||
/// E.g., `bar: usize` as in `struct Foo { bar: usize }`.
|
/// E.g., `bar: usize` as in `struct Foo { bar: usize }`.
|
||||||
#[derive(Clone, Encodable, Decodable, Debug)]
|
#[derive(Clone, Encodable, Decodable, Debug)]
|
||||||
pub struct FieldDef {
|
pub struct FieldDef {
|
||||||
pub attrs: Vec<Attribute>,
|
pub attrs: AttrVec,
|
||||||
pub id: NodeId,
|
pub id: NodeId,
|
||||||
pub span: Span,
|
pub span: Span,
|
||||||
pub vis: Visibility,
|
pub vis: Visibility,
|
||||||
|
|
|
@ -420,7 +420,7 @@ pub fn noop_visit_use_tree<T: MutVisitor>(use_tree: &mut UseTree, vis: &mut T) {
|
||||||
|
|
||||||
pub fn noop_flat_map_arm<T: MutVisitor>(mut arm: Arm, vis: &mut T) -> SmallVec<[Arm; 1]> {
|
pub fn noop_flat_map_arm<T: MutVisitor>(mut arm: Arm, vis: &mut T) -> SmallVec<[Arm; 1]> {
|
||||||
let Arm { attrs, pat, guard, body, span, id, is_placeholder: _ } = &mut arm;
|
let Arm { attrs, pat, guard, body, span, id, is_placeholder: _ } = &mut arm;
|
||||||
visit_attrs(attrs, vis);
|
visit_thin_attrs(attrs, vis);
|
||||||
vis.visit_id(id);
|
vis.visit_id(id);
|
||||||
vis.visit_pat(pat);
|
vis.visit_pat(pat);
|
||||||
visit_opt(guard, |guard| vis.visit_expr(guard));
|
visit_opt(guard, |guard| vis.visit_expr(guard));
|
||||||
|
@ -504,7 +504,7 @@ pub fn noop_flat_map_variant<T: MutVisitor>(
|
||||||
let Variant { ident, vis, attrs, id, data, disr_expr, span, is_placeholder: _ } = &mut variant;
|
let Variant { ident, vis, attrs, id, data, disr_expr, span, is_placeholder: _ } = &mut variant;
|
||||||
visitor.visit_ident(ident);
|
visitor.visit_ident(ident);
|
||||||
visitor.visit_vis(vis);
|
visitor.visit_vis(vis);
|
||||||
visit_attrs(attrs, visitor);
|
visit_thin_attrs(attrs, visitor);
|
||||||
visitor.visit_id(id);
|
visitor.visit_id(id);
|
||||||
visitor.visit_variant_data(data);
|
visitor.visit_variant_data(data);
|
||||||
visit_opt(disr_expr, |disr_expr| visitor.visit_anon_const(disr_expr));
|
visit_opt(disr_expr, |disr_expr| visitor.visit_anon_const(disr_expr));
|
||||||
|
@ -918,7 +918,7 @@ pub fn noop_flat_map_field_def<T: MutVisitor>(
|
||||||
visitor.visit_vis(vis);
|
visitor.visit_vis(vis);
|
||||||
visitor.visit_id(id);
|
visitor.visit_id(id);
|
||||||
visitor.visit_ty(ty);
|
visitor.visit_ty(ty);
|
||||||
visit_attrs(attrs, visitor);
|
visit_thin_attrs(attrs, visitor);
|
||||||
smallvec![fd]
|
smallvec![fd]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ fn test_variant_to_string() {
|
||||||
kind: ast::VisibilityKind::Inherited,
|
kind: ast::VisibilityKind::Inherited,
|
||||||
tokens: None,
|
tokens: None,
|
||||||
},
|
},
|
||||||
attrs: Vec::new(),
|
attrs: ast::AttrVec::new(),
|
||||||
id: ast::DUMMY_NODE_ID,
|
id: ast::DUMMY_NODE_ID,
|
||||||
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),
|
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),
|
||||||
disr_expr: None,
|
disr_expr: None,
|
||||||
|
|
|
@ -432,7 +432,7 @@ impl<'a> ExtCtxt<'a> {
|
||||||
|
|
||||||
pub fn arm(&self, span: Span, pat: P<ast::Pat>, expr: P<ast::Expr>) -> ast::Arm {
|
pub fn arm(&self, span: Span, pat: P<ast::Pat>, expr: P<ast::Expr>) -> ast::Arm {
|
||||||
ast::Arm {
|
ast::Arm {
|
||||||
attrs: vec![],
|
attrs: AttrVec::new(),
|
||||||
pat,
|
pat,
|
||||||
guard: None,
|
guard: None,
|
||||||
body: expr,
|
body: expr,
|
||||||
|
|
|
@ -2116,7 +2116,7 @@ impl<'a> Parser<'a> {
|
||||||
let span = body.span;
|
let span = body.span;
|
||||||
return Ok((
|
return Ok((
|
||||||
ast::Arm {
|
ast::Arm {
|
||||||
attrs,
|
attrs: attrs.into(),
|
||||||
pat,
|
pat,
|
||||||
guard,
|
guard,
|
||||||
body,
|
body,
|
||||||
|
@ -2170,7 +2170,7 @@ impl<'a> Parser<'a> {
|
||||||
|
|
||||||
Ok((
|
Ok((
|
||||||
ast::Arm {
|
ast::Arm {
|
||||||
attrs,
|
attrs: attrs.into(),
|
||||||
pat,
|
pat,
|
||||||
guard,
|
guard,
|
||||||
body: expr,
|
body: expr,
|
||||||
|
|
|
@ -1143,7 +1143,7 @@ impl<'a> Parser<'a> {
|
||||||
ident,
|
ident,
|
||||||
vis,
|
vis,
|
||||||
id: DUMMY_NODE_ID,
|
id: DUMMY_NODE_ID,
|
||||||
attrs: variant_attrs,
|
attrs: variant_attrs.into(),
|
||||||
data: struct_def,
|
data: struct_def,
|
||||||
disr_expr,
|
disr_expr,
|
||||||
span: vlo.to(this.prev_token.span),
|
span: vlo.to(this.prev_token.span),
|
||||||
|
@ -1286,7 +1286,7 @@ impl<'a> Parser<'a> {
|
||||||
ident: None,
|
ident: None,
|
||||||
id: DUMMY_NODE_ID,
|
id: DUMMY_NODE_ID,
|
||||||
ty,
|
ty,
|
||||||
attrs,
|
attrs: attrs.into(),
|
||||||
is_placeholder: false,
|
is_placeholder: false,
|
||||||
},
|
},
|
||||||
TrailingToken::MaybeComma,
|
TrailingToken::MaybeComma,
|
||||||
|
@ -1460,7 +1460,7 @@ impl<'a> Parser<'a> {
|
||||||
vis,
|
vis,
|
||||||
id: DUMMY_NODE_ID,
|
id: DUMMY_NODE_ID,
|
||||||
ty,
|
ty,
|
||||||
attrs,
|
attrs: attrs.into(),
|
||||||
is_placeholder: false,
|
is_placeholder: false,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use std::iter::ExactSizeIterator;
|
use std::iter::ExactSizeIterator;
|
||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
|
|
||||||
use rustc_ast::ast::{self, FnRetTy, Mutability};
|
use rustc_ast::ast::{self, AttrVec, FnRetTy, Mutability};
|
||||||
use rustc_span::{symbol::kw, symbol::Ident, BytePos, Pos, Span};
|
use rustc_span::{symbol::kw, symbol::Ident, BytePos, Pos, Span};
|
||||||
|
|
||||||
use crate::config::lists::*;
|
use crate::config::lists::*;
|
||||||
|
@ -776,7 +776,7 @@ impl Rewrite for ast::Ty {
|
||||||
);
|
);
|
||||||
let data = ast::VariantData::Struct(fields.clone(), recovered);
|
let data = ast::VariantData::Struct(fields.clone(), recovered);
|
||||||
let variant = ast::Variant {
|
let variant = ast::Variant {
|
||||||
attrs: vec![],
|
attrs: AttrVec::new(),
|
||||||
id: self.id,
|
id: self.id,
|
||||||
span: self.span,
|
span: self.span,
|
||||||
vis: DEFAULT_VISIBILITY,
|
vis: DEFAULT_VISIBILITY,
|
||||||
|
@ -800,7 +800,7 @@ impl Rewrite for ast::Ty {
|
||||||
);
|
);
|
||||||
let data = ast::VariantData::Struct(fields.clone(), recovered);
|
let data = ast::VariantData::Struct(fields.clone(), recovered);
|
||||||
let variant = ast::Variant {
|
let variant = ast::Variant {
|
||||||
attrs: vec![],
|
attrs: AttrVec::new(),
|
||||||
id: self.id,
|
id: self.id,
|
||||||
span: self.span,
|
span: self.span,
|
||||||
vis: DEFAULT_VISIBILITY,
|
vis: DEFAULT_VISIBILITY,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue