Skip to content

Commit bd201af

Browse files
author
Paolo Tranquilli
committed
Rust: apply formatting and linting
1 parent 8f8fe2f commit bd201af

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

Diff for: rust/ast-generator/src/main.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,11 @@ fn node_to_extractor_info(node: &AstNodeSrc) -> ExtractorNodeInfo {
532532

533533
fn write_extractor(grammar: &AstSrc) -> mustache::Result<String> {
534534
let extractor_info = ExtractorInfo {
535-
enums: grammar.enums.iter().filter_map(enum_to_extractor_info).collect(),
535+
enums: grammar
536+
.enums
537+
.iter()
538+
.filter_map(enum_to_extractor_info)
539+
.collect(),
536540
nodes: grammar.nodes.iter().map(node_to_extractor_info).collect(),
537541
};
538542
let template = mustache::compile_str(include_str!("templates/extractor.mustache"))?;

Diff for: rust/extractor/src/crate_graph.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
6464
}
6565
// Extract each crate
6666
for krate_id in crate_graph.as_ref().iter() {
67-
if let Some((root_module_file, hash)) = crate_id_map.get(&krate_id) {
67+
if let Some((root_module_file, hash)) = crate_id_map.get(krate_id) {
6868
let path = root_module_file.join(format!("{hash:0>16x}"));
6969
let mut trap = trap_provider.create("crates", path.as_path());
7070
// If the trap file already exists, then skip extraction because we have already extracted
@@ -427,7 +427,7 @@ fn emit_trait(
427427
.iter()
428428
.flat_map(|(name, item)| {
429429
if let AssocItemId::FunctionId(function) = item {
430-
let sig = db.callable_item_signature(function.clone().into());
430+
let sig = db.callable_item_signature((*function).into());
431431
let sig = sig.skip_binders();
432432
let params = sig
433433
.params()
@@ -540,7 +540,7 @@ fn emit_module_impls(
540540
.iter()
541541
.flat_map(|item| {
542542
if let (name, AssocItemId::FunctionId(function)) = item {
543-
let sig = db.callable_item_signature(function.clone().into());
543+
let sig = db.callable_item_signature((*function).into());
544544
let sig = sig.skip_binders();
545545
let params = sig
546546
.params()
@@ -572,7 +572,7 @@ fn emit_module_impls(
572572
id: trap::TrapId::Star,
573573
text: Some(name.as_str().to_owned()),
574574
}));
575-
let data = db.function_data(function.clone());
575+
let data = db.function_data(*function);
576576
let visibility = emit_visibility(
577577
db,
578578
trap,

Diff for: rust/extractor/src/rust_analyzer.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ impl<'a> RustAnalyzer<'a> {
7373
if let Some(file_id) = path_to_file_id(path, vfs) {
7474
if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
7575
{
76-
let file_id = EditionedFileId::new(semantics.db, SpanEditionedFileId::current_edition(file_id));
76+
let file_id = EditionedFileId::new(
77+
semantics.db,
78+
SpanEditionedFileId::current_edition(file_id),
79+
);
7780
let source_file = semantics.parse(file_id);
7881
let errors = semantics
7982
.db

0 commit comments

Comments
 (0)