Merge #409

409: Bump dependencies r=burrbull a=therealprof

Signed-off-by: Daniel Egger <daniel@eggers-club.de>

Co-authored-by: Daniel Egger <daniel@eggers-club.de>

Author: bors[bot]

CHANGELOG.md

@@ -14,8 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Enum items now associated with values (C-style), enums annotated with `repr(fty)`
-- Bump `svd-parser` dependency (0.8.1)
+- Bump `svd-parser` dependency (0.9.0)
 - Switched from denying all warnings to only a subset.
+- Bump logging and CLI arg parsing dependencies
 
 ## [v0.16.1] - 2019-08-17
 

Cargo.toml

@@ -32,17 +32,17 @@ name = "svd2rust"
 path = "src/main.rs"
 
 [dependencies]
-cast = "0.2.2"
-clap = "2.26.0"
-env_logger = "~0.5"
-error-chain = "0.11.0"
-inflections = "1.1.0"
+cast = "0.2"
+clap = "2.33"
+env_logger = "~0.7"
+error-chain = "0.12"
+inflections = "1.1"
 log = { version = "~0.4", features = ["std"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 
 [dependencies.svd-parser]
-version = "0.8.1"
+version = "0.9"
 features = ["derive-from"]
 
 [dependencies.syn]

src/generate/peripheral.rs

@@ -618,7 +618,7 @@ fn expand_cluster(cluster: &Cluster, defs: &RegisterProperties) -> Result<Vec<Re
     match cluster {
         Cluster::Single(info) => cluster_expanded.push(RegisterBlockField {
             field: convert_svd_cluster(cluster),
-            description: info.description.clone(),
+            description: info.description.as_ref().unwrap_or(&info.name).into(),
             offset: info.address_offset,
             size: cluster_size,
         }),
@@ -638,15 +638,15 @@ fn expand_cluster(cluster: &Cluster, defs: &RegisterProperties) -> Result<Vec<Re
             if array_convertible {
                 cluster_expanded.push(RegisterBlockField {
                     field: convert_svd_cluster(&cluster),
-                    description: info.description.clone(),
+                    description: info.description.as_ref().unwrap_or(&info.name).into(),
                     offset: info.address_offset,
                     size: cluster_size * array_info.dim,
                 });
             } else {
                 for (field_num, field) in expand_svd_cluster(cluster).iter().enumerate() {
                     cluster_expanded.push(RegisterBlockField {
                         field: field.clone(),
-                        description: info.description.clone(),
+                        description: info.description.as_ref().unwrap_or(&info.name).into(),
                         offset: info.address_offset + field_num as u32 * array_info.dim_increment,
                         size: cluster_size,
                     });
@@ -726,7 +726,8 @@ fn cluster_block(
     let mut mod_items = TokenStream::new();
 
     // name_sc needs to take into account array type.
-    let description = util::escape_brackets(util::respace(&c.description).as_ref());
+    let description =
+        util::escape_brackets(util::respace(c.description.as_ref().unwrap_or(&c.name)).as_ref());
 
     // Generate the register block.
     let mod_name = match c {

src/main.rs

@@ -12,10 +12,10 @@ mod errors;
 mod generate;
 mod util;
 
+use std::fmt::Write as _;
 use std::fs::File;
 use std::io::Write;
 use std::process;
-use std::fmt::Write as _;
 
 use clap::{App, Arg};
 
@@ -106,7 +106,8 @@ fn run() -> Result<()> {
     let mut data = String::new();
     write!(data, "{}", items).expect("Could not output code");
     let data = data.replace("] ", "]\n");
-    file.write_all(data.as_ref()).expect("Could not write code to lib.rs");
+    file.write_all(data.as_ref())
+        .expect("Could not write code to lib.rs");
 
     if target == Target::CortexM {
         writeln!(File::create("device.x").unwrap(), "{}", device_x).unwrap();
@@ -124,7 +125,7 @@ fn setup_logging(matches: &clap::ArgMatches) {
     //   command line argument.
     let env = env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info");
     let mut builder = env_logger::Builder::from_env(env);
-    builder.default_format_timestamp(false);
+    builder.format_timestamp(None);
 
     let log_lvl_from_env = std::env::var_os(env_logger::DEFAULT_FILTER_ENV).is_some();