from_str -> parse_str, to_str -> as_str, bump MSRV to 1.46

fix as/parse_str

Author: burrbull

.github/bors.toml

@@ -3,7 +3,7 @@ delete_merged_branches = true
 required_approvals = 1
 timeout_sec = 14400
 status = [
-  "build (1.40.0)",
+  "build (1.46.0)",
   "build (stable)",
   "test",
   "test-strict",

.github/workflows/ci.yml

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

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.40.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.46.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

svd-encoder/src/access.rs

@@ -5,7 +5,7 @@ impl Encode for crate::svd::Access {
 
     fn encode(&self) -> Result<Element, EncodeError> {
         let mut elem = Element::new("access");
-        elem.children.push(XMLNode::Text(self.to_str().to_string()));
+        elem.children.push(XMLNode::Text(self.as_str().to_string()));
         Ok(elem)
     }
 }

svd-encoder/src/addressblock.rs

@@ -20,7 +20,7 @@ impl Encode for crate::svd::AddressBlockUsage {
 
     fn encode(&self) -> Result<Element, EncodeError> {
         let mut elem = Element::new("usage");
-        elem.children.push(XMLNode::Text(self.to_str().to_string()));
+        elem.children.push(XMLNode::Text(self.as_str().to_string()));
         Ok(elem)
     }
 }

svd-encoder/src/endian.rs

@@ -5,7 +5,7 @@ impl Encode for crate::svd::Endian {
 
     fn encode(&self) -> Result<Element, EncodeError> {
         let mut elem = Element::new("endian");
-        elem.children.push(XMLNode::Text(self.to_str().to_string()));
+        elem.children.push(XMLNode::Text(self.as_str().to_string()));
         Ok(elem)
     }
 }

svd-encoder/src/modifiedwritevalues.rs

@@ -5,7 +5,7 @@ impl Encode for crate::svd::ModifiedWriteValues {
 
     fn encode(&self) -> Result<Element, EncodeError> {
         let mut elem = Element::new("modifiedWriteValues");
-        elem.children.push(XMLNode::Text(self.to_str().to_string()));
+        elem.children.push(XMLNode::Text(self.as_str().to_string()));
         Ok(elem)
     }
 }

svd-encoder/src/usage.rs

@@ -5,7 +5,7 @@ impl Encode for crate::svd::Usage {
 
     fn encode(&self) -> Result<Element, EncodeError> {
         let mut elem = Element::new("usage");
-        elem.children.push(XMLNode::Text(self.to_str().to_string()));
+        elem.children.push(XMLNode::Text(self.as_str().to_string()));
         Ok(elem)
     }
 }

svd-parser/src/access.rs

@@ -9,6 +9,6 @@ impl Parse for Access {
     fn parse(tree: &Node, _config: &Self::Config) -> Result<Self, Self::Error> {
         let text = tree.get_text()?;
 
-        Self::from_str(text).ok_or_else(|| SVDError::UnknownAccessType(text.into()).at(tree.id()))
+        Self::parse_str(text).ok_or_else(|| SVDError::UnknownAccessType(text.into()).at(tree.id()))
     }
 }

svd-parser/src/addressblock.rs

@@ -23,6 +23,6 @@ impl Parse for AddressBlockUsage {
     fn parse(tree: &Node, _config: &Self::Config) -> Result<Self, Self::Error> {
         let text = tree.get_text()?;
 
-        Self::from_str(text).ok_or_else(|| SVDError::UnknownAddressBlockUsageVariant.at(tree.id()))
+        Self::parse_str(text).ok_or_else(|| SVDError::UnknownAddressBlockUsageVariant.at(tree.id()))
     }
 }