diff --git a/src/core/mod.rs b/src/core/mod.rs index f6ac8fc..eec3c89 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -1 +1 @@ -pub mod traits; +pub mod shared; diff --git a/src/core/traits.rs b/src/core/shared.rs similarity index 100% rename from src/core/traits.rs rename to src/core/shared.rs diff --git a/src/matcher/flx.rs b/src/matcher/flx.rs index 8b363d0..1b6fdb7 100644 --- a/src/matcher/flx.rs +++ b/src/matcher/flx.rs @@ -1,4 +1,4 @@ -use super::core::traits::Matcher; +use super::core::shared::Matcher; use flx_rs::Score; use log::debug; diff --git a/src/matcher/fuse.rs b/src/matcher/fuse.rs index cd90e8a..3ab24f8 100644 --- a/src/matcher/fuse.rs +++ b/src/matcher/fuse.rs @@ -2,7 +2,7 @@ use std::ops::Range; use fuse_rust::Fuse; -use super::core::traits::Matcher; +use super::core::shared::Matcher; fn flatten_ranges(ranges: Vec>) -> Vec { ranges.into_iter().flat_map(|range| {range.collect::>().into_iter()}) diff --git a/src/matcher/prefix.rs b/src/matcher/prefix.rs index b00c47e..af5c074 100644 --- a/src/matcher/prefix.rs +++ b/src/matcher/prefix.rs @@ -1,4 +1,4 @@ -use super::core::traits::Matcher; +use super::core::shared::Matcher; pub struct PrefixMatcher; diff --git a/src/matcher/skim.rs b/src/matcher/skim.rs index 37399da..11ede15 100644 --- a/src/matcher/skim.rs +++ b/src/matcher/skim.rs @@ -1,6 +1,6 @@ use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2}; -use super::core::traits::Matcher; +use super::core::shared::Matcher; pub struct SkimMatcher { matcher: SkimMatcherV2 diff --git a/src/roftl.rs b/src/roftl.rs index fa91788..621f478 100644 --- a/src/roftl.rs +++ b/src/roftl.rs @@ -5,9 +5,9 @@ use rayon::prelude::*; use super::matcher::PrefixMatcher; -use super::core::traits::Matcher; -use super::core::traits::Source; -use super::core::traits::Entry; +use super::core::shared::Matcher; +use super::core::shared::Source; +use super::core::shared::Entry; pub type SourceRef = Box; diff --git a/src/sources/apps.rs b/src/sources/apps.rs index 1634fe2..f96988d 100644 --- a/src/sources/apps.rs +++ b/src/sources/apps.rs @@ -5,7 +5,7 @@ use log::{debug, error, trace}; use walkdir::WalkDir; use nix::unistd::{getpid, setpgid}; -use super::core::traits::{Entry, Source}; +use super::core::shared::{Entry, Source}; #[derive(Debug)] struct App { diff --git a/src/sources/shellhost.rs b/src/sources/shellhost.rs index 18655a7..802ed89 100644 --- a/src/sources/shellhost.rs +++ b/src/sources/shellhost.rs @@ -3,7 +3,7 @@ use log::{debug, error}; use nix::unistd::{getpid, setpgid}; use walkdir::WalkDir; -use super::core::traits::{Entry, Source}; +use super::core::shared::{Entry, Source}; pub struct ShellHost { scripts: Vec, diff --git a/src/sources/test.rs b/src/sources/test.rs index 1998d1c..b500517 100644 --- a/src/sources/test.rs +++ b/src/sources/test.rs @@ -1,4 +1,4 @@ -use super::core::traits::{Entry, Source}; +use super::core::shared::{Entry, Source}; pub struct TestSource { entries: Vec, diff --git a/src/sources/windows.rs b/src/sources/windows.rs index a5e4984..b78efd4 100644 --- a/src/sources/windows.rs +++ b/src/sources/windows.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use super::core::traits::{Entry, Source}; +use super::core::shared::{Entry, Source}; use log::debug; use xcb::ffi::XCB_CURRENT_TIME; use xcb_util::ewmh; diff --git a/src/ui/ui.rs b/src/ui/ui.rs index 80026dc..c252d90 100644 --- a/src/ui/ui.rs +++ b/src/ui/ui.rs @@ -4,7 +4,7 @@ use std::ffi::c_void; use log::debug; use winit::{platform::unix::WindowExtUnix, window::Window}; -use super::core::traits::Entry; +use super::core::shared::Entry; use super::painter;