more clean up w/ pedclippy

src/law/mod.rs

@@ -58,7 +58,7 @@ impl From<LawBuilder> for Law {
                 name: header.borrow().name.clone(),
                 desc: header.borrow().desc.clone(),
                 content: header.borrow().clone().into(),
-            })
+            });
         }
 
         Self {
@@ -100,7 +100,7 @@ impl From<ClassifierInstance> for HeadingContent {
                     name: child.borrow().name.clone(),
                     desc: child.borrow().desc.clone(),
                     content: child.borrow().clone().into(),
-                })
+                });
             }
 
             Self::Heading(ret)
@@ -173,18 +173,18 @@ impl LawBuilder {
 
         let mut law_id = None;
         if name == "UrhG" {
-            law_id = Some(10001848);
+            law_id = Some(10_001_848);
 
             classifiers.push(Classifier::new("Hauptstück", Arc::new(&contains)).root());
             classifiers.push(Classifier::new("Abschnitt", Arc::new(&contains)));
             classifiers.push(Classifier::new("Number", Arc::new(&starts_with_number)));
         } else if name == "MSchG" {
-            law_id = Some(10002180);
+            law_id = Some(10_002_180);
 
             classifiers.push(Classifier::new("Abschnitt", Arc::new(&contains)).root());
             classifiers.push(Classifier::new("Number", Arc::new(&starts_with_number)));
         } else if name == "ABGB" {
-            law_id = Some(10001622);
+            law_id = Some(10_001_622);
 
             classifiers.push(Classifier::new("Einleitung", Arc::new(&contains)).root());
             classifiers.push(Classifier::new("Theil", Arc::new(&contains)).root());
@@ -198,7 +198,7 @@ impl LawBuilder {
             classifiers.push(Classifier::new("num", Arc::new(&starts_with_number)));
             classifiers.push(Classifier::new("rom", Arc::new(&starts_with_roman_number)));
         } else if name == "FSG" {
-            law_id = Some(10003898);
+            law_id = Some(10_003_898);
 
             classifiers.push(Classifier::new("Artikel", Arc::new(&contains)).root());
 
@@ -215,16 +215,16 @@ impl LawBuilder {
             ));
             classifiers.push(Classifier::new("num", Arc::new(&starts_with_number)));
         } else if name == "VVG" {
-            law_id = Some(20004425);
+            law_id = Some(20_004_425);
 
             classifiers.push(Classifier::new("Abschnitt", Arc::new(&contains)).root());
         } else if name == "KSchG" {
-            law_id = Some(10002462);
+            law_id = Some(10_002_462);
 
             classifiers.push(Classifier::new("Hauptstück", Arc::new(&contains)).root());
             classifiers.push(Classifier::new("Abschnitt", Arc::new(&contains)));
         } else if name == "StGB" {
-            law_id = Some(10002296);
+            law_id = Some(10_002_296);
 
             classifiers.push(Classifier::new("Teil", Arc::new(&contains)).root());
             classifiers.push(Classifier::new("Abschnitt", Arc::new(&contains)));
@@ -249,7 +249,7 @@ impl LawBuilder {
             }
         }
 
-        builder.into()
+        builder
     }
 
     fn responsible_classifier(&self, name: &str) -> Option<&Classifier> {
@@ -358,7 +358,7 @@ impl LawBuilder {
                 symb: par,
                 par_header,
                 content,
-            })
+            });
     }
 
     /// Next paragraph has a header, store its name.
@@ -447,7 +447,7 @@ impl std::fmt::Debug for ClassifierInstance {
             .field("desc", &self.desc)
             .field("sections", &self.sections)
             .field("children", &self.children)
-            .finish()
+            .finish_non_exhaustive()
     }
 }
 
@@ -500,7 +500,7 @@ impl std::fmt::Debug for Classifier {
             .field("name", &self.name)
             .field("instances", &self.instances)
             .field("child", &self.child)
-            .finish()
+            .finish_non_exhaustive()
     }
 }
 
@@ -515,14 +515,7 @@ impl Display for Content {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Text(a) => f.write_str(&format!("{a}\n")),
-            Self::Item(a) => {
-                let mut ret = String::new();
-                for aa in a {
-                    ret.push_str(&format!("{aa}"));
-                }
-                f.write_str(&ret)
-            }
-            Self::List(a) => {
+            Self::Item(a) | Self::List(a) => {
                 let mut ret = String::new();
                 for aa in a {
                     ret.push_str(&format!("{aa}"));