mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/serde_keyvalue/Cargo.toml

21 lines
525 B
TOML
Raw Normal View History

add serde_keyvalue crate Add a crate for deserializing command-line options given as key-values. This crate leverages serde to deserialize key-value argument strings (a commonly used pattern in crosvm) into configuration structures. This will allow us to remove a big part of the manual parsing currently done in `main.rs`, will provide consistent arguments to the `crosvm run` and `crosvm device` commands, and results in more precise error reporting. The use of serde will also allow us to similarly deserialize configuration structures from configuration files with very little extra code involved. As explained in the crate's documentation, its main entry point is a `from_key_values` function that allows a build a struct implementing serde's `Deserialize` trait from a key/values string. In order to integrate transparently with `argh`, there is also a `FromKeyValue` derive macro that automatically implements `FromArgValue` for structs deriving from it. BUG=b:218223240 BUG=b:217480043 TEST=cargo build TEST=cargo test -p serde_keyvalue Change-Id: Id6316e40150d5f08a05e6f04e39ecbc73d72dfa0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3439669 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Anton Romanov <romanton@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
2022-02-03 10:39:10 +00:00
[package]
name = "serde_keyvalue"
version = "0.1.0"
Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
add serde_keyvalue crate Add a crate for deserializing command-line options given as key-values. This crate leverages serde to deserialize key-value argument strings (a commonly used pattern in crosvm) into configuration structures. This will allow us to remove a big part of the manual parsing currently done in `main.rs`, will provide consistent arguments to the `crosvm run` and `crosvm device` commands, and results in more precise error reporting. The use of serde will also allow us to similarly deserialize configuration structures from configuration files with very little extra code involved. As explained in the crate's documentation, its main entry point is a `from_key_values` function that allows a build a struct implementing serde's `Deserialize` trait from a key/values string. In order to integrate transparently with `argh`, there is also a `FromKeyValue` derive macro that automatically implements `FromArgValue` for structs deriving from it. BUG=b:218223240 BUG=b:217480043 TEST=cargo build TEST=cargo test -p serde_keyvalue Change-Id: Id6316e40150d5f08a05e6f04e39ecbc73d72dfa0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3439669 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Anton Romanov <romanton@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
2022-02-03 10:39:10 +00:00
edition = "2021"
[features]
argh_derive = ["argh", "serde_keyvalue_derive"]
[dependencies]
argh = { version = "0.1.7", optional = true }
Adding missing `# provided by ebuild` to Cargo.tomls cros_async and by extension serde_keyvalue are needed on ChromeOS, so add the `# provided by ebuild` comments where appropriate to make it possible to uprev cros_async (which requires pulling in serde_keyvalue). BUG=b:250883877 TEST=kokoro passes Change-Id: I423cac0c4e5e30afac058b914358caca7d27edbf Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3953082 Auto-Submit: Allen Webb <allenwebb@google.com> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2022-10-13 19:16:21 +00:00
serde_keyvalue_derive = { path = "serde_keyvalue_derive", optional = true } # provided by ebuild
add serde_keyvalue crate Add a crate for deserializing command-line options given as key-values. This crate leverages serde to deserialize key-value argument strings (a commonly used pattern in crosvm) into configuration structures. This will allow us to remove a big part of the manual parsing currently done in `main.rs`, will provide consistent arguments to the `crosvm run` and `crosvm device` commands, and results in more precise error reporting. The use of serde will also allow us to similarly deserialize configuration structures from configuration files with very little extra code involved. As explained in the crate's documentation, its main entry point is a `from_key_values` function that allows a build a struct implementing serde's `Deserialize` trait from a key/values string. In order to integrate transparently with `argh`, there is also a `FromKeyValue` derive macro that automatically implements `FromArgValue` for structs deriving from it. BUG=b:218223240 BUG=b:217480043 TEST=cargo build TEST=cargo test -p serde_keyvalue Change-Id: Id6316e40150d5f08a05e6f04e39ecbc73d72dfa0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3439669 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Anton Romanov <romanton@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
2022-02-03 10:39:10 +00:00
serde = "1"
thiserror = { version = "1.0.20" }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
remain = "0.2"
serde_keyvalue: parse hex, octal, and binary nums This adds support for parsing hex `m=0x1234abcd` octal `0o755` and binary `m=0o1100` values according the their prefix. Negative numbers can also be specified by adding a `-` after the prefix. Note that negative values like `m=-0x1234` don't work, largely as an artifact of the way the Num trait works. This could probably be fixed, but given hex, octal, and binary numbers tend to be used in unsigned situations most of the time this shouldn't be an issue. The main motivation for this is the debugcon serial device, which accepts an argument which is an x86 IO port. These are much more naturally described in hex. BUG=b:233610263 Change-Id: Ic68bacd772de6aebfaad0de7b8aa6faf5d4c1555 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3671595 Commit-Queue: Mike Gerow <gerow@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2022-05-26 19:55:44 +00:00
num-traits = "0.2"
serde_keyvalue: use nom crate for parsing Use the nom crate for parsing. This will arguably be both simpler to read and more reliable than our current ad-hoc parser. Add a few extra tests to enforce the new rules that the new parser is supposed to enforce. BUG=b:218223240 TEST=cargo test -p serde_keyvalues -p crosvm TEST=ARCVM starts successfully. Change-Id: I4ea188ffe8aee872071c900793c50127855403ec Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3822428 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Alexandre Courbot <acourbot@chromium.org> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
2022-08-10 02:25:02 +00:00
nom = { version = "7.1.0", features = ["alloc"] }
add serde_keyvalue crate Add a crate for deserializing command-line options given as key-values. This crate leverages serde to deserialize key-value argument strings (a commonly used pattern in crosvm) into configuration structures. This will allow us to remove a big part of the manual parsing currently done in `main.rs`, will provide consistent arguments to the `crosvm run` and `crosvm device` commands, and results in more precise error reporting. The use of serde will also allow us to similarly deserialize configuration structures from configuration files with very little extra code involved. As explained in the crate's documentation, its main entry point is a `from_key_values` function that allows a build a struct implementing serde's `Deserialize` trait from a key/values string. In order to integrate transparently with `argh`, there is also a `FromKeyValue` derive macro that automatically implements `FromArgValue` for structs deriving from it. BUG=b:218223240 BUG=b:217480043 TEST=cargo build TEST=cargo test -p serde_keyvalue Change-Id: Id6316e40150d5f08a05e6f04e39ecbc73d72dfa0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3439669 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Anton Romanov <romanton@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
2022-02-03 10:39:10 +00:00
[dev-dependencies]
serde_keyvalue: parse hex, octal, and binary nums This adds support for parsing hex `m=0x1234abcd` octal `0o755` and binary `m=0o1100` values according the their prefix. Negative numbers can also be specified by adding a `-` after the prefix. Note that negative values like `m=-0x1234` don't work, largely as an artifact of the way the Num trait works. This could probably be fixed, but given hex, octal, and binary numbers tend to be used in unsigned situations most of the time this shouldn't be an issue. The main motivation for this is the debugcon serial device, which accepts an argument which is an x86 IO port. These are much more naturally described in hex. BUG=b:233610263 Change-Id: Ic68bacd772de6aebfaad0de7b8aa6faf5d4c1555 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3671595 Commit-Queue: Mike Gerow <gerow@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2022-05-26 19:55:44 +00:00
serde = { version = "1", features = ["derive"] }
Reference in a new issue Copy permalink