Merge pull request #2297 from rbtcollins/master

kinnison · web-flow · commit 705b8cb83a0e · 2020-04-25T11:45:29.000+01:00
effective-limits switched to thiserror
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ chrono = "0.4"
 clap = "2"
 download = { path = "download" }
 error-chain = "0.12"
-effective-limits = "0.3"
+effective-limits = "0.4"
 flate2 = "1"
 git-testament = "0.1.4"
 home = "0.5"
diff --git a/src/errors.rs b/src/errors.rs
@@ -22,14 +22,14 @@ pub const TOOLSTATE_MSG: &str =
 error_chain! {
     links {
         Download(download::Error, download::ErrorKind);
-        Limits(effective_limits::Error, effective_limits::ErrorKind);
     }
 
     foreign_links {
         Temp(temp::Error);
         Io(io::Error);
         Open(opener::OpenError);
         Thread(std::sync::mpsc::RecvError);
+        Limits(effective_limits::Error);
     }
 
     errors {

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ pub const TOOLSTATE_MSG: &str =`
`22`	`22`	`error_chain! {`
`23`	`23`	`links {`
`24`	`24`	`Download(download::Error, download::ErrorKind);`
`25`		`- Limits(effective_limits::Error, effective_limits::ErrorKind);`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`foreign_links {`
`29`	`28`	`Temp(temp::Error);`
`30`	`29`	`Io(io::Error);`
`31`	`30`	`Open(opener::OpenError);`
`32`	`31`	`Thread(std::sync::mpsc::RecvError);`
	`32`	`+ Limits(effective_limits::Error);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`errors {`