fix rust-analyzer warning

This commit is contained in:
Yu Chen 2022-12-31 10:36:35 +08:00
parent 07c6cb366b
commit e4e089f2c5
4 changed files with 14 additions and 13 deletions

View File

@ -7,7 +7,7 @@
// For Rust Analyzer plugin users:
"rust-analyzer.cargo.target": "riscv64gc-unknown-none-elf",
"rust-analyzer.checkOnSave.allTargets": false,
"rust-analyzer.cargo.features": [
"board_qemu"
]
// "rust-analyzer.cargo.features": [
// "board_qemu"
// ]
}

View File

@ -11,6 +11,6 @@ clap = "2.33.3"
easy-fs = { path = "../easy-fs" }
rand = "0.8.0"
[features]
board_qemu = []
board_k210 = []
# [features]
# board_qemu = []
# board_k210 = []

View File

@ -14,6 +14,6 @@ riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
[profile.release]
debug = true
[features]
board_qemu = []
board_k210 = []
# [features]
# board_qemu = []
# board_k210 = []

View File

@ -4,7 +4,7 @@
#![no_std]
#![no_main]
#![feature(naked_functions)]
#![feature(asm)]
//#![feature(asm)]
extern crate alloc;
#[macro_use]
@ -12,7 +12,7 @@ extern crate user_lib;
use core::arch::asm;
#[macro_use]
//#[macro_use]
use alloc::vec;
use alloc::vec::Vec;
@ -69,7 +69,7 @@ impl Task {
// we can allocate memory for it later, but it keeps complexity down and lets us focus on more interesting parts
// to do it here. The important part is that once allocated it MUST NOT move in memory.
Task {
id,
id:id,
stack: vec![0_u8; DEFAULT_STACK_SIZE],
ctx: TaskContext::default(),
state: State::Available,
@ -185,6 +185,7 @@ impl Runtime {
.find(|t| t.state == State::Available)
.expect("no available task.");
println!("RUNTIME: spawning task {}\n", available.id);
let size = available.stack.len();
unsafe {
let s_ptr = available.stack.as_mut_ptr().offset(size as isize);
@ -259,7 +260,7 @@ pub fn yield_task() {
/// see: https://doc.rust-lang.org/nightly/rust-by-example/unsafe/asm.html
#[naked]
#[no_mangle]
unsafe fn switch(old: *mut TaskContext, new: *const TaskContext) {
unsafe extern "C" fn switch(old: *mut TaskContext, new: *const TaskContext) {
// a0: _old, a1: _new
asm!(
"