Rename module: linker -> linkable
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
parent
ef17930c29
commit
5dc6829354
18 changed files with 18 additions and 18 deletions
|
@ -66,7 +66,7 @@ use libimagrt::runtime::Runtime;
|
||||||
use libimagrt::setup::generate_runtime_setup;
|
use libimagrt::setup::generate_runtime_setup;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::iter::get::StoreIdGetIteratorExtension;
|
use libimagstore::iter::get::StoreIdGetIteratorExtension;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
mod ui;
|
mod ui;
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ use libimagerror::io::ToExitCode;
|
||||||
use libimagerror::exit::ExitUnwrap;
|
use libimagerror::exit::ExitUnwrap;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::storeid::StoreId;
|
use libimagstore::storeid::StoreId;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
use toml::Value;
|
use toml::Value;
|
||||||
use toml_query::read::TomlValueReadExt;
|
use toml_query::read::TomlValueReadExt;
|
||||||
|
|
|
@ -63,7 +63,7 @@ use failure::Error;
|
||||||
use failure::err_msg;
|
use failure::err_msg;
|
||||||
|
|
||||||
use libimagentryurl::linker::UrlLinker;
|
use libimagentryurl::linker::UrlLinker;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagentrylink::storecheck::StoreLinkConsistentExt;
|
use libimagentrylink::storecheck::StoreLinkConsistentExt;
|
||||||
use libimagerror::trace::{MapErrTrace, trace_error};
|
use libimagerror::trace::{MapErrTrace, trace_error};
|
||||||
use libimagerror::exit::ExitUnwrap;
|
use libimagerror::exit::ExitUnwrap;
|
||||||
|
|
|
@ -56,7 +56,7 @@ use libimagerror::exit::ExitUnwrap;
|
||||||
use libimagstore::storeid::StoreId;
|
use libimagstore::storeid::StoreId;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagstore::iter::get::StoreIdGetIteratorExtension;
|
use libimagstore::iter::get::StoreIdGetIteratorExtension;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
|
|
@ -62,7 +62,7 @@ use libimagerror::trace::{MapErrTrace, trace_error};
|
||||||
use libimagerror::io::ToExitCode;
|
use libimagerror::io::ToExitCode;
|
||||||
use libimagerror::exit::ExitUnwrap;
|
use libimagerror::exit::ExitUnwrap;
|
||||||
use libimagutil::debug_result::DebugResult;
|
use libimagutil::debug_result::DebugResult;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
|
|
||||||
mod ui;
|
mod ui;
|
||||||
|
|
|
@ -252,7 +252,7 @@ fn show(rt: &Runtime, wiki_name: &str) {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn delete(rt: &Runtime, wiki_name: &str) {
|
fn delete(rt: &Runtime, wiki_name: &str) {
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
let scmd = rt.cli().subcommand_matches("delete").unwrap(); // safed by clap
|
let scmd = rt.cli().subcommand_matches("delete").unwrap(); // safed by clap
|
||||||
let name = String::from(scmd.value_of("delete-name").unwrap()); // safe by clap
|
let name = String::from(scmd.value_of("delete-name").unwrap()); // safe by clap
|
||||||
|
|
|
@ -36,7 +36,7 @@ use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::storeid::StoreId;
|
use libimagstore::storeid::StoreId;
|
||||||
use libimagentryurl::linker::UrlLinker;
|
use libimagentryurl::linker::UrlLinker;
|
||||||
use libimagentryurl::iter::UrlIter;
|
use libimagentryurl::iter::UrlIter;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagentrylink::link::Link as StoreLink;
|
use libimagentrylink::link::Link as StoreLink;
|
||||||
|
|
||||||
use crate::link::Link;
|
use crate::link::Link;
|
||||||
|
|
|
@ -33,7 +33,7 @@ use crate::util::IsHabitCheck;
|
||||||
use crate::util::get_string_header_from_entry;
|
use crate::util::get_string_header_from_entry;
|
||||||
use crate::instance::IsHabitInstance;
|
use crate::instance::IsHabitInstance;
|
||||||
|
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::store::Entry;
|
use libimagstore::store::Entry;
|
||||||
|
|
|
@ -22,7 +22,7 @@ use std::path::PathBuf;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::iter::Entries;
|
use libimagstore::iter::Entries;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
use failure::Fallible as Result;
|
use failure::Fallible as Result;
|
||||||
use failure::Error;
|
use failure::Error;
|
||||||
|
|
|
@ -24,7 +24,7 @@ use libimagstore::store::Entry;
|
||||||
use libimagstore::store::FileLockEntry;
|
use libimagstore::store::FileLockEntry;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::storeid::StoreIdIterator;
|
use libimagstore::storeid::StoreIdIterator;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagentryutil::isa::Is;
|
use libimagentryutil::isa::Is;
|
||||||
use libimagentryutil::isa::IsKindHeaderPathProvider;
|
use libimagentryutil::isa::IsKindHeaderPathProvider;
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ use libimagentryutil::isa::IsKindHeaderPathProvider;
|
||||||
use libimagstore::store::Entry;
|
use libimagstore::store::Entry;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::storeid::StoreIdIterator;
|
use libimagstore::storeid::StoreIdIterator;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
use toml_query::read::TomlValueReadTypeExt;
|
use toml_query::read::TomlValueReadTypeExt;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ use toml_query::read::TomlValueReadTypeExt;
|
||||||
use toml::Value;
|
use toml::Value;
|
||||||
|
|
||||||
use libimagstore::store::Entry;
|
use libimagstore::store::Entry;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagerror::errors::ErrorMsg as EM;
|
use libimagerror::errors::ErrorMsg as EM;
|
||||||
|
|
||||||
use failure::Fallible as Result;
|
use failure::Fallible as Result;
|
||||||
|
|
|
@ -84,7 +84,7 @@ impl CategoryStore for Store {
|
||||||
///
|
///
|
||||||
/// Automatically removes all category settings from entries which are linked to this category.
|
/// Automatically removes all category settings from entries which are linked to this category.
|
||||||
fn delete_category(&self, name: &str) -> Result<()> {
|
fn delete_category(&self, name: &str) -> Result<()> {
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use crate::category::Category;
|
use crate::category::Category;
|
||||||
|
|
||||||
trace!("Deleting category: '{}'", name);
|
trace!("Deleting category: '{}'", name);
|
||||||
|
|
|
@ -57,7 +57,7 @@ extern crate libimagutil;
|
||||||
module_entry_path_mod!("links");
|
module_entry_path_mod!("links");
|
||||||
|
|
||||||
pub mod iter;
|
pub mod iter;
|
||||||
pub mod linker;
|
pub mod linkable;
|
||||||
pub mod link;
|
pub mod link;
|
||||||
pub mod storecheck;
|
pub mod storecheck;
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ use failure::Fallible as Result;
|
||||||
use failure::Error;
|
use failure::Error;
|
||||||
use failure::err_msg;
|
use failure::err_msg;
|
||||||
|
|
||||||
use crate::linker::*;
|
use crate::linkable::*;
|
||||||
|
|
||||||
pub trait StoreLinkConsistentExt {
|
pub trait StoreLinkConsistentExt {
|
||||||
fn check_link_consistency(&self) -> Result<()>;
|
fn check_link_consistency(&self) -> Result<()>;
|
||||||
|
|
|
@ -25,7 +25,7 @@ use failure::Error;
|
||||||
use crate::link::extract_links;
|
use crate::link::extract_links;
|
||||||
|
|
||||||
use libimagentryurl::linker::UrlLinker;
|
use libimagentryurl::linker::UrlLinker;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
use libimagentryref::reference::MutRef;
|
use libimagentryref::reference::MutRef;
|
||||||
use libimagentryref::reference::RefFassade;
|
use libimagentryref::reference::RefFassade;
|
||||||
use libimagentryref::hasher::sha1::Sha1Hasher;
|
use libimagentryref::hasher::sha1::Sha1Hasher;
|
||||||
|
@ -286,7 +286,7 @@ mod tests {
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
let _ = ::env_logger::try_init();
|
let _ = ::env_logger::try_init();
|
||||||
|
|
|
@ -23,7 +23,7 @@ use libimagstore::storeid::StoreId;
|
||||||
use libimagstore::store::Store;
|
use libimagstore::store::Store;
|
||||||
use libimagstore::store::Entry;
|
use libimagstore::store::Entry;
|
||||||
use libimagutil::debug_result::DebugResult;
|
use libimagutil::debug_result::DebugResult;
|
||||||
use libimagentrylink::linker::Linkable;
|
use libimagentrylink::linkable::Linkable;
|
||||||
|
|
||||||
use failure::Fallible as Result;
|
use failure::Fallible as Result;
|
||||||
use toml::Value;
|
use toml::Value;
|
||||||
|
|
Loading…
Reference in a new issue