aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alex Martens <alex@thinglab.org> 2022-01-23 10:10:22 -0800
committerGravatar Alex Martens <alex@thinglab.org> 2022-01-23 10:10:22 -0800
commit3e8055719ba2bccd7a08dfb9df7023bf7a48aaeb (patch)
tree8b773ae24d4943897f4ef3511ad47faf180ba940
parentc350114d8002d91bd71d08e7ad6ee2e960c2ed35 (diff)
downloadcortex-m-3e8055719ba2bccd7a08dfb9df7023bf7a48aaeb.tar.gz
cortex-m-3e8055719ba2bccd7a08dfb9df7023bf7a48aaeb.tar.zst
cortex-m-3e8055719ba2bccd7a08dfb9df7023bf7a48aaeb.zip
Fix most clippy lints
-rw-r--r--cortex-m-rt/macros/src/lib.rs6
-rw-r--r--xtask/src/lib.rs4
-rw-r--r--xtask/src/main.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs
index 817e9a1..f7d6e7e 100644
--- a/cortex-m-rt/macros/src/lib.rs
+++ b/cortex-m-rt/macros/src/lib.rs
@@ -159,7 +159,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream {
Exception::DefaultHandler | Exception::HardFault | Exception::NonMaskableInt => {
// These are unsafe to define.
let name = if exn == Exception::DefaultHandler {
- format!("`DefaultHandler`")
+ "`DefaultHandler`".to_string()
} else {
format!("`{:?}` handler", exn)
};
@@ -557,7 +557,7 @@ fn extract_static_muts(
let mut seen = HashSet::new();
let mut statics = vec![];
let mut stmts = vec![];
- while let Some(stmt) = istmts.next() {
+ for stmt in istmts.by_ref() {
match stmt {
Stmt::Item(Item::Static(var)) => {
if var.mutability.is_some() {
@@ -622,7 +622,7 @@ fn check_attr_whitelist(attrs: &[Attribute], caller: WhiteListCaller) -> Result<
'o: for attr in attrs {
for val in whitelist {
- if eq(&attr, &val) {
+ if eq(attr, val) {
continue 'o;
}
}
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index ddbb88b..f6a57b3 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -232,7 +232,7 @@ pub fn check_host_side() {
{
let a = VectActive::from(19).unwrap();
let b = VectActive::from(20).unwrap();
- assert_eq!(a < b, true);
+ assert!(a < b);
}
// check TryFrom
@@ -240,7 +240,7 @@ pub fn check_host_side() {
use core::convert::TryInto;
use std::convert::TryFrom;
- let lts: LocalTimestampOptions = (16 as u8).try_into().unwrap();
+ let lts: LocalTimestampOptions = (16_u8).try_into().unwrap();
assert_eq!(lts, LocalTimestampOptions::EnabledDiv16);
assert!(LocalTimestampOptions::try_from(42).is_err());
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 3e4b394..26dce31 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -2,8 +2,8 @@ use std::{env, process};
use xtask::{assemble_blobs, check_blobs, check_host_side};
fn main() {
- let subcommand = env::args().skip(1).next();
- match subcommand.as_ref().map(|s| &**s) {
+ let subcommand = env::args().nth(1);
+ match subcommand.as_deref() {
Some("assemble") => assemble_blobs(),
Some("check-blobs") => check_blobs(),
Some("check-host-side") => check_host_side(),