diff --git a/Cargo.toml b/Cargo.toml index 120671fca77d6ad256302a4c0469dc7a14fc4b9c..3ee2f02a6f9415bcb6ec468cfc362f524a71456c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" crate-type = ["rlib"] [features] -default = ["liteos"] +default = [] liteos = [] [dependencies] diff --git a/examples/test_liteos.rs b/examples/test_liteos.rs index 05effcee7495f9900fb8debe30eaf8b6bfde5ea5..80daa2093e6184d30b430cd8afbce919969d4eff 100644 --- a/examples/test_liteos.rs +++ b/examples/test_liteos.rs @@ -6,12 +6,7 @@ #![feature(bench_black_box)] #![feature(box_syntax)] -use core::alloc::Layout; - -use alloc::{ - alloc::{alloc, dealloc}, - string::ToString, -}; +use alloc::string::ToString; use arch::os::printf; #[allow(unused_imports)] @@ -58,4 +53,3 @@ unsafe extern "C" fn app_init() { printf("RWLock frob Test\n\0".as_ptr()); frob(); } - diff --git a/src/liteos/os.rs b/src/liteos/os.rs index d84a2e4dfc5a09505e04bbd109e4b405cb2837d8..71a734296cad88169eaaa7849067e8fff8dd249a 100644 --- a/src/liteos/os.rs +++ b/src/liteos/os.rs @@ -1,22 +1,15 @@ // Copyright (C) 2022-2022 Agilor Co.,Ltd. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -use core::{alloc::Layout, mem::MaybeUninit, str::from_utf8_unchecked}; +use core::str::from_utf8_unchecked; -use crate::thread::Thread; - -use super::libc; -use super::libc::timer::LOS_TickCountGet; - -use super::{ - libc::c::strnlen, - libc::sys::{self, __errno_location, strerror_r}, - sysinfo::LOSCFG_BASE_CORE_TICK_PER_SECOND, -}; -use alloc::{ - alloc::alloc, - boxed::Box, - string::{String, ToString}, +use super::libc::{ + self, + c::strnlen, + sys::{self, __errno_location, strerror_r}, + timer::LOS_TickCountGet, }; +use super::sysinfo::LOSCFG_BASE_CORE_TICK_PER_SECOND; +use alloc::string::{String, ToString}; #[inline(always)] pub fn errno() -> i32 { unsafe { *__errno_location() as i32 } diff --git a/src/liteos/rust.c b/src/liteos/rust.c index 29587b9d89fda0d6cdbe0a5df3834f9333bf7d40..111c0a9cdce83e500ce59bbdff4bd31effb51aca 100644 --- a/src/liteos/rust.c +++ b/src/liteos/rust.c @@ -1,3 +1,5 @@ +// Copyright (C) 2022-2022 Agilor Co.,Ltd. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 #include "los_spinlock.h" #include "los_task_pri.h" #include "los_atomic.h"