non_exhaustive

Author: burrbull

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       matrix:
-        rust: [ 1.36.0, stable ]
+        rust: [ 1.40.0, stable ]
         include:
           # Test nightly but don't fail the build.
           - rust: nightly

.github/workflows/clippy.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.36.0
+          toolchain: stable
           override: true
           components: clippy
       - uses: actions-rs/clippy-check@v1

README.md

@@ -13,7 +13,7 @@ This project is developed and maintained by the [Tools team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.36.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.40.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

src/error.rs

@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use xmltree::Element;
 
-#[allow(clippy::large_enum_variant)]
+#[allow(clippy::large_enum_variant, clippy::upper_case_acronyms)]
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
 pub enum SVDError {
     #[error("Unknown endianness `{0}`")]

src/svd/clusterinfo.rs

@@ -11,6 +11,7 @@ use crate::svd::{registercluster::RegisterCluster, registerproperties::RegisterP
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct ClusterInfo {
     /// String to identify the cluster.
     /// Cluster names are required to be unique within the scope of a peripheral
@@ -38,10 +39,6 @@ pub struct ClusterInfo {
     pub default_register_properties: RegisterProperties,
 
     pub children: Vec<RegisterCluster>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -99,7 +96,6 @@ impl ClusterInfoBuilder {
             children: self
                 .children
                 .ok_or_else(|| BuildError::Uninitialized("children".to_string()))?,
-            _extensible: (),
         })
         .validate()
     }

src/svd/cpu.rs

@@ -12,6 +12,7 @@ use crate::types::Parse;
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct Cpu {
     pub name: String,
 
@@ -32,10 +33,6 @@ pub struct Cpu {
 
     /// Indicate whether the processor implements a vendor-specific System Tick Timer
     pub has_vendor_systick: bool,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -101,7 +98,6 @@ impl CpuBuilder {
             has_vendor_systick: self
                 .has_vendor_systick
                 .ok_or_else(|| BuildError::Uninitialized("has_vendor_systick".to_string()))?,
-            _extensible: (),
         })
         .validate()
     }

src/svd/device.rs

@@ -15,6 +15,7 @@ use crate::svd::{cpu::Cpu, peripheral::Peripheral, registerproperties::RegisterP
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct Device {
     /// The string identifies the device or device series. Device names are required to be unique
     pub name: String,
@@ -53,10 +54,6 @@ pub struct Device {
     pub peripherals: Vec<Peripheral>,
 
     pub default_register_properties: RegisterProperties,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default)]
@@ -124,7 +121,6 @@ impl DeviceBuilder {
                 .peripherals
                 .ok_or_else(|| BuildError::Uninitialized("peripherals".to_string()))?,
             default_register_properties: self.default_register_properties,
-            _extensible: (),
         })
         .validate()
     }

src/svd/dimelement.rs

@@ -10,6 +10,7 @@ use crate::error::*;
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct DimElement {
     /// Defines the number of elements in an array or list
     pub dim: u32,
@@ -22,10 +23,6 @@ pub struct DimElement {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub dim_index: Option<Vec<String>>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -57,7 +54,6 @@ impl DimElementBuilder {
                 .dim_increment
                 .ok_or_else(|| BuildError::Uninitialized("dim_increment".to_string()))?,
             dim_index: self.dim_index,
-            _extensible: (),
         })
     }
 }

src/svd/enumeratedvalue.rs

@@ -11,6 +11,7 @@ use crate::types::Parse;
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct EnumeratedValue {
     /// String describing the semantics of the value. Can be displayed instead of the value
     pub name: String,
@@ -29,10 +30,6 @@ pub struct EnumeratedValue {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub is_default: Option<bool>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
@@ -77,7 +74,6 @@ impl EnumeratedValueBuilder {
             description: self.description,
             value: self.value,
             is_default: self.is_default,
-            _extensible: (),
         })
         .validate()
     }

src/svd/enumeratedvalues.rs

@@ -13,6 +13,7 @@ use crate::types::Parse;
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct EnumeratedValues {
     /// Identifier for the whole enumeration section
     #[cfg_attr(feature = "serde", serde(default))]
@@ -30,10 +31,6 @@ pub struct EnumeratedValues {
     pub derived_from: Option<String>,
 
     pub values: Vec<EnumeratedValue>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
@@ -73,7 +70,6 @@ impl EnumeratedValuesBuilder {
             usage: self.usage,
             derived_from: self.derived_from,
             values: self.values.unwrap_or_default(),
-            _extensible: (),
         })
         .validate()
     }

src/svd/fieldinfo.rs

@@ -17,6 +17,7 @@ use crate::svd::{
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct FieldInfo {
     /// Name string used to identify the field.
     /// Field names must be unique within a register
@@ -52,10 +53,6 @@ pub struct FieldInfo {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub modified_write_values: Option<ModifiedWriteValues>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -117,7 +114,6 @@ impl FieldInfoBuilder {
             enumerated_values: self.enumerated_values.unwrap_or_default(),
             write_constraint: self.write_constraint,
             modified_write_values: self.modified_write_values,
-            _extensible: (),
         })
         .validate()
     }

src/svd/peripheral.rs

@@ -18,6 +18,7 @@ use crate::svd::{
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct Peripheral {
     /// The string identifies the peripheral. Peripheral names are required to be unique for a device
     pub name: String,
@@ -65,10 +66,6 @@ pub struct Peripheral {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub derived_from: Option<String>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -148,7 +145,6 @@ impl PeripheralBuilder {
             default_register_properties: self.default_register_properties,
             registers: self.registers,
             derived_from: self.derived_from,
-            _extensible: (),
         })
         .validate()
     }

src/svd/registerinfo.rs

@@ -17,6 +17,7 @@ use crate::svd::{
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
+#[non_exhaustive]
 pub struct RegisterInfo {
     /// String to identify the register.
     /// Register names are required to be unique within the scope of a peripheral
@@ -76,10 +77,6 @@ pub struct RegisterInfo {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub modified_write_values: Option<ModifiedWriteValues>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -172,7 +169,6 @@ impl RegisterInfoBuilder {
             fields: self.fields,
             write_constraint: self.write_constraint,
             modified_write_values: self.modified_write_values,
-            _extensible: (),
         })
         .validate()
     }

src/svd/registerproperties.rs

@@ -13,6 +13,7 @@ use crate::svd::access::Access;
 /// Register default properties
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Copy, Debug, Default, PartialEq)]
+#[non_exhaustive]
 pub struct RegisterProperties {
     /// Default bit-width of any register
     #[cfg_attr(feature = "serde", serde(default))]
@@ -33,10 +34,6 @@ pub struct RegisterProperties {
     #[cfg_attr(feature = "serde", serde(default))]
     #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
     pub access: Option<Access>,
-
-    // Reserve the right to add more fields to this struct
-    #[cfg_attr(feature = "serde", serde(skip))]
-    _extensible: (),
 }
 
 impl Parse for RegisterProperties {