~matthiasbeyer/imag

5dc68293540cb2cccfb3a69aec2ff80c78fc1bd2 — Matthias Beyer 2 years ago ef17930
Rename module: linker -> linkable

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
M bin/core/imag-annotate/src/main.rs => bin/core/imag-annotate/src/main.rs +1 -1
@@ 66,7 66,7 @@ use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup;
use libimagstore::store::FileLockEntry;
use libimagstore::iter::get::StoreIdGetIteratorExtension;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;

mod ui;


M bin/core/imag-diagnostics/src/main.rs => bin/core/imag-diagnostics/src/main.rs +1 -1
@@ 55,7 55,7 @@ use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap;
use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreId;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;

use toml::Value;
use toml_query::read::TomlValueReadExt;

M bin/core/imag-link/src/main.rs => bin/core/imag-link/src/main.rs +1 -1
@@ 63,7 63,7 @@ use failure::Error;
use failure::err_msg;

use libimagentryurl::linker::UrlLinker;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagentrylink::storecheck::StoreLinkConsistentExt;
use libimagerror::trace::{MapErrTrace, trace_error};
use libimagerror::exit::ExitUnwrap;

M bin/core/imag-mv/src/main.rs => bin/core/imag-mv/src/main.rs +1 -1
@@ 56,7 56,7 @@ use libimagerror::exit::ExitUnwrap;
use libimagstore::storeid::StoreId;
use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagstore::iter::get::StoreIdGetIteratorExtension;

fn main() {

M bin/domain/imag-bookmark/src/main.rs => bin/domain/imag-bookmark/src/main.rs +1 -1
@@ 62,7 62,7 @@ use libimagerror::trace::{MapErrTrace, trace_error};
use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap;
use libimagutil::debug_result::DebugResult;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;


mod ui;

M bin/domain/imag-wiki/src/main.rs => bin/domain/imag-wiki/src/main.rs +1 -1
@@ 252,7 252,7 @@ fn show(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 name   = String::from(scmd.value_of("delete-name").unwrap()); // safe by clap

M lib/domain/libimagbookmark/src/collection.rs => lib/domain/libimagbookmark/src/collection.rs +1 -1
@@ 36,7 36,7 @@ use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreId;
use libimagentryurl::linker::UrlLinker;
use libimagentryurl::iter::UrlIter;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagentrylink::link::Link as StoreLink;

use crate::link::Link;

M lib/domain/libimaghabit/src/habit.rs => lib/domain/libimaghabit/src/habit.rs +1 -1
@@ 33,7 33,7 @@ use crate::util::IsHabitCheck;
use crate::util::get_string_header_from_entry;
use crate::instance::IsHabitInstance;

use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
use libimagstore::store::Entry;

M lib/domain/libimagwiki/src/wiki.rs => lib/domain/libimagwiki/src/wiki.rs +1 -1
@@ 22,7 22,7 @@ use std::path::PathBuf;
use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
use libimagstore::iter::Entries;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;

use failure::Fallible as Result;
use failure::Error;

M lib/entry/libimagentryannotation/src/annotateable.rs => lib/entry/libimagentryannotation/src/annotateable.rs +1 -1
@@ 24,7 24,7 @@ use libimagstore::store::Entry;
use libimagstore::store::FileLockEntry;
use libimagstore::store::Store;
use libimagstore::storeid::StoreIdIterator;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagentryutil::isa::Is;
use libimagentryutil::isa::IsKindHeaderPathProvider;


M lib/entry/libimagentrycategory/src/category.rs => lib/entry/libimagentrycategory/src/category.rs +1 -1
@@ 22,7 22,7 @@ use libimagentryutil::isa::IsKindHeaderPathProvider;
use libimagstore::store::Entry;
use libimagstore::store::Store;
use libimagstore::storeid::StoreIdIterator;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;

use toml_query::read::TomlValueReadTypeExt;


M lib/entry/libimagentrycategory/src/entry.rs => lib/entry/libimagentrycategory/src/entry.rs +1 -1
@@ 23,7 23,7 @@ use toml_query::read::TomlValueReadTypeExt;
use toml::Value;

use libimagstore::store::Entry;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagerror::errors::ErrorMsg as EM;

use failure::Fallible as Result;

M lib/entry/libimagentrycategory/src/store.rs => lib/entry/libimagentrycategory/src/store.rs +1 -1
@@ 84,7 84,7 @@ impl CategoryStore for Store {
    ///
    /// Automatically removes all category settings from entries which are linked to this category.
    fn delete_category(&self, name: &str) -> Result<()> {
        use libimagentrylink::linker::Linkable;
        use libimagentrylink::linkable::Linkable;
        use crate::category::Category;

        trace!("Deleting category: '{}'", name);

M lib/entry/libimagentrylink/src/lib.rs => lib/entry/libimagentrylink/src/lib.rs +1 -1
@@ 57,7 57,7 @@ extern crate libimagutil;
module_entry_path_mod!("links");

pub mod iter;
pub mod linker;
pub mod linkable;
pub mod link;
pub mod storecheck;


R lib/entry/libimagentrylink/src/linker.rs => lib/entry/libimagentrylink/src/linkable.rs +0 -0
M lib/entry/libimagentrylink/src/storecheck.rs => lib/entry/libimagentrylink/src/storecheck.rs +1 -1
@@ 28,7 28,7 @@ use failure::Fallible as Result;
use failure::Error;
use failure::err_msg;

use crate::linker::*;
use crate::linkable::*;

pub trait StoreLinkConsistentExt {
    fn check_link_consistency(&self) -> Result<()>;

M lib/entry/libimagentrymarkdown/src/processor.rs => lib/entry/libimagentrymarkdown/src/processor.rs +2 -2
@@ 25,7 25,7 @@ use failure::Error;
use crate::link::extract_links;

use libimagentryurl::linker::UrlLinker;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;
use libimagentryref::reference::MutRef;
use libimagentryref::reference::RefFassade;
use libimagentryref::hasher::sha1::Sha1Hasher;


@@ 286,7 286,7 @@ mod tests {
    use std::path::PathBuf;

    use libimagstore::store::Store;
    use libimagentrylink::linker::Linkable;
    use libimagentrylink::linkable::Linkable;

    fn setup_logging() {
        let _ = ::env_logger::try_init();

M lib/entry/libimagentryurl/src/linker.rs => lib/entry/libimagentryurl/src/linker.rs +1 -1
@@ 23,7 23,7 @@ use libimagstore::storeid::StoreId;
use libimagstore::store::Store;
use libimagstore::store::Entry;
use libimagutil::debug_result::DebugResult;
use libimagentrylink::linker::Linkable;
use libimagentrylink::linkable::Linkable;

use failure::Fallible as Result;
use toml::Value;