diff --git a/Cargo.lock b/Cargo.lock index db153da41..ac371077a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1869,12 +1869,12 @@ dependencies = [ [[package]] name = "spin" -version = "0.4.10" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "spin" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1978,7 +1978,7 @@ dependencies = [ "bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libuser 0.1.0", "sunrise-libutils 0.1.0", @@ -1994,7 +1994,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "multiboot2 0.7.1 (git+https://github.com/sunriseos/multiboot2-elf64.git)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libutils 0.1.0", "xmas-elf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2013,7 +2013,7 @@ dependencies = [ "libfat 0.1.0 (git+https://github.com/sunriseos/libfat.git)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "storage_device 1.0.0 (git+https://github.com/sunriseos/storage_device.git)", "sunrise-libuser 0.1.0", @@ -2040,7 +2040,7 @@ dependencies = [ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libkern 0.1.0", "sunrise-libutils 0.1.0", @@ -2056,7 +2056,7 @@ dependencies = [ "generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libuser 0.1.0", "sunrise-libutils 0.1.0", ] @@ -2097,7 +2097,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "linked_list_allocator 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libkern 0.1.0", "sunrise-libutils 0.1.0", "swipc-gen 0.1.0", @@ -2119,7 +2119,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libkern 0.1.0", "sunrise-libuser 0.1.0", "sunrise-libutils 0.1.0", @@ -2136,7 +2136,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libkern 0.1.0", "sunrise-libuser 0.1.0", ] @@ -2148,7 +2148,7 @@ dependencies = [ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libuser 0.1.0", ] @@ -2159,7 +2159,7 @@ dependencies = [ "cargo-5730 0.1.0 (git+https://github.com/Thog/cargo-5730.git?branch=feature/windows-support)", "generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libtimezone 0.1.0", "sunrise-libuser 0.1.0", "sunrise-libutils 0.1.0", @@ -2171,7 +2171,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libuser 0.1.0", ] @@ -2185,7 +2185,7 @@ dependencies = [ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libkern 0.1.0", "sunrise-libuser 0.1.0", "sunrise-libutils 0.1.0", @@ -2197,7 +2197,7 @@ version = "0.1.0" dependencies = [ "bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sunrise-libuser 0.1.0", ] @@ -2976,8 +2976,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a" "checksum sha3 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26405905b6a56a94c60109cfda62610507ac14a65be531f5767dec5c5a8dd6a0" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +"checksum spin 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef7b840d5ef62f81f50649ade37112748461256c64a70bccefeabb4d02c515c5" "checksum spinning_top 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32d801a3a53bcf5071f85fef8d5cab9e5f638fc5580a37e6eb7aba4b37438d24" "checksum static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4f8de36da215253eb5f24020bfaa0646613b48bf7ebe36cdfa37c3b3b33b241" "checksum storage_device 1.0.0 (git+https://github.com/sunriseos/storage_device.git)" = "" diff --git a/ahci/Cargo.toml b/ahci/Cargo.toml index 235969f3d..763d9838a 100644 --- a/ahci/Cargo.toml +++ b/ahci/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] sunrise-libuser = { path = "../libuser" } sunrise-libutils = { path = "../libutils" } -spin = "0.5" +spin = "0.6" log = "0.4.6" bitfield = "0.13" diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml index 4f2c298dd..39d97e644 100644 --- a/bootstrap/Cargo.toml +++ b/bootstrap/Cargo.toml @@ -10,7 +10,7 @@ sunrise-libutils = { path = "../libutils" } bit_field = "0.10.0" bitflags = "1.1" multiboot2 = { git = "https://github.com/sunriseos/multiboot2-elf64.git" } -spin = "0.5.1" +spin = "0.6.0" xmas-elf = "0.7.0" [dependencies.smallvec] diff --git a/fs/Cargo.toml b/fs/Cargo.toml index 3ff733927..e175614ce 100644 --- a/fs/Cargo.toml +++ b/fs/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" bitflags = "1.0" sunrise-libuser = { path = "../libuser" } sunrise-libutils = { path = "../libutils" } -spin = "0.4" +spin = "0.6" log = "0.4.6" storage_device = { git = "https://github.com/sunriseos/storage_device.git", default-features = false, features = ["cached-block-device-nightly", "alloc"] } libfat = { git = "https://github.com/sunriseos/libfat.git" } diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 653c4cf72..043895b2e 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -18,7 +18,7 @@ sunrise-libkern = { path = "../libkern" } bit_field = "0.10.0" bitflags = "1.1" multiboot2 = { git = "https://github.com/sunriseos/multiboot2-elf64.git" } -spin = "0.5" +spin = "0.6" linked_list_allocator = "0.8.4" log = "0.4.6" xmas-elf = "0.7.0" diff --git a/keyboard/Cargo.toml b/keyboard/Cargo.toml index 8db963a2e..0e13e2aaf 100644 --- a/keyboard/Cargo.toml +++ b/keyboard/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] generic-array = "0.13.0" arrayvec = {version = "0.4", default-features = false} -spin = "0.5" +spin = "0.6" log = "0.4.6" sunrise-libuser = { path = "../libuser" } sunrise-libutils = { path = "../libutils" } diff --git a/libuser/Cargo.toml b/libuser/Cargo.toml index c8b3fb44e..797d67372 100644 --- a/libuser/Cargo.toml +++ b/libuser/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" linked_list_allocator = "0.8.4" bitfield = "0.13" bit_field = "0.10" -spin = "0.5" +spin = "0.6" sunrise-libutils = { path = "../libutils" } sunrise-libkern = { path = "../libkern" } failure = { version = "0.1", default-features = false } diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 48c2088af..8c03cbbcd 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -10,7 +10,7 @@ sunrise-libkern = { path = "../libkern" } sunrise-libutils = { path = "../libutils" } log = "0.4" xmas-elf = "0.7.0" -spin = "0.5.2" +spin = "0.6.0" [dependencies.lazy_static] features = ["spin_no_std"] diff --git a/shell/Cargo.toml b/shell/Cargo.toml index 7eb8981e6..21f417cc5 100644 --- a/shell/Cargo.toml +++ b/shell/Cargo.toml @@ -10,7 +10,7 @@ gif = { git = "https://github.com/SunriseOS/image-gif" } log = "0.4.6" sunrise-libuser = { path = "../libuser" } sunrise-libkern = { path = "../libkern" } -spin = "0.5" +spin = "0.6" bstr = { version = "0.2", default-features = false } sha1 = { version = "0.6.0", default-features = false } hex = { git = "https://github.com/KokaKiwi/rust-hex", default-features = false } diff --git a/sm/Cargo.toml b/sm/Cargo.toml index ea110227e..6095e7974 100644 --- a/sm/Cargo.toml +++ b/sm/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] sunrise-libuser = { path = "../libuser" } -spin = "0.5" +spin = "0.6" log = "0.4" [dependencies.hashbrown] diff --git a/time/Cargo.toml b/time/Cargo.toml index 970aa6ddf..fbdb8a468 100644 --- a/time/Cargo.toml +++ b/time/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] generic-array = "0.13.0" -spin = "0.5" +spin = "0.6" log = "0.4.6" sunrise-libuser = { path = "../libuser" } sunrise-libutils = { path = "../libutils" } diff --git a/twili/Cargo.toml b/twili/Cargo.toml index 502847e98..5dd0db15b 100644 --- a/twili/Cargo.toml +++ b/twili/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" [dependencies] sunrise-libuser = { path = "../libuser" } -spin = "0.5" +spin = "0.6" log = "0.4" lazy_static = { version = "1.3.0", features = ["spin_no_std"] } \ No newline at end of file diff --git a/vi/Cargo.toml b/vi/Cargo.toml index 40545700b..f2e599001 100644 --- a/vi/Cargo.toml +++ b/vi/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" sunrise-libuser = { path = "../libuser" } sunrise-libkern = { path = "../libkern" } sunrise-libutils = { path = "../libutils" } -spin = "0.5" +spin = "0.6" futures-preview = { version = "0.3.0-alpha.16", default-features = false, features = ["nightly", "alloc"] } font-rs = { git = "https://github.com/SunriseOS/font-rs", default-features = false } log = "0.4" diff --git a/wall-clock/Cargo.toml b/wall-clock/Cargo.toml index 1ee51a5b7..febc3d5bf 100644 --- a/wall-clock/Cargo.toml +++ b/wall-clock/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" [dependencies] sunrise-libuser = { path = "../libuser" } log = "0.4.6" -spin = "0.5" +spin = "0.6" bstr = { version = "0.2", default-features = false }