Skip to content

Commit ad2f0b9

Browse files
authored
Merge pull request #330 from barafael/rb/clippy-fixes
2 parents cab72b0 + 5749023 commit ad2f0b9

File tree

3 files changed

+46
-54
lines changed

3 files changed

+46
-54
lines changed

Cargo.toml

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ edition = "2021"
33
authors = [
44
"Dylan Frankland <dylan@frankland.io>",
55
"Sh3Rm4n <f.vioel@gmail.com>",
6-
"Jan Teske <jteske@posteo.net>"
6+
"Jan Teske <jteske@posteo.net>",
77
]
88
categories = ["embedded", "hardware-support", "no-std"]
99
description = "Peripheral access API for STM32F3 series microcontrollers"
@@ -14,74 +14,71 @@ readme = "README.md"
1414
repository = "https://github.com/stm32-rs/stm32f3xx-hal"
1515
documentation = "https://docs.rs/stm32f3xx-hal"
1616
version = "0.9.1"
17-
exclude = [
18-
"codegen",
19-
".markdownlint.yml"
20-
]
17+
exclude = ["codegen", ".markdownlint.yml"]
2118
resolver = "2"
2219
rust-version = "1.59"
2320

24-
[workspace]
25-
members = [
26-
".",
27-
"testsuite",
28-
"codegen"
29-
]
30-
3121
[package.metadata.docs.rs]
3222
features = ["stm32f303xc", "rt", "usb", "can", "enumset"]
3323
targets = ["thumbv7em-none-eabihf"]
3424
rustc-args = ["--cfg", "docsrs"]
3525

26+
[workspace]
27+
members = [".", "testsuite", "codegen"]
28+
3629
[dependencies]
30+
bxcan = { version = "0.7.0", optional = true }
3731
cfg-if = "1.0.0"
3832
cortex-m = "0.7.4"
3933
cortex-m-rt = "0.7.3"
4034
defmt = { version = ">=0.2.3, <0.4.0", optional = true }
4135
embedded-dma = "0.2.0"
4236
embedded-hal = { version = "0.2.5", features = ["unproven"] }
4337
embedded-time = "0.12.0"
38+
enumset = { version = "1.0.6", optional = true }
4439
nb = "1.0.0"
4540
paste = "1.0.5"
4641
rtcc = { version = "0.3.0", optional = true }
47-
stm32f3 = { version = "0.15.1", default-features = false }
48-
bxcan = { version = "0.7.0", optional = true }
4942
stm32-usbd = { version = "0.6.0", optional = true }
43+
stm32f3 = { version = "0.15.1", default-features = false }
5044
void = { version = "1.0.2", default-features = false }
51-
enumset = { version = "1.0.6", optional = true}
5245

5346
[dev-dependencies]
47+
cortex-m-rtic = "1.0"
5448
cortex-m-semihosting = "0.5.0"
5549
defmt = "0.3.0"
5650
defmt-rtt = "0.4.0"
5751
defmt-test = "0.3.0"
5852
panic-probe = "0.3.0"
59-
panic-semihosting = "0.6.0"
60-
usbd-serial = "0.1.1"
61-
usb-device = "0.2.8"
62-
cortex-m-rtic = "1.0"
63-
systick-monotonic = "1.0"
6453
panic-rtt-target = { version = "0.1", features = ["cortex-m"] }
54+
panic-semihosting = "0.6.0"
6555
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
56+
systick-monotonic = "1.0"
57+
usb-device = "0.2.8"
58+
usbd-serial = "0.1.1"
6659

6760
[build-dependencies]
6861
slice-group-by = "0.3.0"
6962

7063
[features]
64+
can = ["bxcan"]
7165
default = ["rt", "ld", "usb", "can", "rtc", "enumset"]
66+
defmt-debug = ["defmt"]
67+
68+
defmt-default = ["defmt"]
69+
defmt-error = ["defmt"]
70+
defmt-info = ["defmt"]
71+
defmt-trace = ["defmt"]
72+
defmt-warn = ["defmt"]
7273
device-selected = []
7374
direct-call-deprecated = []
74-
ld = []
75-
rt = ["stm32f3/rt"]
76-
can = ["bxcan"]
77-
usb = ["stm32-usbd"]
78-
rtc = ["rtcc"]
7975

80-
svd-f301 = ["stm32f3/stm32f301"]
81-
svd-f302 = ["stm32f3/stm32f302"]
82-
svd-f303 = ["stm32f3/stm32f303"]
83-
svd-f373 = ["stm32f3/stm32f373"]
84-
svd-f3x4 = ["stm32f3/stm32f3x4"]
76+
gpio-f302 = []
77+
gpio-f303 = []
78+
gpio-f303e = []
79+
gpio-f333 = []
80+
gpio-f373 = []
81+
ld = []
8582

8683
mem-4 = []
8784
mem-6 = []
@@ -90,20 +87,14 @@ mem-b = []
9087
mem-c = []
9188
mem-d = []
9289
mem-e = []
93-
94-
gpio-f302 = []
95-
gpio-f303 = []
96-
gpio-f303e = []
97-
gpio-f333 = []
98-
gpio-f373 = []
90+
rt = ["stm32f3/rt"]
91+
rtc = ["rtcc"]
9992

10093
# Any changes here should be mirrored in README.md, build.rs, src/lib.rs, and
10194
# .github/workflows/ci.yml.
10295
stm32f301 = ["svd-f301", "direct-call-deprecated"]
10396
stm32f301x6 = ["stm32f301", "mem-6", "gpio-f302", "device-selected"]
10497
stm32f301x8 = ["stm32f301", "mem-8", "gpio-f302", "device-selected"]
105-
stm32f318 = ["svd-f301", "direct-call-deprecated"]
106-
stm32f318x8 = ["stm32f318", "mem-8", "gpio-f302", "device-selected"]
10798
stm32f302 = ["svd-f302", "direct-call-deprecated"]
10899
stm32f302x6 = ["stm32f302", "mem-6", "gpio-f302", "device-selected"]
109100
stm32f302x8 = ["stm32f302", "mem-8", "gpio-f302", "device-selected"]
@@ -118,29 +109,31 @@ stm32f303xb = ["stm32f303", "mem-b", "gpio-f303", "device-selected"]
118109
stm32f303xc = ["stm32f303", "mem-c", "gpio-f303", "device-selected"]
119110
stm32f303xd = ["stm32f303", "mem-d", "gpio-f303e", "device-selected"]
120111
stm32f303xe = ["stm32f303", "mem-e", "gpio-f303e", "device-selected"]
112+
stm32f318 = ["svd-f301", "direct-call-deprecated"]
113+
stm32f318x8 = ["stm32f318", "mem-8", "gpio-f302", "device-selected"]
121114
stm32f328 = ["svd-f303", "direct-call-deprecated"]
122115
stm32f328x8 = ["stm32f328", "mem-8", "gpio-f333", "device-selected"]
116+
stm32f334 = ["svd-f3x4", "direct-call-deprecated"]
117+
stm32f334x4 = ["stm32f334", "mem-4", "gpio-f333", "device-selected"]
118+
stm32f334x6 = ["stm32f334", "mem-6", "gpio-f333", "device-selected"]
119+
stm32f334x8 = ["stm32f334", "mem-8", "gpio-f333", "device-selected"]
123120
stm32f358 = ["svd-f303", "direct-call-deprecated"]
124121
stm32f358xc = ["stm32f358", "mem-c", "gpio-f303", "device-selected"]
125-
stm32f398 = ["svd-f303", "direct-call-deprecated"]
126-
stm32f398xe = ["stm32f398", "mem-e", "gpio-f303e", "device-selected"]
127122
stm32f373 = ["svd-f373", "direct-call-deprecated"]
128123
stm32f373x8 = ["stm32f373", "mem-8", "gpio-f373", "device-selected"]
129124
stm32f373xb = ["stm32f373", "mem-b", "gpio-f373", "device-selected"]
130125
stm32f373xc = ["stm32f373", "mem-c", "gpio-f373", "device-selected"]
131126
stm32f378 = ["svd-f373", "direct-call-deprecated"]
132127
stm32f378xc = ["stm32f378", "mem-c", "gpio-f373", "device-selected"]
133-
stm32f334 = ["svd-f3x4", "direct-call-deprecated"]
134-
stm32f334x4 = ["stm32f334", "mem-4", "gpio-f333", "device-selected"]
135-
stm32f334x6 = ["stm32f334", "mem-6", "gpio-f333", "device-selected"]
136-
stm32f334x8 = ["stm32f334", "mem-8", "gpio-f333", "device-selected"]
128+
stm32f398 = ["svd-f303", "direct-call-deprecated"]
129+
stm32f398xe = ["stm32f398", "mem-e", "gpio-f303e", "device-selected"]
137130

138-
defmt-default = ["defmt"]
139-
defmt-trace = ["defmt"]
140-
defmt-debug = ["defmt"]
141-
defmt-info = ["defmt"]
142-
defmt-warn = ["defmt"]
143-
defmt-error = ["defmt"]
131+
svd-f301 = ["stm32f3/stm32f301"]
132+
svd-f302 = ["stm32f3/stm32f302"]
133+
svd-f303 = ["stm32f3/stm32f303"]
134+
svd-f373 = ["stm32f3/stm32f373"]
135+
svd-f3x4 = ["stm32f3/stm32f3x4"]
136+
usb = ["stm32-usbd"]
144137

145138
# cargo build/run
146139
[profile.dev]

src/serial.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ where
579579
///
580580
/// ## Embedded HAL
581581
///
582-
/// To have a more managed way to read from the serial use the [`embeded_hal::serial::Read`]
582+
/// To have a more managed way to read from the serial use the [`embedded_hal::serial::Read`]
583583
/// trait implementation.
584584
#[doc(alias = "RDR")]
585585
pub fn read_data_register(&self) -> Option<u8> {
@@ -947,7 +947,7 @@ where
947947
/// up to the interrupt handler.
948948
///
949949
/// To read out the content of the read register without internal error handling, use
950-
/// [`Serial::read()`].
950+
/// [`embedded_hal::serial::Read`].
951951
/// ...
952952
// -> According to this API it should be skipped.
953953
fn read(&mut self) -> nb::Result<u8, Error> {

testsuite/tests/uart.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use hal::interrupt;
2828

2929
use defmt::{assert, assert_eq, unwrap};
3030

31-
use core::array::IntoIter;
3231
use core::sync::atomic::{AtomicBool, Ordering};
3332

3433
static INTERRUPT_FIRED: AtomicBool = AtomicBool::new(false);
@@ -183,7 +182,7 @@ mod tests {
183182
fn send_receive_split(state: &mut super::State) {
184183
let (mut tx, mut rx) = unwrap!(state.serial1.take()).split();
185184

186-
for i in IntoIter::new(TEST_MSG) {
185+
for i in TEST_MSG {
187186
defmt::unwrap!(nb::block!(tx.write(i)));
188187
let c = unwrap!(nb::block!(rx.read()));
189188
assert_eq!(c, i);

0 commit comments

Comments
 (0)