bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add genness to FnHeader

Browse source
This commit is contained in:
Eric Holk 2023-11-28 10:15:39 -08:00
parent e281163dc8
commit bc0d10d4b0
No known key found for this signature in database
GPG key ID: 8EA6B43ED4CE0911
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_ast/src/ast.rs
View file

@ -2837,16 +2837,19 @@ pub struct FnHeader {
pub constness: Const,
/// The `extern` keyword and corresponding ABI string, if any
pub ext: Extern,
/// The `gen` keyword, if any
pub genness: Gen,
}
impl FnHeader {
/// Does this function header have any qualifiers or is it empty?
pub fn has_qualifiers(&self) -> bool {
let Self { unsafety, asyncness, constness, ext } = self;
let Self { unsafety, asyncness, constness, ext, genness } = self;
matches!(unsafety, Unsafe::Yes(_))
|| asyncness.is_async()
|| matches!(constness, Const::Yes(_))
|| !matches!(ext, Extern::None)
|| matches!(genness, Gen::Yes { .. })
}
}
@ -2857,6 +2860,7 @@ impl Default for FnHeader {
asyncness: Async::No,
constness: Const::No,
ext: Extern::None,
genness: Gen::No,
}
}
}
@ -3177,7 +3181,7 @@ mod size_asserts {
static_assert_size!(Block, 32);
static_assert_size!(Expr, 72);
static_assert_size!(ExprKind, 40);
static_assert_size!(Fn, 152);
static_assert_size!(Fn, 168);
static_assert_size!(ForeignItem, 96);
static_assert_size!(ForeignItemKind, 24);
static_assert_size!(GenericArg, 24);

17
compiler/rustc_ast/src/mut_visit.rs
View file

@ -125,6 +125,10 @@ pub trait MutVisitor: Sized {
noop_visit_asyncness(a, self);
}
fn visit_genness(&mut self, a: &mut Gen) {
noop_visit_genness(a, self);
}
fn visit_closure_binder(&mut self, b: &mut ClosureBinder) {
noop_visit_closure_binder(b, self);
}
@ -881,6 +885,16 @@ pub fn noop_visit_asyncness<T: MutVisitor>(asyncness: &mut Async, vis: &mut T) {
}
}
pub fn noop_visit_genness<T: MutVisitor>(genness: &mut Gen, vis: &mut T) {
match genness {
Gen::Yes { span: _, closure_id, return_impl_trait_id } => {
vis.visit_id(closure_id);
vis.visit_id(return_impl_trait_id);
}
Gen::No => {}
}
}
pub fn noop_visit_fn_decl<T: MutVisitor>(decl: &mut P<FnDecl>, vis: &mut T) {
let FnDecl { inputs, output } = decl.deref_mut();
inputs.flat_map_in_place(|param| vis.flat_map_param(param));
@ -1170,9 +1184,10 @@ fn visit_const_item<T: MutVisitor>(
}
pub fn noop_visit_fn_header<T: MutVisitor>(header: &mut FnHeader, vis: &mut T) {
let FnHeader { unsafety, asyncness, constness, ext: _ } = header;
let FnHeader { unsafety, asyncness, constness, ext: _, genness } = header;
visit_constness(constness, vis);
vis.visit_asyncness(asyncness);
vis.visit_genness(genness);
visit_unsafety(unsafety, vis);
}