From bab29e65eb87f4765fb22d58bff723780980eeb6 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Wed, 14 Oct 2020 22:21:58 +0200 Subject: Default::default the highlighters --- crates/ide/src/syntax_highlighting/macro_rules.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'crates/ide/src/syntax_highlighting/macro_rules.rs') diff --git a/crates/ide/src/syntax_highlighting/macro_rules.rs b/crates/ide/src/syntax_highlighting/macro_rules.rs index 0676e0972..4462af47e 100644 --- a/crates/ide/src/syntax_highlighting/macro_rules.rs +++ b/crates/ide/src/syntax_highlighting/macro_rules.rs @@ -3,21 +3,14 @@ use syntax::{SyntaxElement, SyntaxKind, SyntaxToken, TextRange, T}; use crate::{HighlightTag, HighlightedRange}; +#[derive(Default)] pub(super) struct MacroRulesHighlighter { state: Option, } impl MacroRulesHighlighter { - pub(super) fn new() -> Self { - MacroRulesHighlighter { state: None } - } - pub(super) fn init(&mut self) { - self.state = Some(MacroMatcherParseState::new()); - } - - pub(super) fn reset(&mut self) { - self.state = None; + self.state = Some(MacroMatcherParseState::default()); } pub(super) fn advance(&mut self, token: &SyntaxToken) { @@ -51,8 +44,8 @@ struct MacroMatcherParseState { in_invoc_body: bool, } -impl MacroMatcherParseState { - fn new() -> Self { +impl Default for MacroMatcherParseState { + fn default() -> Self { MacroMatcherParseState { paren_ty: None, paren_level: 0, -- cgit v1.2.3