Merge pull request #513 from meven/fix-511

Fix clippy warnings, fix #511

Author: ashleygwilliams

src/group.rs

@@ -42,8 +42,8 @@ fn read_toplevel_yaml(t: &GroupType, name: &str) -> io::Result<Group> {
         .join("team.yml");
     assert!(fs::metadata(&data_path)?.is_file());
     let data_string = fs::read_to_string(&data_path)?;
-    let data: Group =
-        serde_yaml::from_str(&data_string).expect(&format!("failed yaml parse for {} {}", t, name));
+    let data: Group = serde_yaml::from_str(&data_string)
+        .unwrap_or_else(|_| panic!("failed yaml parse for {} {}", t, name));
     Ok(data)
 }
 
@@ -56,10 +56,8 @@ fn read_subs_yaml(t: &GroupType, group: &str, st: &GroupType, sub: &str) -> io::
     println!("trying to find {:?}", data_path);
     assert!(fs::metadata(&data_path)?.is_file());
     let data_string = fs::read_to_string(&data_path)?;
-    let data: Group = serde_yaml::from_str(&data_string).expect(&format!(
-        "failed yaml parse for {} {} {} {}",
-        t, group, st, sub
-    ));
+    let data: Group = serde_yaml::from_str(&data_string)
+        .unwrap_or_else(|_| panic!("failed yaml parse for {} {} {} {}", t, group, st, sub));
     Ok(data)
 }
 
@@ -69,7 +67,7 @@ pub fn get_toplevel_data(t: &GroupType) -> io::Result<Vec<Group>> {
     for group in groups_data {
         let group = group?;
         let data = read_toplevel_yaml(t, &get_name_from_path(group.path()))
-            .expect(&format!("couldn't get toplevel group data for type {}", t));
+            .unwrap_or_else(|_| panic!("couldn't get toplevel group data for type {}", t));
         groups.push(data);
     }
     Ok(groups)
@@ -97,13 +95,15 @@ pub fn get_subs_data(t: &GroupType, group: &str, st: &GroupType) -> io::Result<V
         let sub_data = fs::read_dir(data_path)?;
         for sub in sub_data {
             let sub = sub?;
-            let data =
-                read_subs_yaml(t, group, st, &get_name_from_path(sub.path())).expect(&format!(
-                    "couldn't get subs data for {} {} {}",
-                    t,
-                    group,
-                    get_name_from_path(sub.path())
-                ));
+            let data = read_subs_yaml(t, group, st, &get_name_from_path(sub.path()))
+                .unwrap_or_else(|_| {
+                    panic!(
+                        "couldn't get subs data for {} {} {}",
+                        t,
+                        group,
+                        get_name_from_path(sub.path())
+                    )
+                });
             groups.push(data);
         }
     }

src/main.rs

@@ -76,7 +76,7 @@ fn index() -> Template {
 
     let context = Context {
         page: page.clone(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: true,
         rust_version: rust_version::rust_version()
@@ -96,7 +96,7 @@ fn category(category: Category) -> Template {
     let title = format!("Rust - {}", page).to_string();
     let context = Context {
         page: category.name().to_string(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
     };
@@ -109,7 +109,7 @@ fn governance() -> Template {
     let title = format!("Rust - {}", page).to_string();
     let context = GroupContext {
         page: page.clone(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
         data: load_governance_data(),
@@ -137,7 +137,7 @@ fn team(t: String, subject: String) -> Template {
     let t = get_type_from_string(&t).expect("couldnt figure out group type from path string");
     let context = GroupContext {
         page: page.clone(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
         data: load_group_data(t, &subject),
@@ -163,12 +163,12 @@ fn load_group_data(t: GroupType, group: &str) -> HashMap<String, Vec<Group>> {
     );
     let subteams =
         group::get_subs_data(&t, group, &GroupType::Team).expect("couldn't get subteams data");
-    if subteams.len() > 0 {
+    if !subteams.is_empty() {
         map.insert("subteams".to_string(), subteams);
     }
     let subwgs = group::get_subs_data(&t, group, &GroupType::WorkingGroup)
         .expect("couldn't get subwgs data");
-    if subwgs.len() > 0 {
+    if !subwgs.is_empty() {
         map.insert("subwgs".to_string(), subwgs);
     }
     map
@@ -180,7 +180,7 @@ fn production() -> Template {
     let title = format!("Rust - {}", page).to_string();
     let context = UsersContext {
         page: page.clone(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
         data: load_users_data(),
@@ -201,7 +201,7 @@ fn subject(category: Category, subject: String) -> Template {
     let title = format!("Rust - {}", page).to_string();
     let context = Context {
         page: subject,
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
     };
@@ -214,7 +214,7 @@ fn not_found() -> Template {
     let title = format!("Rust - {}", page).to_string();
     let context = Context {
         page: "404".to_string(),
-        title: title,
+        title,
         parent: "layout".to_string(),
         is_landing: false,
     };
@@ -241,6 +241,7 @@ fn main() {
         .mount(
             "/",
             routes![index, category, governance, team, production, subject, files],
-        ).catch(catchers![not_found, catch_error])
+        )
+        .catch(catchers![not_found, catch_error])
         .launch();
 }

src/production.rs

@@ -17,7 +17,7 @@ fn read_yaml() -> io::Result<Vec<User>> {
     assert!(fs::metadata(&data_path)?.is_file());
     let data_string = fs::read_to_string(&data_path)?;
     let data: Vec<User> = serde_yaml::from_str(&data_string)
-        .expect(&format!("failed yaml parse for {}", data_path.display()));
+        .unwrap_or_else(|_| panic!("failed yaml parse for {}", data_path.display()));
     Ok(data)
 }
 

src/rust_version.rs

@@ -8,5 +8,5 @@ pub fn rust_version() -> Option<String> {
         .ok()?;
     let manifest = manifest.parse::<toml::Value>().ok()?;
     let rust_version = manifest["pkg"]["rust"]["version"].as_str()?.to_string();
-    Some(rust_version[..rust_version.find(" ")?].to_string())
+    Some(rust_version[..rust_version.find(' ')?].to_string())
 }