diff --git a/imag-link/Cargo.toml b/imag-link/Cargo.toml index 21e4e72b..858ff6f0 100644 --- a/imag-link/Cargo.toml +++ b/imag-link/Cargo.toml @@ -9,7 +9,7 @@ clap = "2.1.1" log = "0.3" version = "2.0.1" toml = "0.1.25" -url = "0.5.5" +url = "1.1" [dependencies.libimagstore] path = "../libimagstore" diff --git a/libimagentrylink/Cargo.toml b/libimagentrylink/Cargo.toml index 6dfef016..7ac8457e 100644 --- a/libimagentrylink/Cargo.toml +++ b/libimagentrylink/Cargo.toml @@ -8,7 +8,7 @@ itertools = "0.4" log = "0.3" toml = "0.1.27" semver = "0.2" -url = "0.5.5" +url = "1.1" rust-crypto = "0.2.35" [dependencies.libimagstore] diff --git a/libimagentrylink/src/external.rs b/libimagentrylink/src/external.rs index e99abf42..d83a1b9d 100644 --- a/libimagentrylink/src/external.rs +++ b/libimagentrylink/src/external.rs @@ -156,7 +156,7 @@ impl ExternalLinker for Entry { for link in links { // for all links let hash = { let mut s = Sha1::new(); - s.input_str(&link.serialize()[..]); + s.input_str(&link.as_str()[..]); s.result_str() }; let file_id = ModuleEntryPath::new(format!("external/{}", hash)).into_storeid(); @@ -189,7 +189,7 @@ impl ExternalLinker for Entry { Err(e) => return Err(LE::new(LEK::StoreWriteError, Some(Box::new(e)))), }; - let v = Value::String(link.serialize()); + let v = Value::String(link.into_string()); debug!("setting URL = '{:?}", v); table.insert(String::from("url"), v); @@ -231,7 +231,7 @@ impl ExternalLinker for Entry { .and_then(|links| { debug!("Removing link = '{:?}' from links = {:?}", link, links); let links = links.into_iter() - .filter(|l| l.serialize() != link.serialize()) + .filter(|l| l.as_str() != link.as_str()) .collect(); self.set_external_links(store, links) })