Skip to content

Commit a8f58c9

Browse files
stlankesstlankes
committed
remove clippy warnings and some typos
1 parent f8e528e commit a8f58c9

File tree

3 files changed

+45
-39
lines changed

3 files changed

+45
-39
lines changed

‎src/arch/aarch64/kernel/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ use crate::arch::aarch64::mm::paging::{BasePageSize, PageSize};
3131
use crate::config::*;
3232
use crate::env;
3333

34-
const SERIAL_PORT_BAUDRATE: u32 = 115_200;
35-
3634
global_asm!(include_str!("setjmp.s"));
3735
global_asm!(include_str!("longjmp.s"));
3836

‎src/executor/mod.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ pub(crate) fn run() {
108108

109109
/// Spawns a future on the executor.
110110
#[cfg_attr(
111-
not(any(feature = "shell", feature = "tcp", feature = "udp", feature = "vsock")),
111+
not(any(
112+
feature = "shell",
113+
feature = "tcp",
114+
feature = "udp",
115+
feature = "vsock",
116+
feature = "wasm"
117+
)),
112118
expect(dead_code)
113119
)]
114120
pub(crate) fn spawn<F>(future: F)

‎src/wasm/mod.rs‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn native_foo() {}
3434

3535
pub fn measure_fibonacci(n: u64) {
3636
const RUNS: u64 = 100;
37-
info!("Measure native_fibonacci({})", n);
37+
info!("Measure native_fibonacci({n})");
3838

3939
let start = now_micros();
4040
for _ in 0..RUNS {
@@ -183,7 +183,7 @@ impl WasmManager {
183183

184184
guard.push(Descriptor::RawFd(raw_fd));
185185

186-
return ERRNO_SUCCESS.raw() as i32;
186+
return i32::from(ERRNO_SUCCESS.raw());
187187
}
188188
}
189189

@@ -195,10 +195,10 @@ impl WasmManager {
195195
);
196196
}
197197

198-
return ERRNO_SUCCESS.raw() as i32;
198+
return i32::from(ERRNO_SUCCESS.raw());
199199
}
200200

201-
ERRNO_INVAL.raw() as i32
201+
i32::from(ERRNO_INVAL.raw())
202202
},
203203
)
204204
.unwrap();
@@ -247,10 +247,10 @@ impl WasmManager {
247247
nread_bytes.as_bytes(),
248248
);
249249

250-
return ERRNO_SUCCESS.raw() as i32;
250+
return i32::from(ERRNO_SUCCESS.raw());
251251
}
252252

253-
ERRNO_INVAL.raw() as i32
253+
i32::from(ERRNO_INVAL.raw())
254254
},
255255
)
256256
.unwrap();
@@ -314,10 +314,10 @@ impl WasmManager {
314314
nwritten_bytes.as_bytes(),
315315
);
316316

317-
return ERRNO_SUCCESS.raw() as i32;
317+
return i32::from(ERRNO_SUCCESS.raw());
318318
}
319319

320-
ERRNO_INVAL.raw() as i32
320+
i32::from(ERRNO_INVAL.raw())
321321
},
322322
)
323323
.unwrap();
@@ -326,7 +326,7 @@ impl WasmManager {
326326
"wasi_snapshot_preview1",
327327
"environ_get",
328328
|mut _caller: Caller<'_, _>, _env_ptr: i32, _env_buffer_ptr: i32| {
329-
ERRNO_SUCCESS.raw() as i32
329+
i32::from(ERRNO_SUCCESS.raw())
330330
},
331331
)
332332
.unwrap();
@@ -339,23 +339,23 @@ impl WasmManager {
339339
env_buffer_size_ptr: i32| {
340340
if let Some(Extern::Memory(mem)) = caller.get_export("memory") {
341341
let env_buffer_size: u32 = 0;
342-
let nnumber_env_variables: u32 = 0;
342+
let number_env_variables: u32 = 0;
343343

344344
let _ = mem.write(
345345
caller.as_context_mut(),
346346
number_env_variables_ptr.try_into().unwrap(),
347-
nnumber_env_variables.as_bytes(),
347+
number_env_variables.as_bytes(),
348348
);
349349
let _ = mem.write(
350350
caller.as_context_mut(),
351351
env_buffer_size_ptr.try_into().unwrap(),
352352
env_buffer_size.as_bytes(),
353353
);
354354

355-
return ERRNO_SUCCESS.raw() as i32;
355+
return i32::from(ERRNO_SUCCESS.raw());
356356
}
357357

358-
ERRNO_INVAL.raw() as i32
358+
i32::from(ERRNO_INVAL.raw())
359359
},
360360
)
361361
.unwrap();
@@ -384,7 +384,7 @@ impl WasmManager {
384384
pos += element.len() as u32;
385385
}
386386
}
387-
ERRNO_SUCCESS.raw() as i32
387+
i32::from(ERRNO_SUCCESS.raw())
388388
},
389389
)
390390
.unwrap();
@@ -413,10 +413,10 @@ impl WasmManager {
413413
nargs_size.as_bytes(),
414414
);
415415

416-
return ERRNO_SUCCESS.raw() as i32;
416+
return i32::from(ERRNO_SUCCESS.raw());
417417
}
418418

419-
ERRNO_INVAL.raw() as i32
419+
i32::from(ERRNO_INVAL.raw())
420420
},
421421
)
422422
.unwrap();
@@ -444,16 +444,16 @@ impl WasmManager {
444444
prestat_ptr.try_into().unwrap(),
445445
unsafe {
446446
core::slice::from_raw_parts(
447-
(&stat as *const _) as *const u8,
447+
(&raw const stat).cast::<u8>(),
448448
size_of::<Prestat>(),
449449
)
450450
},
451451
);
452452

453-
return ERRNO_SUCCESS.raw() as i32;
453+
return i32::from(ERRNO_SUCCESS.raw());
454454
}
455455

456-
ERRNO_BADF.raw() as i32
456+
i32::from(ERRNO_BADF.raw())
457457
},
458458
)
459459
.unwrap();
@@ -473,16 +473,16 @@ impl WasmManager {
473473
nanos.as_bytes(),
474474
);
475475

476-
return ERRNO_SUCCESS.raw() as i32;
476+
return i32::from(ERRNO_SUCCESS.raw());
477477
}
478478

479-
ERRNO_INVAL.raw() as i32
479+
i32::from(ERRNO_INVAL.raw())
480480
}
481481
1 => {
482482
warn!("Unsupported clock_id");
483-
ERRNO_INVAL.raw() as i32
483+
i32::from(ERRNO_INVAL.raw())
484484
}
485-
_ => ERRNO_INVAL.raw() as i32,
485+
_ => i32::from(ERRNO_INVAL.raw()),
486486
}
487487
},
488488
)
@@ -501,7 +501,7 @@ impl WasmManager {
501501
",
502502
) {
503503
if path_len < path.len().try_into().unwrap() {
504-
return ERRNO_INVAL.raw() as i32;
504+
return i32::from(ERRNO_INVAL.raw());
505505
}
506506

507507
let _ = mem.write(
@@ -511,10 +511,10 @@ impl WasmManager {
511511
);
512512
}
513513

514-
return ERRNO_SUCCESS.raw() as i32;
514+
return i32::from(ERRNO_SUCCESS.raw());
515515
}
516516

517-
ERRNO_BADF.raw() as i32
517+
i32::from(ERRNO_BADF.raw())
518518
},
519519
)
520520
.unwrap();
@@ -528,7 +528,7 @@ impl WasmManager {
528528
guard[fd as usize] = Descriptor::None;
529529
}
530530

531-
ERRNO_SUCCESS.raw() as i32
531+
i32::from(ERRNO_SUCCESS.raw())
532532
})
533533
.unwrap();
534534
linker
@@ -537,7 +537,7 @@ impl WasmManager {
537537
"fd_fdstat_get",
538538
|_: i32, _: i32| {
539539
warn!("Unsupported function fd_fdstat_get");
540-
ERRNO_SUCCESS.raw() as i32
540+
i32::from(ERRNO_SUCCESS.raw())
541541
},
542542
)
543543
.unwrap();
@@ -547,13 +547,13 @@ impl WasmManager {
547547
"fd_seek",
548548
|_: i32, _: i64, _: i32, _: i32| {
549549
warn!("Unsupported function fd_seek");
550-
ERRNO_SUCCESS.raw() as i32
550+
i32::from(ERRNO_SUCCESS.raw())
551551
},
552552
)
553553
.unwrap();
554554
linker
555555
.func_wrap("wasi_snapshot_preview1", "proc_exit", |_: i32| {
556-
error!("Panic in WASM module")
556+
error!("Panic in WASM module");
557557
})
558558
.unwrap();
559559

@@ -596,7 +596,7 @@ async fn wasm_run() {
596596
};
597597

598598
drop(guard);
599-
while let Poll::Pending = pin!(obj.write(&data)).poll(cx) {}
599+
while pin!(obj.write(&data)).poll(cx).is_pending() {}
600600

601601
cx.waker().wake_by_ref();
602602
Poll::<()>::Pending
@@ -658,7 +658,7 @@ pub extern "C" fn sys_dhrystone() -> i32 {
658658
if let Some(ref mut wasm_manager) = WASM_MANAGER.lock().as_mut() {
659659
// And finally we can call the wasm function
660660
info!("Call function dhrystone");
661-
let _result = wasm_manager.call_func::<(), ()>("_start", ()).unwrap();
661+
wasm_manager.call_func::<(), ()>("_start", ()).unwrap();
662662
}
663663

664664
0
@@ -670,11 +670,12 @@ pub extern "C" fn sys_foo() -> i32 {
670670
if let Some(ref mut wasm_manager) = WASM_MANAGER.lock().as_mut() {
671671
// And finally we can call the wasm function
672672
info!("Call function foo");
673-
let _result = wasm_manager.call_func::<(), ()>("foo", ()).unwrap();
673+
wasm_manager.call_func::<(), ()>("foo", ()).unwrap();
674674

675-
const RUNS: u64 = 1000000;
675+
const RUNS: u64 = 1_000_000;
676676
let start = now_micros();
677677
for _ in 0..RUNS {
678+
#[allow(clippy::unit_arg)]
678679
black_box(wasm_manager.call_func::<(), ()>("foo", ()).unwrap());
679680
}
680681
let end = now_micros();
@@ -685,6 +686,7 @@ pub extern "C" fn sys_foo() -> i32 {
685686

686687
let start = now_micros();
687688
for _ in 0..RUNS {
689+
#[allow(clippy::unit_arg)]
688690
black_box(native_foo());
689691
}
690692
let end = now_micros();
@@ -710,9 +712,9 @@ pub extern "C" fn sys_fibonacci() -> i32 {
710712
// And finally we can call the wasm function
711713
info!("Call function fibonacci");
712714
let result = wasm_manager.call_func::<u64, u64>("fibonacci", 30).unwrap();
713-
info!("fibonacci(30) = {}", result);
715+
info!("fibonacci(30) = {result}");
714716
assert!(
715-
result == 832040,
717+
result == 832_040,
716718
"Error in the calculation of fibonacci(30) "
717719
);
718720

0 commit comments

Comments
 (0)