dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibJS/Rust: Apply lint clippy::ref_option

Browse source
This commit is contained in:
juhotuho10 2026-02-27 11:37:00 +02:00 committed by Andreas Kling
parent 59251cc371
commit 277177484e
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibJS/Rust/src/bytecode/codegen.rs
View file

@ -2248,7 +2248,7 @@ fn generate_conditional(
fn generate_with_completion(
body: &Statement,
generator: &mut Generator,
completion: &Option<ScopedOperand>,
completion: Option<&ScopedOperand>,
preferred_dst: Option<&ScopedOperand>,
) -> Option<ScopedOperand> {
let saved = generator.current_completion_register.clone();
@ -2295,9 +2295,9 @@ fn generate_if_statement(
// if-statements reuse the same register (matching C++).
let child_dst = completion.as_ref().or(preferred_dst);
if is_truthy {
generate_with_completion(consequent, generator, &completion, child_dst);
generate_with_completion(consequent, generator, completion.as_ref(), child_dst);
} else if let Some(alt) = alternate {
generate_with_completion(alt, generator, &completion, child_dst);
generate_with_completion(alt, generator, completion.as_ref(), child_dst);
}
return completion;
}
@ -2390,7 +2390,7 @@ fn generate_while_statement(
generator.begin_continuable_scope(test_block, labels.clone(), completion.clone());
generator.begin_breakable_scope(end_block, labels, completion.clone());
generate_with_completion(body, generator, &completion, preferred_dst);
generate_with_completion(body, generator, completion.as_ref(), preferred_dst);
generator.end_breakable_scope();
generator.end_continuable_scope();
@ -2433,7 +2433,7 @@ fn generate_do_while_statement(
generator.begin_continuable_scope(test_block, labels.clone(), completion.clone());
generator.begin_breakable_scope(end_block, labels, completion.clone());
generate_with_completion(body, generator, &completion, preferred_dst);
generate_with_completion(body, generator, completion.as_ref(), preferred_dst);
generator.end_breakable_scope();
generator.end_continuable_scope();
@ -2577,7 +2577,7 @@ fn generate_for_statement(
generator.begin_continuable_scope(continue_target, labels.clone(), completion.clone());
generator.begin_breakable_scope(end_block, labels, completion.clone());
generate_with_completion(body, generator, &completion, preferred_dst);
generate_with_completion(body, generator, completion.as_ref(), preferred_dst);
generator.end_breakable_scope();
generator.end_continuable_scope();
@ -6641,7 +6641,7 @@ fn generate_for_in_statement(
}
if !generator.is_current_block_terminated() {
generate_with_completion(body, generator, &completion, preferred_dst);
generate_with_completion(body, generator, completion.as_ref(), preferred_dst);
}
if needs_lexical_env {
@ -6888,7 +6888,7 @@ fn generate_for_of_statement_inner(
}
if !generator.is_current_block_terminated() {
generate_with_completion(body, generator, &completion, preferred_dst);
generate_with_completion(body, generator, completion.as_ref(), preferred_dst);
}
// Restore lexical env before continuing

24
Libraries/LibJS/Rust/src/lib.rs
View file

@ -1292,8 +1292,8 @@ unsafe fn call_export_callback(
callback: ModuleExportEntryCallback,
ctx: *mut c_void,
kind: u8,
export_name: &Option<ast::Utf16String>,
local_or_import_name: &Option<ast::Utf16String>,
export_name: Option<&ast::Utf16String>,
local_or_import_name: Option<&ast::Utf16String>,
module_request: Option<&ast::ModuleRequest>,
) {
unsafe {
@ -1497,8 +1497,8 @@ unsafe fn extract_module_metadata(scope: &ast::ScopeData, ctx: *mut c_void, cb:
cb.push_local_export,
ctx,
entry.kind as u8,
&entry.export_name,
&entry.local_or_import_name,
entry.export_name.as_ref(),
entry.local_or_import_name.as_ref(),
None,
);
} else {
@ -1507,8 +1507,8 @@ unsafe fn extract_module_metadata(scope: &ast::ScopeData, ctx: *mut c_void, cb:
cb.push_indirect_export,
ctx,
ExportEntryKind::NamedExport as u8,
&entry.export_name,
&import_entry.import_name,
entry.export_name.as_ref(),
import_entry.import_name.as_ref(),
Some(&import_entry.module_request),
);
}
@ -1518,8 +1518,8 @@ unsafe fn extract_module_metadata(scope: &ast::ScopeData, ctx: *mut c_void, cb:
cb.push_local_export,
ctx,
entry.kind as u8,
&entry.export_name,
&entry.local_or_import_name,
entry.export_name.as_ref(),
entry.local_or_import_name.as_ref(),
None,
);
}
@ -1529,8 +1529,8 @@ unsafe fn extract_module_metadata(scope: &ast::ScopeData, ctx: *mut c_void, cb:
cb.push_star_export,
ctx,
entry.kind as u8,
&entry.export_name,
&entry.local_or_import_name,
entry.export_name.as_ref(),
entry.local_or_import_name.as_ref(),
export_data.module_request.as_ref(),
);
} else {
@ -1539,8 +1539,8 @@ unsafe fn extract_module_metadata(scope: &ast::ScopeData, ctx: *mut c_void, cb:
cb.push_indirect_export,
ctx,
entry.kind as u8,
&entry.export_name,
&entry.local_or_import_name,
entry.export_name.as_ref(),
entry.local_or_import_name.as_ref(),
export_data.module_request.as_ref(),
);
}

6
Libraries/LibJS/Rust/src/parser/declarations.rs
View file

@ -416,7 +416,7 @@ impl<'a> Parser<'a> {
self.scope_collector.set_is_function_declaration();
let fd = self.parse_function_common(
&name,
name,
&fn_name,
kind,
is_async,
@ -486,7 +486,7 @@ impl<'a> Parser<'a> {
self.scope_collector.open_function_scope(fn_name_for_scope);
let fd = self.parse_function_common(
&name,
name,
&fn_name_value,
kind,
is_async,
@ -503,7 +503,7 @@ impl<'a> Parser<'a> {
#[allow(clippy::too_many_arguments)]
fn parse_function_common(
&mut self,
name: &Option<Rc<Identifier>>,
name: Option<Rc<Identifier>>,
fn_name: &[u16],
kind: FunctionKind,
is_async: bool,