Skip to content

web search done right

chore: fix clippy

Mikkel Denker99dc06ec116b
diff --git a/crates/core/src/crawler/file_queue.rs b/crates/core/src/crawler/file_queue.rs
index ab0315f9..fb4397f9 100644
--- a/crates/core/src/crawler/file_queue.rs
+++ b/crates/core/src/crawler/file_queue.rs
@@ -47,6 +47,7 @@ where
let file = std::fs::OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.read(true)
.open(path.as_ref().join(DATA_KEY))?;
@@ -103,6 +104,7 @@ impl FilePointer {
let file = std::fs::OpenOptions::new()
.create(true)
+ .truncate(false)
.write(true)
.read(true)
.open(path.as_ref().join(POINTER_KEY))?;
diff --git a/crates/core/src/external_sort.rs b/crates/core/src/external_sort.rs
index cba11672..1837775b 100644
--- a/crates/core/src/external_sort.rs
+++ b/crates/core/src/external_sort.rs
@@ -118,6 +118,7 @@ impl TempFile {
.read(true)
.write(true)
.create(true)
+ .truncate(true)
.open(&path)?,
path,
})
diff --git a/crates/core/src/query/pattern_query/scorer.rs b/crates/core/src/query/pattern_query/scorer.rs
index 19157ea3..46243f4b 100644
--- a/crates/core/src/query/pattern_query/scorer.rs
+++ b/crates/core/src/query/pattern_query/scorer.rs
@@ -31,7 +31,7 @@ use super::SmallPatternPart;
pub enum PatternScorer {
Normal(NormalPatternScorer),
- FastSiteDomain(FastSiteDomainPatternScorer),
+ FastSiteDomain(Box<FastSiteDomainPatternScorer>),
Everything(AllScorer),
EmptyField(EmptyFieldScorer),
}
diff --git a/crates/core/src/query/pattern_query/weight.rs b/crates/core/src/query/pattern_query/weight.rs
index bf4d1488..249c723f 100644
--- a/crates/core/src/query/pattern_query/weight.rs
+++ b/crates/core/src/query/pattern_query/weight.rs
@@ -89,7 +89,7 @@ impl tantivy::query::Weight for FastSiteDomainPatternWeight {
_boost: tantivy::Score,
) -> tantivy::Result<Box<dyn tantivy::query::Scorer>> {
if let Some(scorer) = self.pattern_scorer(reader)? {
- Ok(Box::new(PatternScorer::FastSiteDomain(scorer)))
+ Ok(Box::new(PatternScorer::FastSiteDomain(Box::new(scorer))))
} else {
Ok(Box::new(EmptyScorer))
}
diff --git a/crates/core/src/web_spell/stupid_backoff.rs b/crates/core/src/web_spell/stupid_backoff.rs
index 5caf57c4..eaa94a09 100644
--- a/crates/core/src/web_spell/stupid_backoff.rs
+++ b/crates/core/src/web_spell/stupid_backoff.rs
@@ -99,6 +99,7 @@ impl StupidBackoffTrainer {
}
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref().join("ngrams.bin"))?;
@@ -114,6 +115,7 @@ impl StupidBackoffTrainer {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref().join("rotated_ngrams.bin"))?;
@@ -235,6 +237,7 @@ impl StupidBackoff {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref().join("n_counts.bin"))?;
@@ -242,6 +245,7 @@ impl StupidBackoff {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref().join("ngrams.bin"))?;
@@ -257,6 +261,7 @@ impl StupidBackoff {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref().join("rotated_ngrams.bin"))?;
diff --git a/crates/core/src/web_spell/term_freqs.rs b/crates/core/src/web_spell/term_freqs.rs
index a76e22e6..ce845c4e 100644
--- a/crates/core/src/web_spell/term_freqs.rs
+++ b/crates/core/src/web_spell/term_freqs.rs
@@ -52,6 +52,7 @@ impl DictBuilder {
fn build<P: AsRef<Path>>(self, path: P) -> Result<StoredDict> {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref())?;
@@ -87,6 +88,7 @@ impl StoredDict {
fn merge<P: AsRef<Path>>(dicts: Vec<Self>, path: P) -> Result<Self> {
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(path.as_ref())?;
@@ -349,6 +351,7 @@ impl TermDict {
let uuid = uuid::Uuid::new_v4();
let file = OpenOptions::new()
.create(true)
+ .truncate(true)
.write(true)
.open(self.path.join(format!("{}.dict", uuid)))?;
diff --git a/crates/core/src/webgraph/mod.rs b/crates/core/src/webgraph/mod.rs
index f19d4ed8..c816dac7 100644
--- a/crates/core/src/webgraph/mod.rs
+++ b/crates/core/src/webgraph/mod.rs
@@ -441,6 +441,7 @@ impl Meta {
let mut reader = BufReader::new(
File::options()
.create(true)
+ .truncate(false)
.write(true)
.read(true)
.open(path)
diff --git a/crates/core/src/webgraph/store.rs b/crates/core/src/webgraph/store.rs
index 3d7436bf..d407886d 100644
--- a/crates/core/src/webgraph/store.rs
+++ b/crates/core/src/webgraph/store.rs
@@ -339,6 +339,7 @@ impl EdgeStore {
let edge_labels_file = File::options()
.read(true)
.create(true)
+ .truncate(false)
.write(true)
.open(path.as_ref().join("labels"))
.unwrap();
@@ -348,6 +349,7 @@ impl EdgeStore {
let edge_nodes_file = File::options()
.read(true)
.create(true)
+ .truncate(false)
.write(true)
.open(path.as_ref().join("nodes"))
.unwrap();
diff --git a/crates/optics/src/lexer.rs b/crates/optics/src/lexer.rs
index a970a18b..dbcdab25 100644
--- a/crates/optics/src/lexer.rs
+++ b/crates/optics/src/lexer.rs
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
+use std::fmt::Display;
+
use logos::{Lexer, Logos};
use super::{Error, Result};
@@ -54,39 +56,39 @@ pub enum Token<'a> {
Number(&'a str),
}
-impl<'a> ToString for Token<'a> {
- fn to_string(&self) -> String {
+impl<'a> Display for Token<'a> {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
- Token::SemiColon => ";".to_string(),
- Token::Comma => ",".to_string(),
- Token::OpenBracket => "{".to_string(),
- Token::CloseBracket => "}".to_string(),
- Token::OpenParenthesis => "(".to_string(),
- Token::CloseParenthesis => ")".to_string(),
- Token::DiscardNonMatching => "DiscardNonMatching".to_string(),
- Token::Rule => "Rule".to_string(),
- Token::RankingPipeline => "RankingPipeline".to_string(),
- Token::Ranking => "Ranking".to_string(),
- Token::Stage => "Stage".to_string(),
- Token::Signal => "Signal".to_string(),
- Token::Field => "Field".to_string(),
- Token::Matches => "Matches".to_string(),
- Token::Site => "Site".to_string(),
- Token::Url => "Url".to_string(),
- Token::Domain => "Domain".to_string(),
- Token::Title => "Title".to_string(),
- Token::Description => "Description".to_string(),
- Token::Content => "Content".to_string(),
- Token::MicroformatTag => "MicroformatTag".to_string(),
- Token::Schema => "Schema".to_string(),
- Token::Action => "Action".to_string(),
- Token::Boost => "Boost".to_string(),
- Token::Downrank => "Downrank".to_string(),
- Token::Discard => "Discard".to_string(),
- Token::Like => "Like".to_string(),
- Token::Dislike => "Dislike".to_string(),
- Token::String(s) => format!("\"{s}\""),
- Token::Number(n) => n.to_string(),
+ Token::SemiColon => f.write_str(";"),
+ Token::Comma => f.write_str(","),
+ Token::OpenBracket => f.write_str("{"),
+ Token::CloseBracket => f.write_str("}"),
+ Token::OpenParenthesis => f.write_str("("),
+ Token::CloseParenthesis => f.write_str(")"),
+ Token::DiscardNonMatching => f.write_str("DiscardNonMatching"),
+ Token::Rule => f.write_str("Rule"),
+ Token::RankingPipeline => f.write_str("RankingPipeline"),
+ Token::Ranking => f.write_str("Ranking"),
+ Token::Stage => f.write_str("Stage"),
+ Token::Signal => f.write_str("Signal"),
+ Token::Field => f.write_str("Field"),
+ Token::Matches => f.write_str("Matches"),
+ Token::Site => f.write_str("Site"),
+ Token::Url => f.write_str("Url"),
+ Token::Domain => f.write_str("Domain"),
+ Token::Title => f.write_str("Title"),
+ Token::Description => f.write_str("Description"),
+ Token::Content => f.write_str("Content"),
+ Token::MicroformatTag => f.write_str("MicroformatTag"),
+ Token::Schema => f.write_str("Schema"),
+ Token::Action => f.write_str("Action"),
+ Token::Boost => f.write_str("Boost"),
+ Token::Downrank => f.write_str("Downrank"),
+ Token::Discard => f.write_str("Discard"),
+ Token::Like => f.write_str("Like"),
+ Token::Dislike => f.write_str("Dislike"),
+ Token::String(s) => write!(f, "\"{s}\""),
+ Token::Number(n) => write!(f, "{n}"),
}
}
}