Merge pull request #187 from neithernut/update

neithernut · web-flow · commit 02aee9c370a7 · 2019-06-05T19:14:36.000+02:00
Various updates
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
 atty = "0.2"
 chrono = "0.4"
 error-chain = "0.12"
-git2 = "0.7"
+git2 = "0.9"
 is-match = "0.1"
 lazy_static = "1"
 log = "0.4"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -13,7 +13,7 @@ license       = "MPL-2.0"
 
 [dependencies]
 log = "0.4"
-git2 = "0.7"
+git2 = "0.9"
 error-chain = "0.12"
 regex = "1"
 lazy_static = "1"
diff --git a/lib/src/message/block.rs b/lib/src/message/block.rs
@@ -65,7 +65,7 @@ impl<I, S> Iterator for Blocks<I, S>
 
         // get us the next block
         for line in &mut self.0 {
-            let trimmed = line.as_ref().trim_right();
+            let trimmed = line.as_ref().trim_end();
 
             // If we encounter an empty line, we are done. However, we should
             // refrain from reporting empty blocks.
diff --git a/lib/src/message/line_processor.rs b/lib/src/message/line_processor.rs
@@ -73,7 +73,7 @@ impl<'a, I, S> Iterator for StripWhiteSpaceLeftIter<I, S>
     type Item = String;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.0.next().map(|s| String::from(s.as_ref().trim_left()))
+        self.0.next().map(|s| String::from(s.as_ref().trim_start()))
     }
 }
 
@@ -102,7 +102,7 @@ impl<'a, I, S> Iterator for StripWhiteSpaceRightIter<I, S>
     type Item = String;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.0.next().map(|s| String::from(s.as_ref().trim_right()))
+        self.0.next().map(|s| String::from(s.as_ref().trim_end()))
     }
 }
 
diff --git a/mkmanpage.rs b/mkmanpage.rs
@@ -4,7 +4,6 @@ fn main() {
     if cfg!(feature = "manpage") {
         assert!(Command::new("pandoc")
             .arg("-s")
-            .arg("-S")
             .arg("-f").arg("markdown")
             .arg("-t").arg("man")
             .arg("git-dit.1.md")
diff --git a/src/display/message.rs b/src/display/message.rs
@@ -49,7 +49,7 @@ impl<'a,> TokenExpander for MessageFmtToken<'a> {
                 .clone()
                 .into_commit()
                 .ok()
-                .and_then(|mut m| m.summary().map(String::from))
+                .and_then(|m| m.summary().map(String::from))
                 .unwrap_or_default()],
             &MessageFmtToken::Author => tokenvec![message
                 .author()
diff --git a/src/error.rs b/src/error.rs
@@ -70,7 +70,7 @@ impl<E> LoggableError for E
         let mut current = Some(self as &EError);
         while let Some(err) = current {
             error!("{}", err);
-            current = err.cause();
+            current = err.source();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl<'a, I, S> Iterator for StripWhiteSpaceLeftIter<I, S>`
`73`	`73`	`type Item = String;`
`74`	`74`
`75`	`75`	`fn next(&mut self) -> Option<Self::Item> {`
`76`		`- self.0.next().map(\|s\| String::from(s.as_ref().trim_left()))`
	`76`	`+ self.0.next().map(\|s\| String::from(s.as_ref().trim_start()))`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`@@ -102,7 +102,7 @@ impl<'a, I, S> Iterator for StripWhiteSpaceRightIter<I, S>`
`102`	`102`	`type Item = String;`
`103`	`103`
`104`	`104`	`fn next(&mut self) -> Option<Self::Item> {`
`105`		`- self.0.next().map(\|s\| String::from(s.as_ref().trim_right()))`
	`105`	`+ self.0.next().map(\|s\| String::from(s.as_ref().trim_end()))`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ impl<E> LoggableError for E`
`70`	`70`	`let mut current = Some(self as &EError);`
`71`	`71`	`while let Some(err) = current {`
`72`	`72`	`error!("{}", err);`
`73`		`- current = err.cause();`
	`73`	`+ current = err.source();`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`