Cleanup some misc Cargo.toml funk across the project #379
+16
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
acmorrow
commented
Jan 9, 2025
| @@ -24,7 +24,6 @@ edition = "2021" | |||
| license = "AGPL-3.0" | |||
| repository = "https://github.com/viamrobotics/micro-rdk" | |||
| version = "0.4.0-rc2" | |||
| # TODO(RSDK-8992): Upgrade rust to latest esp-rs version | |||
There was a problem hiding this comment.
I forgot to remove this TODO when I did the ticket, here and elsewhere.
Comment on lines
+49
to
+52
| axum = "0.7.9" | ||
| axum-extra = "0.9.6" | ||
| base64 = "0.22.1" | ||
| bincode = "2.0.0-rc.3" |
There was a problem hiding this comment.
These were explicitly in a lower level Cargo.toml but belonged up here.
| dialoguer = "0.11.0" | ||
| dns-message-parser = { version = "0.7", default-features = false} |
There was a problem hiding this comment.
Here to EOF is just sorting nits.
| @@ -9,11 +9,11 @@ version.workspace = true | |||
| rust-version.workspace = true | |||
|
|
|||
| [dependencies] | |||
| axum = {version = "0.7.9", features = ["http2"]} | |||
| axum-extra = "0.9.6" | |||
| axum = { workspace = true, features = ["http2"]} | |||
There was a problem hiding this comment.
This is what prompted this change.
Comment on lines
+17
to
+19
| tower.workspace = true | ||
| tracing-subscriber.workspace = true | ||
| tracing.workspace = true |
| @@ -27,7 +27,6 @@ embedded-svc.workspace = true | |||
| futures-lite.workspace = true | |||
| micro-rdk = { workspace = true, features = ["esp32", "data", "data-upload-hook-unstable"], default-features = true } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Extra blank line, here and next hunk.
| env_logger.workspace = true | ||
| rustls = { workspace = true, features = ["dangerous_configuration"] } | ||
| test-log.workspace = true |
|
|
||
| [target.'cfg(not(target_os = "espidf"))'.dependencies] | ||
| async-std-openssl = { workspace = true, optional = true } | ||
| bincode.workspace = true |
There was a problem hiding this comment.
Version form moved up to workspace Cargo.toml
Comment on lines
+28
to
+34
| embedded-hal = { version = "~0.2", features = ["unproven"]} | ||
| embedded-svc = "0.27" | ||
| futures-lite = "2" | ||
| log = "0.4" | ||
|
|
||
| [build-dependencies] | ||
| cargo_metadata = "0.18" | ||
| cargo_metadata = "0.19" |
There was a problem hiding this comment.
Sorting, and some version drift against the ones that are in the worskpace Cargo.toml was removed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Noticed some explicit dependencies in non-root Cargo.toml, so fixed that and hunted down some other small inconsistencies and stale TODOs. No urgency on this, not trying to make 0.4.0 with it, but I would like to get it landed after 0.4.0 as it'll go stale quickly.