Merge branch 'upgrade-spin' into 'main'

upgrade to latest spin crate and add to workspace

See merge request redox-os/base!196

Cargo.lock

@@ -14,7 +14,7 @@ dependencies = [
  "redox-scheme",
  "redox_event",
  "redox_syscall 0.7.3",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1043,7 +1043,7 @@ dependencies = [
  "redox-scheme",
  "redox_event",
  "redox_syscall 0.7.3",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1976,7 +1976,7 @@ dependencies = [
  "redox-scheme",
  "redox_event",
  "redox_syscall 0.7.3",
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -2143,15 +2143,6 @@ dependencies = [
  "managed",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
 [[package]]
 name = "spin"
 version = "0.10.0"
@@ -2475,7 +2466,7 @@ dependencies = [
  "pcid",
  "redox_event",
  "redox_syscall 0.7.3",
- "spin 0.10.0",
+ "spin",
  "static_assertions",
  "thiserror 1.0.69",
  "virtio-core",
@@ -2514,7 +2505,7 @@ dependencies = [
  "pcid",
  "redox_event",
  "redox_syscall 0.7.3",
- "spin 0.9.8",
+ "spin",
  "static_assertions",
  "virtio-core",
 ]

Cargo.toml

@@ -100,6 +100,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 slab = "0.4.9"
 smallvec = "1"
+spin = "0.10"
 static_assertions = "1.1.0"
 toml = "1"
 

drivers/audio/ac97d/Cargo.toml

@@ -10,7 +10,7 @@ libredox.workspace = true
 log.workspace = true
 redox_event.workspace = true
 redox_syscall.workspace = true
-spin = "0.9"
+spin.workspace = true
 
 daemon = { path = "../../../daemon" }
 pcid = { path = "../../pcid" }

drivers/audio/ihdad/Cargo.toml

@@ -10,7 +10,7 @@ libredox.workspace = true
 log.workspace = true
 redox_event.workspace = true
 redox_syscall.workspace = true
-spin = "0.9"
+spin.workspace = true
 
 common = { path = "../../common" }
 daemon = { path = "../../../daemon" }

drivers/audio/sb16d/Cargo.toml

@@ -12,7 +12,7 @@ log.workspace = true
 daemon = { path = "../../../daemon" }
 redox_event.workspace = true
 redox_syscall.workspace = true
-spin = "0.9"
+spin.workspace = true
 redox-scheme.workspace = true
 
 [lints]

drivers/graphics/virtio-gpud/Cargo.toml

@@ -21,7 +21,7 @@ pcid = { path = "../../pcid" }
 redox_event.workspace = true
 redox_syscall.workspace = true
 orbclient.workspace = true
-spin = "0.9.8"
+spin.workspace = true
 libredox.workspace = true
 
 [lints]

drivers/storage/virtio-blkd/Cargo.toml

@@ -11,7 +11,7 @@ log.workspace = true
 thiserror = "1.0.40"
 static_assertions.workspace = true
 futures = { version = "0.3.28", features = ["executor"] }
-spin = "*"
+spin.workspace = true
 
 redox_event.workspace = true
 redox_syscall = { workspace = true, features = ["std"] }