diff --git a/libclide-macros/src/lib.rs b/libclide-macros/src/lib.rs index 03d4fda..9ccb788 100644 --- a/libclide-macros/src/lib.rs +++ b/libclide-macros/src/lib.rs @@ -9,15 +9,11 @@ use syn::{ItemStruct, parse_macro_input}; #[proc_macro_attribute] pub fn log_id(_attr: TokenStream, item: TokenStream) -> TokenStream { let input = parse_macro_input!(item as ItemStruct); - let struct_name = &input.ident; let generics = &input.generics; - // This is the important part let (impl_generics, type_generics, where_clause) = generics.split_for_impl(); - let struct_name_str = struct_name.to_string(); - let expanded = quote! { #input diff --git a/libclide/src/fs.rs b/libclide/src/fs.rs index 484ea1e..aaee11e 100644 --- a/libclide/src/fs.rs +++ b/libclide/src/fs.rs @@ -4,15 +4,4 @@ pub mod entry_meta; -use devicons::FileIcon; -use std::path::Path; - -pub fn icon>(p: P) -> FileIcon { - let path = p.as_ref(); - if Path::new(&path).is_dir() { - // Ensures directories are given a folder icon and not mistakenly resolved to a language. - // For example, a directory named `cpp` would otherwise return a C++ icon. - return FileIcon::from("dir/"); - } - FileIcon::from(path) -} +pub use entry_meta::icon; diff --git a/libclide/src/fs/entry_meta.rs b/libclide/src/fs/entry_meta.rs index 55749c9..148df0b 100644 --- a/libclide/src/fs/entry_meta.rs +++ b/libclide/src/fs/entry_meta.rs @@ -52,3 +52,13 @@ impl EntryMeta { }) } } + +pub fn icon>(p: P) -> FileIcon { + let path = p.as_ref(); + if Path::new(&path).is_dir() { + // Ensures directories are given a folder icon and not mistakenly resolved to a language. + // For example, a directory named `cpp` would otherwise return a C++ icon. + return FileIcon::from("dir/"); + } + FileIcon::from(path) +}