diff --git a/crates/pile-value/src/extract/item/epub/epub_text.rs b/crates/pile-value/src/extract/item/epub/epub_text.rs index 1be990b..e04b83c 100644 --- a/crates/pile-value/src/extract/item/epub/epub_text.rs +++ b/crates/pile-value/src/extract/item/epub/epub_text.rs @@ -6,7 +6,10 @@ use std::{ }; use tracing::debug; -use crate::{value::{Item, PileValue, SyncReadBridge}, extract::traits::ObjectExtractor}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue, SyncReadBridge}, +}; pub struct EpubTextExtractor { item: Item, diff --git a/crates/pile-value/src/extract/item/exif.rs b/crates/pile-value/src/extract/item/exif.rs index 1d8c976..56a5f8d 100644 --- a/crates/pile-value/src/extract/item/exif.rs +++ b/crates/pile-value/src/extract/item/exif.rs @@ -6,7 +6,10 @@ use std::{ }; use tracing::trace; -use crate::{value::{Item, PileValue, SyncReadBridge}, extract::traits::ObjectExtractor}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue, SyncReadBridge}, +}; pub struct ExifExtractor { item: Item, diff --git a/crates/pile-value/src/extract/item/flac.rs b/crates/pile-value/src/extract/item/flac.rs index 6c71210..4d00a88 100644 --- a/crates/pile-value/src/extract/item/flac.rs +++ b/crates/pile-value/src/extract/item/flac.rs @@ -8,8 +8,8 @@ use std::{ }; use crate::{ - value::{Item, PileValue, SyncReadBridge}, extract::traits::{ListExtractor, ObjectExtractor}, + value::{Item, PileValue, SyncReadBridge}, }; pub struct FlacImagesExtractor { diff --git a/crates/pile-value/src/extract/item/fs.rs b/crates/pile-value/src/extract/item/fs.rs index a4c5460..a1cbe40 100644 --- a/crates/pile-value/src/extract/item/fs.rs +++ b/crates/pile-value/src/extract/item/fs.rs @@ -5,7 +5,10 @@ use std::{ sync::{Arc, OnceLock}, }; -use crate::{value::{Item, PileValue}, extract::traits::ObjectExtractor}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue}, +}; pub struct FsExtractor { item: Item, diff --git a/crates/pile-value/src/extract/item/pdf/mod.rs b/crates/pile-value/src/extract/item/pdf/mod.rs index a3a26cf..2a5f6e3 100644 --- a/crates/pile-value/src/extract/item/pdf/mod.rs +++ b/crates/pile-value/src/extract/item/pdf/mod.rs @@ -12,7 +12,10 @@ pub use pdf_meta::*; mod pdf_text; pub use pdf_text::*; -use crate::{value::{Item, PileValue}, extract::traits::ObjectExtractor}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue}, +}; pub struct PdfExtractor { text: Arc, diff --git a/crates/pile-value/src/extract/item/pdf/pdf_meta.rs b/crates/pile-value/src/extract/item/pdf/pdf_meta.rs index bcfc1d8..9c07599 100644 --- a/crates/pile-value/src/extract/item/pdf/pdf_meta.rs +++ b/crates/pile-value/src/extract/item/pdf/pdf_meta.rs @@ -8,7 +8,10 @@ use std::{ }; use tracing::trace; -use crate::{extract::traits::ObjectExtractor, value::{Item, PileValue, SyncReadBridge}}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue, SyncReadBridge}, +}; pub struct PdfMetaExtractor { item: Item, diff --git a/crates/pile-value/src/extract/item/pdf/pdf_text.rs b/crates/pile-value/src/extract/item/pdf/pdf_text.rs index 908e5f5..f8130e7 100644 --- a/crates/pile-value/src/extract/item/pdf/pdf_text.rs +++ b/crates/pile-value/src/extract/item/pdf/pdf_text.rs @@ -8,7 +8,10 @@ use std::{ }; use tracing::trace; -use crate::{extract::traits::ObjectExtractor, value::{Item, PileValue, SyncReadBridge}}; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue, SyncReadBridge}, +}; pub struct PdfTextExtractor { item: Item, diff --git a/crates/pile-value/src/extract/item/sidecar.rs b/crates/pile-value/src/extract/item/sidecar.rs index 60131db..be80951 100644 --- a/crates/pile-value/src/extract/item/sidecar.rs +++ b/crates/pile-value/src/extract/item/sidecar.rs @@ -1,11 +1,11 @@ use pile_config::Label; use std::sync::OnceLock; -use crate::{ - value::{Item, PileValue}, - extract::traits::ObjectExtractor, -}; use super::TomlExtractor; +use crate::{ + extract::traits::ObjectExtractor, + value::{Item, PileValue}, +}; pub struct SidecarExtractor { item: Item, diff --git a/crates/pile-value/src/extract/misc/map.rs b/crates/pile-value/src/extract/misc/map.rs index 5c56363..8005678 100644 --- a/crates/pile-value/src/extract/misc/map.rs +++ b/crates/pile-value/src/extract/misc/map.rs @@ -3,18 +3,11 @@ use std::collections::HashMap; use crate::{extract::traits::ObjectExtractor, value::PileValue}; +#[derive(Default)] pub struct MapExtractor { pub inner: HashMap, } -impl Default for MapExtractor { - fn default() -> Self { - Self { - inner: HashMap::new(), - } - } -} - #[async_trait::async_trait] impl ObjectExtractor for MapExtractor { async fn field(&self, name: &Label) -> Result, std::io::Error> { diff --git a/crates/pile-value/src/extract/misc/vec.rs b/crates/pile-value/src/extract/misc/vec.rs index ccdde88..ef1a5c0 100644 --- a/crates/pile-value/src/extract/misc/vec.rs +++ b/crates/pile-value/src/extract/misc/vec.rs @@ -1,15 +1,10 @@ use crate::{extract::traits::ListExtractor, value::PileValue}; +#[derive(Default)] pub struct VecExtractor { pub inner: Vec, } -impl Default for VecExtractor { - fn default() -> Self { - Self { inner: Vec::new() } - } -} - #[async_trait::async_trait] impl ListExtractor for VecExtractor { async fn get(&self, idx: usize) -> Result, std::io::Error> { diff --git a/crates/pile-value/src/value/mod.rs b/crates/pile-value/src/value/mod.rs index d69a03e..cd64909 100644 --- a/crates/pile-value/src/value/mod.rs +++ b/crates/pile-value/src/value/mod.rs @@ -4,5 +4,6 @@ pub use item::*; mod readers; pub use readers::*; +#[expect(clippy::module_inception)] mod value; pub use value::*; diff --git a/crates/pile-value/src/value/value.rs b/crates/pile-value/src/value/value.rs index 8825fdf..fe6a58d 100644 --- a/crates/pile-value/src/value/value.rs +++ b/crates/pile-value/src/value/value.rs @@ -69,7 +69,7 @@ impl PileValue { Self::U64(_) => Arc::new(MapExtractor::default()), Self::I64(_) => Arc::new(MapExtractor::default()), Self::Array(_) => Arc::new(MapExtractor::default()), - Self::String(s) => Arc::new(StringExtractor::new(&s)), + Self::String(s) => Arc::new(StringExtractor::new(s)), Self::Blob { .. } => Arc::new(MapExtractor::default()), Self::ListExtractor(_) => Arc::new(MapExtractor::default()), Self::ObjectExtractor(e) => e.clone(), @@ -106,7 +106,7 @@ impl PileValue { } }; - out = e.field(&field).await?; + out = e.field(field).await?; } PathSegment::Index(idx) => {