cargo clippy

Author: burrbull

svd-encoder/src/config.rs

@@ -130,7 +130,7 @@ where
         NumberFormat::UpperHex => format!("{:#X}", value),
         NumberFormat::UpperHex8 => format!("{:#010X}", value),
         NumberFormat::UpperHex16 => {
-            if value.into() > std::u32::MAX as u64 {
+            if value.into() > u32::MAX as u64 {
                 format!("{:#018X}", value)
             } else {
                 format!("{:#010X}", value)
@@ -139,7 +139,7 @@ where
         NumberFormat::LowerHex => format!("{:#x}", value),
         NumberFormat::LowerHex8 => format!("{:#010x}", value),
         NumberFormat::LowerHex16 => {
-            if value.into() > std::u32::MAX as u64 {
+            if value.into() > u32::MAX as u64 {
                 format!("{:#018x}", value)
             } else {
                 format!("{:#010x}", value)

svd-parser/src/elementext.rs

@@ -29,7 +29,7 @@ pub trait ElementExt {
 }
 
 /// Implements extensions for roxmltree::Node
-impl<'a, 'input> ElementExt for Node<'a, 'input> {
+impl ElementExt for Node<'_, '_> {
     fn get_child<K>(&self, k: K) -> Option<Node>
     where
         K: AsRef<str>,

svd-rs/src/lib.rs

@@ -95,22 +95,17 @@ pub mod datatype;
 pub use self::datatype::DataType;
 
 /// Level of validation
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
 pub enum ValidateLevel {
     /// No validation.
     Disabled,
     /// Weak validation.
+    #[default]
     Weak,
     /// Strict validation.
     Strict,
 }
 
-impl Default for ValidateLevel {
-    fn default() -> Self {
-        ValidateLevel::Weak
-    }
-}
-
 impl ValidateLevel {
     /// Returns true if validation is disabled.
     pub fn is_disabled(self) -> bool {

svd-rs/src/registerproperties.rs

@@ -133,7 +133,7 @@ pub(crate) fn check_reset_value(
     mask: Option<u64>,
     lvl: ValidateLevel,
 ) -> Result<(), Error> {
-    const MAX_BITS: u32 = core::u64::MAX.count_ones();
+    const MAX_BITS: u32 = u64::MAX.count_ones();
 
     if let (Some(size), Some(value)) = (size, value) {
         if MAX_BITS - value.leading_zeros() > size {

tests/src/access.rs

@@ -3,7 +3,7 @@ use crate::svd::Access;
 
 #[test]
 fn decode_encode() {
-    let tests = vec![
+    let tests = [
         (
             Access::ReadOnly,
             "<access>read-only</access>",

tests/src/addressblock.rs

@@ -8,7 +8,7 @@ fn decode_encode() {
     encode_config.update("address_block_offset", "Dec");
     encode_config.update("address_block_size", "UpperHex8");
 
-    let tests = vec![(
+    let tests = [(
         AddressBlock::builder()
             .offset(0)
             .size(0x00000F00)

tests/src/cpu.rs

@@ -3,7 +3,7 @@ use crate::svd::{Cpu, Endian, ValidateLevel};
 
 #[test]
 fn decode_encode() {
-    let tests = vec![(
+    let tests = [(
         Cpu::builder()
             .name("EFM32JG12B500F512GM48".to_string())
             .revision("5.1.1".to_string())

tests/src/dimelement.rs

@@ -3,7 +3,7 @@ use crate::svd::{DimElement, ValidateLevel};
 
 #[test]
 fn decode_encode() {
-    let tests = vec![(
+    let tests = [(
         DimElement::builder()
             .dim(2)
             .dim_increment(4)
@@ -25,7 +25,7 @@ fn decode_encode() {
     )];
     run_test::<DimElement>(&tests[..], None, None);
 
-    let tests = vec![(
+    let tests = [(
         DimElement::builder()
             .dim(3)
             .dim_increment(4)
@@ -51,7 +51,7 @@ fn decode_encode() {
     )];
     run_test::<DimElement>(&tests[..], None, None);
 
-    let tests = vec![(
+    let tests = [(
         DimElement::builder()
             .dim(3)
             .dim_increment(4)
@@ -77,7 +77,7 @@ fn decode_encode() {
     )];
     run_test::<DimElement>(&tests[..], None, None);
 
-    let tests = vec![(
+    let tests = [(
         DimElement::builder()
             .dim(1)
             .dim_increment(0)
@@ -104,7 +104,7 @@ fn decode_encode() {
     encode_config.update("dim_dim", "UpperHex");
     encode_config.update("dim_increment", "LowerHex");
 
-    let tests = vec![(
+    let tests = [(
         DimElement::builder()
             .dim(14)
             .dim_increment(15)

tests/src/endian.rs

@@ -3,7 +3,7 @@ use crate::svd::Endian;
 
 #[test]
 fn decode_encode() {
-    let tests = vec![
+    let tests = [
         (
             Endian::Little,
             "<endian>little</endian>",

tests/src/enumeratedvalue.rs

@@ -3,7 +3,7 @@ use crate::svd::{EnumeratedValue, ValidateLevel};
 
 #[test]
 fn decode_encode() {
-    let tests = vec![(
+    let tests = [(
         EnumeratedValue::builder()
             .name("WS0".to_string())
             .description(Some(
@@ -35,7 +35,7 @@ fn decode_encode() {
     encode_config.update("enumerated_value_name", "Pascal");
     encode_config.update("enumerated_value_value", "Bin");
 
-    let tests = vec![(
+    let tests = [(
         EnumeratedValue::builder()
             .name("WS0".to_string())
             .description(Some(

tests/src/field.rs

@@ -49,7 +49,7 @@ fn decode_encode() {
     encode_config.update("field_name", "Snake");
     encode_config.update("field_bit_range", "MsbLsb");
 
-    let tests = vec![(
+    let tests = [(
         FieldInfo::builder()
             .name("MODE".to_string())
             .derived_from(Some("other_field".to_string()))

tests/src/interrupt.rs

@@ -3,7 +3,7 @@ use crate::svd::{Interrupt, ValidateLevel};
 
 #[test]
 fn decode_encode() {
-    let tests = vec![(
+    let tests = [(
         Interrupt::builder()
             .name("test".to_string())
             .description(Some("description".to_string()))
@@ -30,7 +30,7 @@ fn decode_encode() {
     let mut encode_config = svd_encoder::Config::default();
     encode_config.update("interrupt_name", "Constant");
 
-    let tests = vec![(
+    let tests = [(
         Interrupt::builder()
             .name("test".to_string())
             .description(Some("description".to_string()))

tests/src/lib.rs

@@ -27,7 +27,7 @@ pub fn run_test<
         let rotree = Document::parse(t.1).unwrap();
         let elem = T::parse(
             &rotree.root().first_element_child().unwrap(),
-            &parser_config.unwrap_or(Config::default()),
+            &parser_config.unwrap_or_default(),
         )
         .unwrap();
         assert_eq!(
@@ -37,7 +37,7 @@ pub fn run_test<
 
         let tree1 = Element::parse(t.2.as_bytes()).unwrap();
         let tree2 = elem
-            .encode_with_config(&encoder_config.unwrap_or(svd_encoder::Config::default()))
+            .encode_with_config(&encoder_config.unwrap_or_default())
             .unwrap();
         assert_eq!(
             tree1, tree2,

tests/src/modifiedwritevalues.rs

@@ -4,7 +4,7 @@ use crate::svd::ModifiedWriteValues;
 #[test]
 fn decode_encode() {
     // FIXME: Do we need a more extensive test?
-    let tests = vec![(
+    let tests = [(
         ModifiedWriteValues::OneToToggle,
         "<modifiedWriteValues>oneToToggle</modifiedWriteValues>",
         "<modifiedWriteValues>oneToToggle</modifiedWriteValues>",

tests/src/usage.rs

@@ -3,7 +3,7 @@ use crate::svd::Usage;
 
 #[test]
 fn decode_encode() {
-    let tests = vec![
+    let tests = [
         (Usage::Read, "<usage>read</usage>", "<usage>read</usage>"),
         (Usage::Write, "<usage>write</usage>", "<usage>write</usage>"),
         (

tests/src/writeconstraint.rs

@@ -3,8 +3,7 @@ use crate::svd::{WriteConstraint, WriteConstraintRange};
 
 #[test]
 fn decode_encode() {
-    let tests = vec![
-        (
+    let tests = [(
             WriteConstraint::WriteAsRead(true),
             "<writeConstraint><writeAsRead>true</writeAsRead></writeConstraint>",
              "<writeConstraint><writeAsRead>true</writeAsRead></writeConstraint>"
@@ -18,8 +17,7 @@ fn decode_encode() {
             WriteConstraint::Range(WriteConstraintRange{min: 1, max: 10}),
             "<writeConstraint><range><minimum>1</minimum><maximum>10</maximum></range></writeConstraint>",
             "<writeConstraint><range><minimum>1</minimum><maximum>10</maximum></range></writeConstraint>"
-        ),
-    ];
+        )];
 
     run_test::<WriteConstraint>(&tests[..], None, None);
 }