From 790bb15408536d38856e8ffcc76069baf3269b91 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Sun, 22 Sep 2024 16:01:23 -0700 Subject: [PATCH] remove reset_default from proc-macro, forgot to remove when removing from RegBuilder --- crates/fayalite-proc-macros-impl/src/lib.rs | 1 - .../src/module/transform_body.rs | 36 ++----------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/crates/fayalite-proc-macros-impl/src/lib.rs b/crates/fayalite-proc-macros-impl/src/lib.rs index 903983f..194dbf3 100644 --- a/crates/fayalite-proc-macros-impl/src/lib.rs +++ b/crates/fayalite-proc-macros-impl/src/lib.rs @@ -78,7 +78,6 @@ mod kw { custom_keyword!(output); custom_keyword!(reg_builder); custom_keyword!(reset); - custom_keyword!(reset_default); custom_keyword!(skip); custom_keyword!(target); custom_keyword!(wire); diff --git a/crates/fayalite-proc-macros-impl/src/module/transform_body.rs b/crates/fayalite-proc-macros-impl/src/module/transform_body.rs index 1f9565a..6e99e87 100644 --- a/crates/fayalite-proc-macros-impl/src/module/transform_body.rs +++ b/crates/fayalite-proc-macros-impl/src/module/transform_body.rs @@ -265,11 +265,6 @@ pub(crate) enum RegBuilderReset { paren: Paren, init_expr: Box, }, - ResetDefault { - dot_token: Token![.], - reset_default: kw::reset_default, - paren: Paren, - }, } impl_fold! { @@ -286,11 +281,6 @@ impl_fold! { paren: Paren, init_expr: Box, }, - ResetDefault { - dot_token: Token![.], - reset_default: kw::reset_default, - paren: Paren, - }, } } @@ -312,11 +302,6 @@ impl Parse for RegBuilderReset { paren: parenthesized!(paren_contents in input), init_expr: paren_contents.call(parse_single_fn_arg)?, }), - RegBuilderMethod::ResetDefault(reset_default) => Ok(Self::ResetDefault { - dot_token, - reset_default, - paren: parenthesized!(paren_contents in input), - }), } } } @@ -344,15 +329,6 @@ impl ToTokens for RegBuilderReset { reset.to_tokens(tokens); paren.surround(tokens, |tokens| init_expr.to_tokens(tokens)); } - RegBuilderReset::ResetDefault { - dot_token, - reset_default, - paren, - } => { - dot_token.to_tokens(tokens); - reset_default.to_tokens(tokens); - paren.surround(tokens, |_| {}); - } } } } @@ -401,8 +377,6 @@ make_builder_method_enum! { NoReset(no_reset), #[cond = need_reset] Reset(reset), - #[cond = need_reset] - ResetDefault(reset_default), } } @@ -445,17 +419,13 @@ impl HdlLetKindRegBuilder { let mut clock_domain = None; match RegBuilderMethod::parse_dot_prefixed(&input.fork(), true, true)?.1 { RegBuilderMethod::ClockDomain(_) => clock_domain = Some(input.parse()?), - RegBuilderMethod::NoReset(_) - | RegBuilderMethod::Reset(_) - | RegBuilderMethod::ResetDefault(_) => {} + RegBuilderMethod::NoReset(_) | RegBuilderMethod::Reset(_) => {} } let reset = input.parse()?; if clock_domain.is_none() { match RegBuilderMethod::parse_dot_prefixed(&input.fork(), true, false)?.1 { RegBuilderMethod::ClockDomain(_) => clock_domain = Some(input.parse()?), - RegBuilderMethod::NoReset(_) - | RegBuilderMethod::Reset(_) - | RegBuilderMethod::ResetDefault(_) => unreachable!(), + RegBuilderMethod::NoReset(_) | RegBuilderMethod::Reset(_) => unreachable!(), } } Ok(Self { @@ -1370,7 +1340,7 @@ impl Visitor<'_> { no_reset.to_tokens(&mut expr); paren.surround(&mut expr, |expr| ty_expr.to_tokens(expr)); } - RegBuilderReset::Reset { .. } | RegBuilderReset::ResetDefault { .. } => { + RegBuilderReset::Reset { .. } => { hdl_let.kind.reset.to_tokens(&mut expr); } }