From c95d4c1d7926729ec04f11821bcc2b5c3283c9a0 Mon Sep 17 00:00:00 2001 From: alexmoon Date: Wed, 13 Jul 2022 15:27:22 -0400 Subject: Update to 2021 edition --- Cargo.toml | 2 -- examples/Cargo.toml | 2 +- nrf-softdevice-defmt-rtt/Cargo.toml | 2 +- nrf-softdevice-gen/Cargo.toml | 2 +- nrf-softdevice-macro/Cargo.toml | 2 +- nrf-softdevice-macro/src/lib.rs | 2 -- nrf-softdevice-mbr/Cargo.toml | 2 +- nrf-softdevice-s112/Cargo.toml | 2 +- nrf-softdevice-s113/Cargo.toml | 2 +- nrf-softdevice-s122/Cargo.toml | 2 +- nrf-softdevice-s132/Cargo.toml | 2 +- nrf-softdevice-s140/Cargo.toml | 2 +- nrf-softdevice/Cargo.toml | 2 +- nrf-softdevice/src/ble/gatt_server/builder.rs | 1 - nrf-softdevice/src/ble/gatt_server/characteristic.rs | 2 -- nrf-softdevice/src/ble/gatt_traits.rs | 1 - nrf-softdevice/src/events.rs | 1 - 17 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 173b396..3debfa0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["resolver"] - [workspace] resolver = "2" members = [ diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 5494c70..468547f 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Dario Nieuwenhuis "] -edition = "2018" +edition = "2021" name = "nrf-softdevice-examples" version = "0.1.0" diff --git a/nrf-softdevice-defmt-rtt/Cargo.toml b/nrf-softdevice-defmt-rtt/Cargo.toml index e847a72..df812b5 100644 --- a/nrf-softdevice-defmt-rtt/Cargo.toml +++ b/nrf-softdevice-defmt-rtt/Cargo.toml @@ -2,7 +2,7 @@ authors = ["The Knurling-rs developers"] categories = ["embedded", "no-std"] description = "Transmit defmt log messages over the RTT (Real-Time Transfer) protocol" -edition = "2018" +edition = "2021" keywords = ["knurling", "defmt", "defmt-transport"] license = "MIT OR Apache-2.0" name = "nrf-softdevice-defmt-rtt" diff --git a/nrf-softdevice-gen/Cargo.toml b/nrf-softdevice-gen/Cargo.toml index e115dc4..ca12c89 100644 --- a/nrf-softdevice-gen/Cargo.toml +++ b/nrf-softdevice-gen/Cargo.toml @@ -2,7 +2,7 @@ name = "nrf-softdevice-gen" version = "0.1.0" authors = ["Dario Nieuwenhuis "] -edition = "2018" +edition = "2021" [dependencies] bindgen = "0.55.1" diff --git a/nrf-softdevice-macro/Cargo.toml b/nrf-softdevice-macro/Cargo.toml index 81bbba8..ec14850 100644 --- a/nrf-softdevice-macro/Cargo.toml +++ b/nrf-softdevice-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "nrf-softdevice-macro" version = "0.1.0" authors = ["Dario Nieuwenhuis "] -edition = "2018" +edition = "2021" [dependencies] syn = { version = "1.0.39", features = ["full", "extra-traits"] } diff --git a/nrf-softdevice-macro/src/lib.rs b/nrf-softdevice-macro/src/lib.rs index cf324e1..f4bf13b 100644 --- a/nrf-softdevice-macro/src/lib.rs +++ b/nrf-softdevice-macro/src/lib.rs @@ -2,8 +2,6 @@ extern crate proc_macro; -use std::iter::FromIterator; - use darling::FromMeta; use proc_macro::TokenStream; use proc_macro2::{Span, TokenStream as TokenStream2}; diff --git a/nrf-softdevice-mbr/Cargo.toml b/nrf-softdevice-mbr/Cargo.toml index 40b6540..f628831 100644 --- a/nrf-softdevice-mbr/Cargo.toml +++ b/nrf-softdevice-mbr/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["arm", "cortex-m", "nrf52", "nrf-softdevice"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice-s112/Cargo.toml b/nrf-softdevice-s112/Cargo.toml index 59fbbb0..d33f5e7 100644 --- a/nrf-softdevice-s112/Cargo.toml +++ b/nrf-softdevice-s112/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cortex-m", "nrf52", "nrf-softdevice", "bluetooth", "ble"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice-s113/Cargo.toml b/nrf-softdevice-s113/Cargo.toml index 23bbea3..37092f3 100644 --- a/nrf-softdevice-s113/Cargo.toml +++ b/nrf-softdevice-s113/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cortex-m", "nrf52", "nrf-softdevice", "bluetooth", "ble"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice-s122/Cargo.toml b/nrf-softdevice-s122/Cargo.toml index eceecf4..834be57 100644 --- a/nrf-softdevice-s122/Cargo.toml +++ b/nrf-softdevice-s122/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cortex-m", "nrf52", "nrf-softdevice", "bluetooth", "ble"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice-s132/Cargo.toml b/nrf-softdevice-s132/Cargo.toml index a634623..85e99f7 100644 --- a/nrf-softdevice-s132/Cargo.toml +++ b/nrf-softdevice-s132/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cortex-m", "nrf52", "nrf-softdevice", "bluetooth", "ble"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice-s140/Cargo.toml b/nrf-softdevice-s140/Cargo.toml index 604dd6b..6a1bafc 100644 --- a/nrf-softdevice-s140/Cargo.toml +++ b/nrf-softdevice-s140/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/embassy-rs/nrf-softdevice" categories = ["embedded", "hardware-support", "no-std"] keywords = ["cortex-m", "nrf52", "nrf-softdevice", "bluetooth", "ble"] license-file = "LICENSE-NORDIC" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["thumbv7em-none-eabihf"] diff --git a/nrf-softdevice/Cargo.toml b/nrf-softdevice/Cargo.toml index 71b73de..9b7df74 100644 --- a/nrf-softdevice/Cargo.toml +++ b/nrf-softdevice/Cargo.toml @@ -2,7 +2,7 @@ name = "nrf-softdevice" version = "0.1.0" authors = ["Dario Nieuwenhuis "] -edition = "2018" +edition = "2021" [features] diff --git a/nrf-softdevice/src/ble/gatt_server/builder.rs b/nrf-softdevice/src/ble/gatt_server/builder.rs index 4d40258..e439de9 100644 --- a/nrf-softdevice/src/ble/gatt_server/builder.rs +++ b/nrf-softdevice/src/ble/gatt_server/builder.rs @@ -1,6 +1,5 @@ #![allow(dead_code)] -use core::convert::TryInto; use core::marker::PhantomData; use core::mem; use core::ptr::null; diff --git a/nrf-softdevice/src/ble/gatt_server/characteristic.rs b/nrf-softdevice/src/ble/gatt_server/characteristic.rs index 6bc33c2..cdc44a1 100644 --- a/nrf-softdevice/src/ble/gatt_server/characteristic.rs +++ b/nrf-softdevice/src/ble/gatt_server/characteristic.rs @@ -1,5 +1,3 @@ -use core::convert::TryInto; - use crate::ble::SecurityMode; use crate::raw; diff --git a/nrf-softdevice/src/ble/gatt_traits.rs b/nrf-softdevice/src/ble/gatt_traits.rs index 2b27f8f..c2969c8 100644 --- a/nrf-softdevice/src/ble/gatt_traits.rs +++ b/nrf-softdevice/src/ble/gatt_traits.rs @@ -1,4 +1,3 @@ -use core::convert::TryInto; use core::{mem, slice}; use heapless::{String, Vec}; diff --git a/nrf-softdevice/src/events.rs b/nrf-softdevice/src/events.rs index c9d4362..dd60c64 100644 --- a/nrf-softdevice/src/events.rs +++ b/nrf-softdevice/src/events.rs @@ -1,4 +1,3 @@ -use core::convert::TryFrom; use core::mem::MaybeUninit; use core::task::Poll; -- cgit v1.2.3