matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #393 from matthiasbeyer/libimagentrylink/update-url

Browse source 
Update dependency: url: 0.5.5 -> 1.1
This commit is contained in:
Matthias Beyer 2016-05-13 14:41:57 +02:00
commit 1da052b555
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
imag-link/Cargo.toml
View file

@ -9,7 +9,7 @@ clap = "2.1.1"
log = "0.3" log = "0.3"
version = "2.0.1" version = "2.0.1"
toml = "0.1.25" toml = "0.1.25"
url = "0.5.5" url = "1.1"
[dependencies.libimagstore] [dependencies.libimagstore]
path = "../libimagstore" path = "../libimagstore"

2
libimagentrylink/Cargo.toml
View file

@ -8,7 +8,7 @@ itertools = "0.4"
log = "0.3" log = "0.3"
toml = "0.1.27" toml = "0.1.27"
semver = "0.2" semver = "0.2"
url = "0.5.5" url = "1.1"
rust-crypto = "0.2.35" rust-crypto = "0.2.35"
[dependencies.libimagstore] [dependencies.libimagstore]

6
libimagentrylink/src/external.rs
View file

@ -156,7 +156,7 @@ impl ExternalLinker for Entry {
for link in links { // for all links for link in links { // for all links
let hash = { let hash = {
let mut s = Sha1::new(); let mut s = Sha1::new();
s.input_str(&link.serialize()[..]); s.input_str(&link.as_str()[..]);
s.result_str() s.result_str()
}; };
let file_id = ModuleEntryPath::new(format!("external/{}", hash)).into_storeid(); 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)))), 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); debug!("setting URL = '{:?}", v);
table.insert(String::from("url"), v); table.insert(String::from("url"), v);
@ -231,7 +231,7 @@ impl ExternalLinker for Entry {
.and_then(|links| { .and_then(|links| {
debug!("Removing link = '{:?}' from links = {:?}", link, links); debug!("Removing link = '{:?}' from links = {:?}", link, links);
let links = links.into_iter() let links = links.into_iter()
.filter(|l| l.serialize() != link.serialize()) .filter(|l| l.as_str() != link.as_str())
.collect(); .collect();
self.set_external_links(store, links) self.set_external_links(store, links)
}) })