Skip to content

Commit

Permalink
Merge pull request #855 from andrewdavidmackenzie/remove_no_std
Browse files Browse the repository at this point in the history
Remove no_std feature
  • Loading branch information
andrewdavidmackenzie authored Feb 11, 2025
2 parents 21c6329 + 0ad0415 commit 484d55b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 14 deletions.
6 changes: 2 additions & 4 deletions pigdef/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ exclude.workspace = true
rust-version.workspace = true

[features]
default = ["std"]
default = ["dep:heapless", "dep:embassy-time"]
tcp = []
discovery = []
no_std = ["dep:heapless", "dep:embassy-time"]
usb = []
iroh = []
std = ["serde/std"]
Expand All @@ -33,5 +32,4 @@ tempfile = "3"

[package.metadata.cargo-all-features]
skip_optional_dependencies = true
always_include_features = ["std"]
denylist = ["no_std"]
always_include_features = ["std"]
4 changes: 1 addition & 3 deletions piggui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ default = ["iroh", "tcp", "usb", "discovery"]
iroh = ["pigdef/iroh", "pignet/iroh", "dep:iroh"]
tcp = ["pigdef/tcp", "pignet/tcp"]
discovery = ["pigdef/discovery", "pignet/discovery", "dep:mdns-sd"]
no_std = []
usb = ["pigdef/usb", "pignet/usb"]

[dependencies]
pigdef = { path = "../pigdef" }
pigdef = { path = "../pigdef", default-features = false, features = ["std"] }
pignet = { path = "../pignet" }
pigpio = { path = "../pigpio" }

Expand Down Expand Up @@ -78,7 +77,6 @@ iced = { version = "0.13.1", default-features = false, features = ["tokio", "wgp

[package.metadata.cargo-all-features]
skip_optional_dependencies = true
denylist = ["no_std"]

[package.metadata.docs.rs]
features = ["iroh", "tcp"]
Expand Down
4 changes: 1 addition & 3 deletions piglet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ default = ["iroh", "tcp", "discovery"]
tcp = ["pigdef/tcp", "dep:portpicker", "dep:local-ip-address"]
discovery = ["pigdef/discovery", "dep:mdns-sd"]
iroh = ["pigdef/iroh", "dep:iroh", "dep:rand"]
no_std = []
usb = ["pigdef/usb"]

[dependencies]
pigdef = { path = "../pigdef" }
pigdef = { path = "../pigdef", default-features = false, features = ["std"] }
pigpio = { path = "../pigpio" }

# for alloc/no_alloc over the wire serialization/deserialization
Expand Down Expand Up @@ -65,7 +64,6 @@ pignet = { version = "0.6", path = "../pignet" }

[package.metadata.cargo-all-features]
skip_optional_dependencies = true
denylist = ["no_std"]

[package.metadata.docs.rs]
features = ["iroh", "tcp"]
Expand Down
3 changes: 1 addition & 2 deletions pignet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ default = []
iroh = ["pigdef/iroh", "dep:iroh", "dep:rand"]
tcp = ["pigdef/tcp"]
discovery = ["pigdef/discovery"]
no_std = []
usb = ["pigdef/usb", "dep:nusb", "dep:tokio", "dep:serde"]

[dependencies]
pigdef = { path = "../pigdef" }
pigdef = { path = "../pigdef", default-features = false, features = ["std"] }

postcard = { version = "1.1.1", features = ["alloc"] }
anyhow = "1.0.95"
Expand Down
2 changes: 1 addition & 1 deletion pigpio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude.workspace = true
rust-version.workspace = true

[dependencies]
pigdef = { path = "../pigdef" }
pigdef = { path = "../pigdef", default-features = false, features = ["std"] }

[target.'cfg(not(all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm"), target_env = "gnu")))'.dependencies]
rand = { version = "0.8.5", default-features = false, features = ["std", "std_rng"] }
Expand Down
2 changes: 1 addition & 1 deletion porky/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ discovery = ["pigdef/discovery", "dep:edge-mdns", "dep:edge-nal-embassy", "dep:e
tcp = ["pigdef/tcp", "dep:embassy-net"]

[dependencies]
pigdef = { path = "../pigdef", default-features = false, features = ["no_std"] }
pigdef = { path = "../pigdef" }

# Embassy Dependencies (crates in https://github.com/embassy-rs/embassy)
embassy-time = { version = "0.4.0", default-features = false, features = ["defmt", "defmt-timestamp-uptime"] }
Expand Down

0 comments on commit 484d55b

Please sign in to comment.