NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove cargo namespaced-features

Browse source
This commit is contained in:
Dario Nieuwenhuis 2021-03-02 21:14:58 +01:00
parent 7991b05e4c
commit d4f2c6cf00
9 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.cargo/config
View file

@ -1,2 +0,0 @@
[unstable]
namespaced-features = true

2
.github/workflows/rust.yml vendored
View file

@ -22,4 +22,4 @@ jobs:
components: rust-src components: rust-src
override: true override: true
- name: Build - name: Build
run: ./test-build.sh run: ./ci.sh

0
test-build.sh → ci.sh
View file

1
embassy-nrf-examples/.cargo/config
View file

@ -1,5 +1,4 @@
[unstable] [unstable]
namespaced-features = true
build-std = ["core"] build-std = ["core"]
build-std-features = ["panic_immediate_abort"] build-std-features = ["panic_immediate_abort"]

1
embassy-nrf-examples/Cargo.toml
View file

@ -18,6 +18,7 @@ defmt-error = []
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] } embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] }
embassy-traits = { version = "0.1.0", path = "../embassy-traits", features = ["defmt"] }
embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "defmt-trace", "52840"] } embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "defmt-trace", "52840"] }
defmt = "0.2.0" defmt = "0.2.0"

2
embassy-nrf/src/gpiote.rs
View file

@ -4,8 +4,8 @@ use core::ops::Deref;
use core::pin::Pin; use core::pin::Pin;
use core::ptr; use core::ptr;
use core::task::{Context, Poll}; use core::task::{Context, Poll};
use embassy::traits::gpio::{WaitForHigh, WaitForLow};
use embassy::interrupt::InterruptExt; use embassy::interrupt::InterruptExt;
use embassy::traits::gpio::{WaitForHigh, WaitForLow};
use embassy::util::Signal; use embassy::util::Signal;
use crate::hal::gpio::{Input, Level, Output, Pin as GpioPin, Port}; use crate::hal::gpio::{Input, Level, Output, Pin as GpioPin, Port};

1
embassy-stm32f4-examples/Cargo.toml
View file

@ -18,6 +18,7 @@ defmt-error = []
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] } embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] }
embassy-traits = { version = "0.1.0", path = "../embassy-traits", features = ["defmt"] }
embassy-stm32f4 = { version = "*", path = "../embassy-stm32f4", features = ["stm32f401"] } embassy-stm32f4 = { version = "*", path = "../embassy-stm32f4", features = ["stm32f401"] }
defmt = "0.2.0" defmt = "0.2.0"

10
embassy-traits/Cargo.toml
View file

@ -4,14 +4,8 @@ version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"] authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018" edition = "2018"
[dependencies]
defmt = { version = "0.2.0", optional = true }
[features] [features]
std = [] std = []
defmt-trace = [] [dependencies]
defmt-debug = [] defmt = { version = "0.2.0", optional = true }
defmt-info = []
defmt-warn = []
defmt-error = []

12
embassy/Cargo.toml
View file

@ -6,12 +6,12 @@ edition = "2018"
[features] [features]
std = ["futures/std", "embassy-traits/std"] std = ["futures/std", "embassy-traits/std"]
defmt = ["embassy-traits/defmt", "dep:defmt"]
defmt-trace = ["embassy-traits/defmt-trace"] defmt-trace = []
defmt-debug = ["embassy-traits/defmt-debug"] defmt-debug = []
defmt-info = ["embassy-traits/defmt-info"] defmt-info = []
defmt-warn = ["embassy-traits/defmt-warn"] defmt-warn = []
defmt-error = ["embassy-traits/defmt-error"] defmt-error = []
[dependencies] [dependencies]
defmt = { version = "0.2.0", optional = true } defmt = { version = "0.2.0", optional = true }