fix(rust): address nightly clippy lint useless_if_let_seq
This commit is contained in:
parent
e3b85fd0d5
commit
86b2c939c7
4 changed files with 27 additions and 24 deletions
|
|
@ -131,11 +131,12 @@ impl Pattern {
|
|||
|
||||
if self.named {
|
||||
string.push('(');
|
||||
let mut has_contents = false;
|
||||
if let Some(kind) = &self.kind {
|
||||
let mut has_contents = if let Some(kind) = &self.kind {
|
||||
write!(string, "{kind}").unwrap();
|
||||
has_contents = true;
|
||||
}
|
||||
true
|
||||
} else {
|
||||
false
|
||||
};
|
||||
for child in &self.children {
|
||||
let indent = indent + 2;
|
||||
if has_contents {
|
||||
|
|
|
|||
|
|
@ -181,8 +181,7 @@ pub(super) fn extract_tokens(
|
|||
}
|
||||
}
|
||||
|
||||
let mut word_token = None;
|
||||
if let Some(token) = grammar.word_token {
|
||||
let word_token = if let Some(token) = grammar.word_token {
|
||||
let token = symbol_replacer.replace_symbol(token);
|
||||
if token.is_non_terminal() {
|
||||
let word_token_variable = &variables[token.index];
|
||||
|
|
@ -197,8 +196,10 @@ pub(super) fn extract_tokens(
|
|||
conflicting_symbol_name,
|
||||
}))?;
|
||||
}
|
||||
word_token = Some(token);
|
||||
}
|
||||
Some(token)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let mut reserved_word_contexts = Vec::with_capacity(grammar.reserved_word_sets.len());
|
||||
for reserved_word_context in grammar.reserved_word_sets {
|
||||
|
|
@ -280,10 +281,11 @@ impl TokenExtractor {
|
|||
let mut params = params.clone();
|
||||
params.is_token = false;
|
||||
|
||||
let mut string_value = None;
|
||||
if let Rule::String(value) = rule.as_ref() {
|
||||
string_value = Some(value);
|
||||
}
|
||||
let string_value = if let Rule::String(value) = rule.as_ref() {
|
||||
Some(value)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let rule_to_extract = if params == MetadataParams::default() {
|
||||
rule.as_ref()
|
||||
|
|
|
|||
|
|
@ -95,14 +95,15 @@ pub(super) fn intern_symbols(grammar: &InputGrammar) -> InternSymbolsResult<Inte
|
|||
}
|
||||
}
|
||||
|
||||
let mut word_token = None;
|
||||
if let Some(name) = grammar.word_token.as_ref() {
|
||||
word_token = Some(
|
||||
let word_token = if let Some(name) = grammar.word_token.as_ref() {
|
||||
Some(
|
||||
interner
|
||||
.intern_name(name)
|
||||
.ok_or_else(|| InternSymbolsError::UndefinedWordToken(name.clone()))?,
|
||||
);
|
||||
}
|
||||
)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
for (i, variable) in variables.iter_mut().enumerate() {
|
||||
if supertype_symbols.contains(&Symbol::non_terminal(i)) {
|
||||
|
|
|
|||
|
|
@ -705,8 +705,7 @@ impl Parser {
|
|||
drop(unsafe { Box::from_raw(prev_logger.payload.cast::<Logger>()) });
|
||||
}
|
||||
|
||||
let c_logger;
|
||||
if let Some(logger) = logger {
|
||||
let c_logger = if let Some(logger) = logger {
|
||||
let container = Box::new(logger);
|
||||
|
||||
unsafe extern "C" fn log(
|
||||
|
|
@ -727,16 +726,16 @@ impl Parser {
|
|||
|
||||
let raw_container = Box::into_raw(container);
|
||||
|
||||
c_logger = ffi::TSLogger {
|
||||
ffi::TSLogger {
|
||||
payload: raw_container.cast::<c_void>(),
|
||||
log: Some(log),
|
||||
};
|
||||
}
|
||||
} else {
|
||||
c_logger = ffi::TSLogger {
|
||||
ffi::TSLogger {
|
||||
payload: ptr::null_mut(),
|
||||
log: None,
|
||||
};
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
unsafe { ffi::ts_parser_set_logger(self.0.as_ptr(), c_logger) };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue