Merge branch 'serde-toml' into 'main'
make serde and toml workspace dependencies See merge request redox-os/base!139
This commit is contained in:
@@ -85,6 +85,8 @@ redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-fe
|
||||
redox-scheme = "0.9.1"
|
||||
redox_syscall = "0.7.1"
|
||||
redox_termios = "0.1.3"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
toml = "1"
|
||||
|
||||
[workspace.lints.clippy]
|
||||
precedence = "deny"
|
||||
|
||||
@@ -19,7 +19,7 @@ rustc-hash = "1.1.0"
|
||||
thiserror = "1"
|
||||
ron = "0.8.1"
|
||||
arrayvec = "0.7.6"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde.workspace = true
|
||||
|
||||
amlserde = { path = "../amlserde" }
|
||||
common = { path = "../common" }
|
||||
|
||||
@@ -10,5 +10,5 @@ edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
acpi = { git = "https://github.com/jackpot51/acpi.git" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
toml = "1"
|
||||
serde.workspace = true
|
||||
toml.workspace = true
|
||||
|
||||
@@ -10,8 +10,8 @@ anyhow.workspace = true
|
||||
log.workspace = true
|
||||
pico-args = "0.5"
|
||||
redox_syscall.workspace = true
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
toml = "1"
|
||||
serde.workspace = true
|
||||
toml.workspace = true
|
||||
|
||||
config = { path = "../../config" }
|
||||
common = { path = "../common" }
|
||||
|
||||
@@ -21,7 +21,7 @@ pico-args = { version = "0.5", features = ["combined-flags"] }
|
||||
plain = "0.2"
|
||||
redox-scheme.workspace = true
|
||||
redox_syscall.workspace = true
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde.workspace = true
|
||||
|
||||
common = { path = "../common" }
|
||||
daemon = { path = "../../daemon" }
|
||||
|
||||
@@ -22,11 +22,11 @@ log.workspace = true
|
||||
redox_event.workspace = true
|
||||
redox-scheme.workspace = true
|
||||
redox_syscall.workspace = true
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde.workspace = true
|
||||
serde_json = "1"
|
||||
smallvec = { version = "1", features = ["serde"] }
|
||||
thiserror = "1"
|
||||
toml = "1"
|
||||
toml.workspace = true
|
||||
|
||||
common = { path = "../../common" }
|
||||
daemon = { path = "../../../daemon" }
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@ license = "MIT"
|
||||
|
||||
[dependencies]
|
||||
libredox.workspace = true
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde.workspace = true
|
||||
serde_json = "1"
|
||||
toml = "1"
|
||||
toml.workspace = true
|
||||
|
||||
config = { path = "../config" }
|
||||
daemon = { path = "../daemon" }
|
||||
|
||||
Reference in New Issue
Block a user