move rcore-ulib to rcore-user

user/Cargo.lock

@@ -9,19 +9,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "rcore-ulib"
+name = "rcore-user"
 version = "0.1.0"
 dependencies = [
  "linked_list_allocator 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rcore-user-programs"
-version = "0.1.0"
-dependencies = [
- "rcore-ulib 0.1.0",
-]
-
 [[package]]
 name = "spin"
 version = "0.4.10"

user/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "rcore-user-programs"
+name = "rcore-user"
 version = "0.1.0"
 authors = ["Runji Wang <wangrunji0408@163.com>"]
 edition = "2018"
 
 [dependencies]
-"rcore-ulib" = { path = "rcore-ulib" }
+linked_list_allocator = "0.6"

user/rcore-ulib/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "rcore-ulib"
-version = "0.1.0"
-authors = ["WangRunji <wangrunji0408@163.com>"]
-edition = "2018"
-
-[dependencies]
-linked_list_allocator = "0.6"

user/src/bin/fantastic_text.rs

@@ -2,7 +2,7 @@
 #![no_main]
 
 #[macro_use]
-extern crate rcore_ulib;
+extern crate rcore_user;
 
 macro_rules! color_text {
     ($text:expr, $color:expr) => {{

user/src/bin/hello_rust.rs

@@ -2,12 +2,12 @@
 #![no_main]
 
 #[macro_use]
-extern crate rcore_ulib;
+extern crate rcore_user;
 
 // IMPORTANT: Must define main() like this
 #[no_mangle]
 pub fn main() {
     println!("Hello Rust uCore!");
-    println!("I am process {}.", rcore_ulib::syscall::sys_getpid());
+    println!("I am process {}.", rcore_user::syscall::sys_getpid());
     println!("hello pass.");
 }

user/src/bin/sh.rs

@@ -4,12 +4,12 @@
 
 extern crate alloc;
 #[macro_use]
-extern crate rcore_ulib;
+extern crate rcore_user;
 
 use alloc::vec::Vec;
 
-use rcore_ulib::io::get_line;
+use rcore_user::io::get_line;
-use rcore_ulib::syscall::{sys_exec, sys_fork, sys_wait};
+use rcore_user::syscall::{sys_exec, sys_fork, sys_wait};
 
 // IMPORTANT: Must define main() like this
 #[no_mangle]