forked from rcore-os/zCore
update dependencies
This commit is contained in:
parent
3e49825e6e
commit
ddde5ae1e7
|
@ -9,7 +9,7 @@ description = "Kernel HAL implementation for bare metal environment."
|
|||
|
||||
[dependencies]
|
||||
log = "0.4"
|
||||
spin = "0.5"
|
||||
spin = "0.7"
|
||||
git-version = "0.3"
|
||||
executor = { git = "https://github.com/rcore-os/executor.git", rev = "a2d02ee9" }
|
||||
trapframe = "0.7.0"
|
||||
|
@ -20,7 +20,7 @@ lazy_static = { version = "1.4", features = ["spin_no_std" ] }
|
|||
[target.'cfg(target_arch = "x86_64")'.dependencies]
|
||||
x86_64 = "0.13.2"
|
||||
uart_16550 = "=0.2.12"
|
||||
raw-cpuid = "8.0"
|
||||
raw-cpuid = "9.0"
|
||||
pc-keyboard = "0.5"
|
||||
apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" }
|
||||
x86-smpboot = { git = "https://github.com/rcore-os/x86-smpboot", rev = "43ffedf" }
|
||||
|
|
|
@ -14,6 +14,6 @@ tempfile = "3"
|
|||
bitflags = "1.2"
|
||||
lazy_static = "1.4"
|
||||
kernel-hal = { path = "../kernel-hal" }
|
||||
async-std = "1.6"
|
||||
async-std = "1.9"
|
||||
git-version = "0.3"
|
||||
trapframe = "0.7.0"
|
||||
|
|
|
@ -15,9 +15,9 @@ linux-object = { path = "../linux-object" }
|
|||
zircon-object = { path = "../zircon-object" }
|
||||
kernel-hal = { path = "../kernel-hal" }
|
||||
rcore-fs-hostfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "6df6cd2", optional = true }
|
||||
env_logger = { version = "0.7", optional = true }
|
||||
env_logger = { version = "0.8", optional = true }
|
||||
kernel-hal-unix = { path = "../kernel-hal-unix", optional = true }
|
||||
async-std = { version = "1.6", features = ["attributes"], optional = true }
|
||||
async-std = { version = "1.9", features = ["attributes"], optional = true }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
|
|
|
@ -8,12 +8,12 @@ description = "Linux kernel objects"
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.36"
|
||||
async-trait = "0.1"
|
||||
log = "0.4"
|
||||
spin = "0.5"
|
||||
spin = "0.7"
|
||||
xmas-elf = "0.7"
|
||||
bitflags = "1.2"
|
||||
hashbrown = "0.7"
|
||||
hashbrown = "0.9"
|
||||
numeric-enum-macro = "0.2"
|
||||
zircon-object = { path = "../zircon-object", features = ["elf"] }
|
||||
kernel-hal = { path = "../kernel-hal" }
|
||||
|
|
|
@ -145,7 +145,7 @@ impl INode for Pipe {
|
|||
#[must_use = "future does nothing unless polled/`await`-ed"]
|
||||
struct PipeFuture<'a> {
|
||||
pipe: &'a Pipe,
|
||||
};
|
||||
}
|
||||
|
||||
impl<'a> Future for PipeFuture<'a> {
|
||||
type Output = Result<PollStatus>;
|
||||
|
|
|
@ -78,7 +78,7 @@ impl INode for Stdin {
|
|||
#[must_use = "future does nothing unless polled/`await`-ed"]
|
||||
struct SerialFuture<'a> {
|
||||
stdin: &'a Stdin,
|
||||
};
|
||||
}
|
||||
|
||||
impl<'a> Future for SerialFuture<'a> {
|
||||
type Output = Result<PollStatus>;
|
||||
|
|
|
@ -9,7 +9,7 @@ description = "Linux syscalls implementation"
|
|||
|
||||
[dependencies]
|
||||
log = "0.4"
|
||||
spin = "0.5"
|
||||
spin = "0.7"
|
||||
bitflags = "1.2"
|
||||
numeric-enum-macro = "0.2"
|
||||
zircon-object = { path = "../zircon-object" }
|
||||
|
@ -17,4 +17,4 @@ linux-object = { path = "../linux-object" }
|
|||
kernel-hal = { path = "../kernel-hal" }
|
||||
rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "6df6cd2" }
|
||||
lazy_static = { version = "1.4", features = ["spin_no_std"] }
|
||||
bitvec = { version = "0.17", default-features = false, features = ["alloc"] }
|
||||
bitvec = { version = "0.21", default-features = false, features = ["alloc"] }
|
||||
|
|
|
@ -17,8 +17,8 @@ lto = true
|
|||
|
||||
[dependencies]
|
||||
log = "0.4"
|
||||
spin = "0.5"
|
||||
buddy_system_allocator = "0.5.0"
|
||||
spin = "0.7"
|
||||
buddy_system_allocator = "0.7"
|
||||
rlibc-opt = { git = "https://github.com/rcore-os/rlibc-opt.git", rev = "0ab1d1e" }
|
||||
rboot = { path = "../rboot", default-features = false }
|
||||
kernel-hal-bare = { path = "../kernel-hal-bare" }
|
||||
|
|
|
@ -13,10 +13,10 @@ xmas-elf = "0.7"
|
|||
zircon-object = { path = "../zircon-object", features = ["elf"] }
|
||||
zircon-syscall = { path = "../zircon-syscall" }
|
||||
kernel-hal = { path = "../kernel-hal" }
|
||||
env_logger = { version = "0.7", optional = true }
|
||||
env_logger = { version = "0.8", optional = true }
|
||||
structopt = { version = "0.3", default-features = false, optional = true }
|
||||
kernel-hal-unix = { path = "../kernel-hal-unix", optional = true }
|
||||
async-std = { version = "1.6", features = ["attributes"], optional = true }
|
||||
async-std = { version = "1.9", features = ["attributes"], optional = true }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
|
|
|
@ -14,9 +14,9 @@ hypervisor = ["rvm"]
|
|||
|
||||
[dependencies]
|
||||
bitflags = "1.2"
|
||||
spin = "0.5"
|
||||
spin = "0.7"
|
||||
log = "0.4"
|
||||
hashbrown = "0.7"
|
||||
hashbrown = "0.9"
|
||||
downcast-rs = { version = "1.2", default-features = false }
|
||||
kernel-hal = { path = "../kernel-hal" }
|
||||
numeric-enum-macro = "0.2"
|
||||
|
@ -29,4 +29,4 @@ rvm = { git = "https://github.com/rcore-os/RVM", rev = "e91d625", optional = tru
|
|||
|
||||
[dev-dependencies]
|
||||
kernel-hal-unix = { path = "../kernel-hal-unix" }
|
||||
async-std = { version = "1.6", features = ["attributes", "unstable"] }
|
||||
async-std = { version = "1.9", features = ["attributes", "unstable"] }
|
||||
|
|
|
@ -12,7 +12,7 @@ hypervisor = ["zircon-object/hypervisor"]
|
|||
|
||||
[dependencies]
|
||||
log = "0.4"
|
||||
spin = "0.5"
|
||||
spin = "0.7"
|
||||
bitflags = "1.2"
|
||||
numeric-enum-macro = "0.2"
|
||||
zircon-object = { path = "../zircon-object" }
|
||||
|
|
Loading…
Reference in New Issue