Skip to content

Commit 8127cd9

Browse files
authored
fix warnings and make CI fail on warnings (#887)
1 parent 99a9e6b commit 8127cd9

File tree

12 files changed

+42
-33
lines changed

12 files changed

+42
-33
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ jobs:
8686
arch: ${{ matrix.platform.arch }}
8787
target: ${{ matrix.platform.target }}
8888

89-
- run: cargo check -p espflash --lib --no-default-features
90-
- run: cargo check -p espflash --lib --no-default-features --features serialport
89+
- run: RUSTFLAGS="-D warnings" cargo check -p espflash --lib --no-default-features
90+
- run: RUSTFLAGS="-D warnings" cargo check -p espflash --lib --no-default-features --features serialport
9191

9292
msrv:
9393
name: Check lib MSRV (${{ matrix.platform.target }})

espflash/src/flasher/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
//! application to a target device. It additionally provides some operations to
55
//! read information from the target device.
66
7+
#[cfg(feature = "serialport")]
8+
use std::fs::OpenOptions;
79
#[cfg(feature = "serialport")]
810
use std::{borrow::Cow, io::Write, path::PathBuf, thread::sleep, time::Duration};
9-
use std::{collections::HashMap, fmt, fs::OpenOptions, str::FromStr};
11+
use std::{collections::HashMap, fmt, str::FromStr};
1012

1113
#[cfg(feature = "serialport")]
1214
use log::{debug, info, warn};

espflash/src/image_format/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//! Binary application image formats
22
3-
#[cfg(not(feature = "cli"))]
4-
use std::path::PathBuf;
53
use std::{
64
borrow::Cow,
75
cmp::Ordering,

espflash/src/targets/esp32.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ops::Range;
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32 as efuse};
4-
use crate::Error;
53
#[cfg(feature = "serialport")]
6-
use crate::connection::Connection;
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32 as efuse};
6+
#[cfg(feature = "serialport")]
7+
use crate::{Error, connection::Connection};
78

89
pub(crate) const CHIP_ID: u16 = 0;
910

espflash/src/targets/esp32c2.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
use std::{collections::HashMap, ops::Range};
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32c2 as efuse};
43
#[cfg(feature = "serialport")]
5-
use crate::connection::Connection;
6-
use crate::{Error, flasher::FlashFrequency};
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32c2 as efuse};
6+
use crate::flasher::FlashFrequency;
7+
#[cfg(feature = "serialport")]
8+
use crate::{Error, connection::Connection};
79

810
pub(crate) const CHIP_ID: u16 = 12;
911

espflash/src/targets/esp32c3.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ops::Range;
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32c3 as efuse};
4-
use crate::Error;
53
#[cfg(feature = "serialport")]
6-
use crate::connection::Connection;
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32c3 as efuse};
6+
#[cfg(feature = "serialport")]
7+
use crate::{Error, connection::Connection};
78

89
pub(crate) const CHIP_ID: u16 = 5;
910

espflash/src/targets/esp32c5.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ops::Range;
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32c5 as efuse};
4-
use crate::Error;
53
#[cfg(feature = "serialport")]
6-
use crate::connection::Connection;
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32c5 as efuse};
6+
#[cfg(feature = "serialport")]
7+
use crate::{Error, connection::Connection};
78

89
pub(crate) const CHIP_ID: u16 = 23;
910

espflash/src/targets/esp32c6.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ops::Range;
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32c6 as efuse};
4-
use crate::Error;
53
#[cfg(feature = "serialport")]
6-
use crate::connection::Connection;
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32c6 as efuse};
6+
#[cfg(feature = "serialport")]
7+
use crate::{Error, connection::Connection};
78

89
pub(crate) const CHIP_ID: u16 = 13;
910

espflash/src/targets/esp32h2.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
use std::{collections::HashMap, ops::Range};
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32h2 as efuse};
43
#[cfg(feature = "serialport")]
5-
use crate::connection::Connection;
6-
use crate::{Error, flasher::FlashFrequency};
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32h2 as efuse};
6+
use crate::flasher::FlashFrequency;
7+
#[cfg(feature = "serialport")]
8+
use crate::{Error, connection::Connection};
79

810
pub(crate) const CHIP_ID: u16 = 16;
911

espflash/src/targets/esp32p4.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ops::Range;
22

3-
use super::{Chip, ReadEFuse, SpiRegisters, Target, XtalFrequency, efuse::esp32p4 as efuse};
4-
use crate::Error;
53
#[cfg(feature = "serialport")]
6-
use crate::connection::Connection;
4+
use super::XtalFrequency;
5+
use super::{Chip, ReadEFuse, SpiRegisters, Target, efuse::esp32p4 as efuse};
6+
#[cfg(feature = "serialport")]
7+
use crate::{Error, connection::Connection};
78

89
pub(crate) const CHIP_ID: u16 = 18;
910

0 commit comments

Comments
 (0)