diff --git a/components/rust/README_cn.md b/components/rust/README_zh.md similarity index 100% rename from components/rust/README_cn.md rename to components/rust/README_zh.md diff --git a/components/rust/core/src/api/libloading.rs b/components/rust/core/src/api/libloading.rs index 438f1fb40b8..90b33cc92d3 100644 --- a/components/rust/core/src/api/libloading.rs +++ b/components/rust/core/src/api/libloading.rs @@ -150,7 +150,7 @@ impl Library { let h = self.handle; forget(self); let rc = libc::dlclose(h); - if rc == 1 { + if rc == 0 { Ok(()) } else { Err(DlError::Close(rc)) diff --git a/components/rust/core/src/lib.rs b/components/rust/core/src/lib.rs index 2787b7240a4..01e4b34102b 100644 --- a/components/rust/core/src/lib.rs +++ b/components/rust/core/src/lib.rs @@ -77,7 +77,7 @@ pub enum RTTError { FileSetLengthErr, FileSyncErr, - FuncUnDefine, + FuncUndefined, } pub type RTResult = Result; diff --git a/components/rust/core/src/panic.rs b/components/rust/core/src/panic.rs index 371f86fdb62..b45ad7d1a34 100644 --- a/components/rust/core/src/panic.rs +++ b/components/rust/core/src/panic.rs @@ -24,7 +24,7 @@ fn panic(info: &core::panic::PanicInfo) -> ! { } #[linkage = "weak"] -#[unsafe(no_mangle)] +#[no_mangle] fn __rust_panic() -> ! { /* Default weak panic handler: loops forever to halt execution. */ print!("Entered weak panic handler: system will halt."); diff --git a/components/rust/core/src/thread.rs b/components/rust/core/src/thread.rs index 35e03f3c3aa..791fd46da7d 100644 --- a/components/rust/core/src/thread.rs +++ b/components/rust/core/src/thread.rs @@ -28,7 +28,7 @@ impl Thread { pub fn new() -> ThreadBuilder { ThreadBuilder { - th_name: "uname".into(), + th_name: "Unnamed".into(), th_stack_size: 4096, th_priority: 10, th_ticks: 10, @@ -151,4 +151,4 @@ impl ThreadBuilder { func, ) } -} \ No newline at end of file +} diff --git a/components/rust/docs/1.tools/tools.md b/components/rust/docs/1.tools/README.md similarity index 100% rename from components/rust/docs/1.tools/tools.md rename to components/rust/docs/1.tools/README.md diff --git a/components/rust/docs/1.tools/tools_cn.md b/components/rust/docs/1.tools/README_zh.md similarity index 100% rename from components/rust/docs/1.tools/tools_cn.md rename to components/rust/docs/1.tools/README_zh.md diff --git a/components/rust/docs/2.applications/application.md b/components/rust/docs/2.applications/README.md similarity index 100% rename from components/rust/docs/2.applications/application.md rename to components/rust/docs/2.applications/README.md diff --git a/components/rust/docs/2.applications/application_cn.md b/components/rust/docs/2.applications/README_zh.md similarity index 100% rename from components/rust/docs/2.applications/application_cn.md rename to components/rust/docs/2.applications/README_zh.md diff --git a/components/rust/docs/3.components/component.md b/components/rust/docs/3.components/README.md similarity index 100% rename from components/rust/docs/3.components/component.md rename to components/rust/docs/3.components/README.md diff --git a/components/rust/docs/3.components/component_cn.md b/components/rust/docs/3.components/README_zh.md similarity index 100% rename from components/rust/docs/3.components/component_cn.md rename to components/rust/docs/3.components/README_zh.md diff --git a/components/rust/docs/4.modules/modules.md b/components/rust/docs/4.modules/README.md similarity index 100% rename from components/rust/docs/4.modules/modules.md rename to components/rust/docs/4.modules/README.md diff --git a/components/rust/docs/4.modules/modules_cn.md b/components/rust/docs/4.modules/README_zh.md similarity index 100% rename from components/rust/docs/4.modules/modules_cn.md rename to components/rust/docs/4.modules/README_zh.md diff --git a/components/rust/docs/5.rt-macro/rt-macros.md b/components/rust/docs/5.rt-macro/README.md similarity index 100% rename from components/rust/docs/5.rt-macro/rt-macros.md rename to components/rust/docs/5.rt-macro/README.md diff --git a/components/rust/docs/5.rt-macro/rt-macros_cn.md b/components/rust/docs/5.rt-macro/README_zh.md similarity index 100% rename from components/rust/docs/5.rt-macro/rt-macros_cn.md rename to components/rust/docs/5.rt-macro/README_zh.md diff --git a/components/rust/examples/modules/example_lib/src/lib.rs b/components/rust/examples/modules/example_lib/src/lib.rs index 5f81c1553fd..79fe384e6ad 100644 --- a/components/rust/examples/modules/example_lib/src/lib.rs +++ b/components/rust/examples/modules/example_lib/src/lib.rs @@ -11,7 +11,7 @@ /* Bring rt-rust's println! macro into scope */ use rt_rust::println; use core::ffi::{c_char, CStr}; -#[unsafe(no_mangle)] +#[no_mangle] pub extern "C" fn rust_mylib_println(s: *const c_char) { if s.is_null() { println!(""); @@ -24,7 +24,7 @@ pub extern "C" fn rust_mylib_println(s: *const c_char) { } } -#[unsafe(no_mangle)] +#[no_mangle] pub extern "C" fn rust_mylib_add(a: usize, b: usize) -> usize { a + b -} \ No newline at end of file +}