3437: Make clippy happy for Rust 1.67, allow uninlined_format_args r=Kerollmops a=dureuill

# Pull Request

This PR is the equivalent of #3434 for the `release-v1.0.0` branch.

See #3434 for more information.

Co-authored-by: Louis Dureuil <louis@meilisearch.com>
This commit is contained in:
bors[bot] 2023-01-31 10:29:12 +00:00 committed by GitHub
commit 544b581b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions

View File

@ -108,7 +108,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: clippy command: clippy
args: --all-targets -- --deny warnings args: --all-targets -- --deny warnings --allow clippy::uninlined_format_args
fmt: fmt:
name: Run Rustfmt name: Run Rustfmt

View File

@ -198,7 +198,7 @@ impl From<KindWithContent> for KindDump {
#[cfg(test)] #[cfg(test)]
pub(crate) mod test { pub(crate) mod test {
use std::fs::File; use std::fs::File;
use std::io::{Seek, SeekFrom}; use std::io::Seek;
use std::str::FromStr; use std::str::FromStr;
use big_s::S; use big_s::S;
@ -410,7 +410,7 @@ pub(crate) mod test {
// create the dump // create the dump
let mut file = tempfile::tempfile().unwrap(); let mut file = tempfile::tempfile().unwrap();
dump.persist_to(&mut file).unwrap(); dump.persist_to(&mut file).unwrap();
file.seek(SeekFrom::Start(0)).unwrap(); file.rewind().unwrap();
file file
} }

View File

@ -33,7 +33,7 @@
//! //!
use std::fs::{self, File}; use std::fs::{self, File};
use std::io::{BufRead, BufReader, ErrorKind, Seek, SeekFrom}; use std::io::{BufRead, BufReader, ErrorKind, Seek};
use std::path::Path; use std::path::Path;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -178,7 +178,7 @@ impl V5Reader {
} }
pub fn keys(&mut self) -> Result<Box<dyn Iterator<Item = Result<Key>> + '_>> { pub fn keys(&mut self) -> Result<Box<dyn Iterator<Item = Result<Key>> + '_>> {
self.keys.seek(SeekFrom::Start(0))?; self.keys.rewind()?;
Ok(Box::new( Ok(Box::new(
(&mut self.keys).lines().map(|line| -> Result<_> { Ok(serde_json::from_str(&line?)?) }), (&mut self.keys).lines().map(|line| -> Result<_> { Ok(serde_json::from_str(&line?)?) }),
)) ))

View File

@ -960,9 +960,9 @@ impl IndexScheduler {
/// ///
/// ## Return /// ## Return
/// The list of processed tasks. /// The list of processed tasks.
fn apply_index_operation<'txn, 'i>( fn apply_index_operation<'i>(
&self, &self,
index_wtxn: &'txn mut RwTxn<'i, '_>, index_wtxn: &mut RwTxn<'i, '_>,
index: &'i Index, index: &'i Index,
operation: IndexOperation, operation: IndexOperation,
) -> Result<Vec<Task>> { ) -> Result<Vec<Task>> {

View File

@ -473,10 +473,10 @@ fn make_document(
Ok(document) Ok(document)
} }
fn format_fields<'a, A: AsRef<[u8]>>( fn format_fields<A: AsRef<[u8]>>(
document: &Document, document: &Document,
field_ids_map: &FieldsIdsMap, field_ids_map: &FieldsIdsMap,
builder: &MatcherBuilder<'a, A>, builder: &MatcherBuilder<'_, A>,
formatted_options: &BTreeMap<FieldId, FormatOptions>, formatted_options: &BTreeMap<FieldId, FormatOptions>,
compute_matches: bool, compute_matches: bool,
displayable_ids: &BTreeSet<FieldId>, displayable_ids: &BTreeSet<FieldId>,
@ -521,9 +521,9 @@ fn format_fields<'a, A: AsRef<[u8]>>(
Ok((matches_position, document)) Ok((matches_position, document))
} }
fn format_value<'a, A: AsRef<[u8]>>( fn format_value<A: AsRef<[u8]>>(
value: Value, value: Value,
builder: &MatcherBuilder<'a, A>, builder: &MatcherBuilder<'_, A>,
format_options: Option<FormatOptions>, format_options: Option<FormatOptions>,
infos: &mut Vec<MatchBounds>, infos: &mut Vec<MatchBounds>,
compute_matches: bool, compute_matches: bool,

View File

@ -72,9 +72,9 @@ pub fn map_leaf_values<'a>(
map_leaf_values_in_object(value, &selectors, "", &mut mapper); map_leaf_values_in_object(value, &selectors, "", &mut mapper);
} }
pub fn map_leaf_values_in_object<'a>( pub fn map_leaf_values_in_object(
value: &mut Map<String, Value>, value: &mut Map<String, Value>,
selectors: &[&'a str], selectors: &[&str],
base_key: &str, base_key: &str,
mapper: &mut impl FnMut(&str, &mut Value), mapper: &mut impl FnMut(&str, &mut Value),
) { ) {