Skip to content

chore(rust): fix clippy warnings in splat sorting functions #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmjinglin163 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(rust): fix clippy warnings in splat sorting functions #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions rust/spark-rs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,25 @@ pub fn sort_splats(
) -> u32 {
let max_splats = readback.length() as usize;

let active_splats = SORT_BUFFERS.with_borrow_mut(|buffers| {
SORT_BUFFERS.with_borrow_mut(|buffers| {
buffers.ensure_size(max_splats);
let sub_readback = readback.subarray(0, num_splats);
sub_readback.copy_to(&mut buffers.readback[..num_splats as usize]);

let active_splats = match sort_internal(buffers, num_splats as usize) {
Ok(active_splats) => active_splats,
Err(err) => {
wasm_bindgen::throw_str(&format!("{}", err));
wasm_bindgen::throw_str(&err.to_string());
}
};

if active_splats > 0 {
// Copy out ordering result
let subarray = &buffers.ordering[..active_splats as usize];
ordering.subarray(0, active_splats).copy_from(&subarray);
ordering.subarray(0, active_splats).copy_from(subarray);
}
active_splats
});

active_splats
})
}

#[wasm_bindgen]
Expand All @@ -72,27 +70,25 @@ pub fn sort32_splats(
) -> u32 {
let max_splats = readback.length() as usize;

let active_splats = SORT32_BUFFERS.with_borrow_mut(|buffers| {
SORT32_BUFFERS.with_borrow_mut(|buffers| {
buffers.ensure_size(max_splats);
let sub_readback = readback.subarray(0, num_splats);
sub_readback.copy_to(&mut buffers.readback[..num_splats as usize]);

let active_splats = match sort32_internal(buffers, max_splats, num_splats as usize) {
Ok(active_splats) => active_splats,
Err(err) => {
wasm_bindgen::throw_str(&format!("{}", err));
wasm_bindgen::throw_str(&err.to_string());
}
};

if active_splats > 0 {
// Copy out ordering result
let subarray = &buffers.ordering[..active_splats as usize];
ordering.subarray(0, active_splats).copy_from(&subarray);
ordering.subarray(0, active_splats).copy_from(subarray);
}
active_splats
});

active_splats
})
}

#[wasm_bindgen]
Expand Down
Loading