summaryrefslogtreecommitdiffstats
path: root/lib/entry/libimagentrylink
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-02-28 17:28:32 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-05-18 00:20:59 +0200
commit1d8984461395c37fdbcd59a0b9488b076084c89a (patch)
treeb98795420280291c9dc2a9d56229b9af593f2bcb /lib/entry/libimagentrylink
parent51daf28509b913a8159ad3a097304645db7e263f (diff)
Run 'cargo fix' for rust-2018
With this patch we move the codebase to Rust-2018. The diff was generated by executing cargo fix --all --all-features --edition on the codebase. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/entry/libimagentrylink')
-rw-r--r--lib/entry/libimagentrylink/src/external.rs10
-rw-r--r--lib/entry/libimagentrylink/src/internal.rs2
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/entry/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs
index 93627235..3151ebe2 100644
--- a/lib/entry/libimagentrylink/src/external.rs
+++ b/lib/entry/libimagentrylink/src/external.rs
@@ -48,7 +48,7 @@ use failure::Fallible as Result;
use failure::ResultExt;
use failure::err_msg;
-use internal::InternalLinker;
+use crate::internal::InternalLinker;
use self::iter::*;
@@ -132,8 +132,8 @@ pub mod iter {
use libimagutil::debug_result::*;
use libimagstore::store::Store;
- use internal::Link;
- use internal::iter::LinkIter;
+ use crate::internal::Link;
+ use crate::internal::iter::LinkIter;
use failure::Fallible as Result;
use url::Url;
@@ -262,7 +262,7 @@ pub mod iter {
type Item = Result<Url>;
fn next(&mut self) -> Option<Self::Item> {
- use external::Link;
+ use crate::external::Link;
loop {
let next = self.0
@@ -335,7 +335,7 @@ impl ExternalLinker for Entry {
debug!("Iterating {} links = {:?}", links.len(), links);
links.into_iter().map(|link| {
let hash = hex::encode(Sha1::digest(&link.as_str().as_bytes()));
- let file_id = ::module_path::new_id(format!("external/{}", hash))
+ let file_id = crate::module_path::new_id(format!("external/{}", hash))
.map_dbg_err(|_| {
format!("Failed to build StoreId for this hash '{:?}'", hash)
})?;
diff --git a/lib/entry/libimagentrylink/src/internal.rs b/lib/entry/libimagentrylink/src/internal.rs
index be979e00..2ed5e5f6 100644
--- a/lib/entry/libimagentrylink/src/internal.rs
+++ b/lib/entry/libimagentrylink/src/internal.rs
@@ -504,7 +504,7 @@ pub mod store_check {
fn check_link_consistency(&self) -> Result<()> {
use std::collections::HashMap;
- use internal::InternalLinker;
+ use crate::internal::InternalLinker;
use libimagstore::storeid::StoreId;
use libimagutil::debug_result::DebugResult;