Remove derive_more

Author: Mark-Simulacrum

Cargo.lock

@@ -12,7 +12,6 @@ edition = "2018"
 
 [dependencies]
 chrono = { version = "0.4.6", features = [ "serde" ] }
-derive_more = "0.14.0"
 thiserror = "1"
 log = "0.4.5"
 reqwest = { version = "0.10.0", features = ["blocking"] }

library/Cargo.toml

@@ -19,7 +19,8 @@ impl FsCache {
     pub fn new(path: impl AsRef<Path>) -> Result<Self, Error> {
         let path = path.as_ref();
         if !path.exists() {
-            fs::create_dir_all(path).map_err(|e| (e, format!("creating path {:?}", path)))?;
+            fs::create_dir_all(path)
+                .map_err(|e| Error::Io(e, format!("creating path {:?}", path)))?;
         }
         Ok(FsCache {
             storage_path: Some(path.into()),

library/src/cache.rs

@@ -113,6 +113,6 @@ where
         let mut bytes = Vec::new();
         io::copy(&mut response, &mut bytes).map_err(|e| Error::Io(e, url.into()))?;
 
-        toml::from_slice(&bytes).map_err(|e| (e, url.to_string()).into())
+        toml::from_slice(&bytes).map_err(|e| Error::TomlDe(e, url.to_string()))
     }
 }

library/src/downloader.rs

@@ -28,7 +28,7 @@ pub use source::{DefaultSource, SourceInfo};
 use std::io;
 
 /// An error that might happen inside the library.
-#[derive(Debug, derive_more::From, thiserror::Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
     /// TOML parsing error.
     #[error("TOML deserialization error {0} on manifest {1}")]

library/src/lib.rs

@@ -53,20 +53,21 @@ impl Manifest {
     /// Tries to load a `Manifest` from the file system.
     pub fn load_from_fs(path: impl AsRef<Path>) -> Result<Self, Error> {
         let path = path.as_ref();
-        let mut f = File::open(path).map_err(|e| (e, format!("opening {:?}", path)))?;
+        let mut f = File::open(path).map_err(|e| Error::Io(e, format!("opening {:?}", path)))?;
         let mut data = String::new();
         f.read_to_string(&mut data)
-            .map_err(|e| (e, format!("reading {:?}", path)))?;
-        toml::from_str(&data).map_err(|e| (e, format!("{:?}", path)).into())
+            .map_err(|e| Error::Io(e, format!("reading {:?}", path)))?;
+        toml::from_str(&data).map_err(|e| Error::TomlDe(e, format!("{:?}", path)))
     }
 
     /// Serializes the `Manifest` to a given path.
     pub fn save_to_file(&self, path: impl AsRef<Path>) -> Result<(), Error> {
         let path = path.as_ref();
-        let mut f = File::create(path).map_err(|e| (e, format!("creating {:?}", path)))?;
-        let data = toml::to_vec(self).map_err(|e| (e, format!("serializing {}", self.date)))?;
+        let mut f = File::create(path).map_err(|e| Error::Io(e, format!("creating {:?}", path)))?;
+        let data = toml::to_vec(self)
+            .map_err(|e| Error::TomlSer(e, format!("serializing {}", self.date)))?;
         f.write_all(&data)
-            .map_err(|e| (e, format!("writing to {:?}", path)))?;
+            .map_err(|e| Error::Io(e, format!("writing to {:?}", path)))?;
         Ok(())
     }
 }

library/src/manifest.rs

@@ -1,11 +1,18 @@
 //! Types that are used internally.
 
+use std::fmt;
 use std::{borrow::Borrow, ops::Deref, rc::Rc};
 
 /// Reference-counted build-target triple.
-#[derive(Debug, Clone, Hash, PartialEq, derive_more::Display, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct TargetTripple(Rc<str>);
 
+impl fmt::Display for TargetTripple {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 impl Deref for TargetTripple {
     type Target = str;