mirror of
https://github.com/widberg/bff
synced 2026-08-23 14:26:03 -04:00
New clippy lint
This commit is contained in:
parent
7d5e6bed81
commit
affa3b3264
41 changed files with 55 additions and 45 deletions
|
|
@ -32,6 +32,7 @@ single_option_map = "warn"
|
|||
str_to_string = "warn"
|
||||
unnecessary_debug_formatting = "warn"
|
||||
unnecessary_semicolon = "warn"
|
||||
unused_trait_names = "warn"
|
||||
use_self = "warn"
|
||||
used_underscore_binding = "warn"
|
||||
used_underscore_items = "warn"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::collections::HashSet;
|
||||
use std::fs::File;
|
||||
use std::io::{BufWriter, Write};
|
||||
use std::io::{BufWriter, Write as _};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use bff::names::{Name, NameContext, NameType};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use std::io::{self, BufRead, Read};
|
||||
use std::io::{self, BufRead as _, Read as _};
|
||||
|
||||
use bff::crc::{
|
||||
asobo_alternate32_options,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use bff::bigfile::resource::bff_resource::BffResource;
|
|||
use bff::bigfile::versions::Version;
|
||||
use bff::class::bff_class::BffClass;
|
||||
use bff::names::NameContext;
|
||||
use bff::traits::Import;
|
||||
use bff::traits::Import as _;
|
||||
use indicatif::{ProgressBar, ProgressStyle};
|
||||
|
||||
use crate::error::BffCliResult;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use bff::bigfile::platforms::Platform;
|
|||
use bff::bigfile::versions::Version;
|
||||
use bff::class::bff_class::BffClass;
|
||||
use bff::names::NameContext;
|
||||
use bff::traits::Import;
|
||||
use bff::traits::Import as _;
|
||||
|
||||
use crate::error::BffCliResult;
|
||||
use crate::shared::{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::collections::BTreeMap;
|
||||
use std::fs::File;
|
||||
use std::io::Write;
|
||||
use std::io::Write as _;
|
||||
use std::path::Path;
|
||||
|
||||
use bff::BufReader;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ use bff::bigfile::platforms::Platform;
|
|||
use bff::bigfile::resource::bff_resource::BffResourceRef;
|
||||
use bff::bigfile::versions::Version;
|
||||
use bff::names::NameContext;
|
||||
use bff::traits::Export;
|
||||
use bff::traits::Export as _;
|
||||
use clap::ValueEnum;
|
||||
use indicatif::{ProgressBar, ProgressStyle};
|
||||
use rayon::iter::{ParallelBridge, ParallelIterator};
|
||||
use rayon::iter::{ParallelBridge as _, ParallelIterator as _};
|
||||
|
||||
use crate::error::{BffCliError, BffCliResult};
|
||||
use crate::shared::{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use bff::bigfile::platforms::Platform;
|
|||
use bff::bigfile::resource::bff_resource::{BffResource, BffResourceHeader};
|
||||
use bff::bigfile::versions::Version;
|
||||
use bff::names::NameContext;
|
||||
use bff::traits::Export;
|
||||
use bff::traits::Export as _;
|
||||
|
||||
use crate::error::BffCliResult;
|
||||
use crate::shared::{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
use std::fs::File;
|
||||
use std::io::{BufWriter, Read, Write};
|
||||
use std::io::{BufWriter, Read as _, Write as _};
|
||||
use std::path::Path;
|
||||
|
||||
use bff::BufReader;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
use std::fs::File;
|
||||
use std::io::{self, BufWriter, Write};
|
||||
use std::io::{self, BufWriter, Write as _};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use bff::petgraph::dot::{Config, Dot};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use bff::names::{
|
|||
get_forced_hash_string_for_type,
|
||||
};
|
||||
use bff::petgraph;
|
||||
use bff::petgraph::visit::{VisitMap, Visitable};
|
||||
use bff::petgraph::visit::{VisitMap as _, Visitable as _};
|
||||
use clap::ValueEnum;
|
||||
use indicatif::{ProgressBar, ProgressStyle};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
use std::fs::File;
|
||||
use std::io::{BufWriter, Write};
|
||||
use std::io::{BufWriter, Write as _};
|
||||
use std::path::Path;
|
||||
|
||||
use bff::BufReader;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use proc_macro2::TokenStream;
|
||||
use quote::quote;
|
||||
use syn::spanned::Spanned;
|
||||
use syn::spanned::Spanned as _;
|
||||
use syn::{Attribute, Data, DeriveInput, Fields, Ident};
|
||||
|
||||
fn does_not_have_skip_attr(attrs: &Vec<Attribute>) -> bool {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ use crate::bigfile::v2_128_92_19_pc::BigFileV2_128_92_19PC;
|
|||
use crate::bigfile::v2_256_38_19_pc::BigFileV2_256_38_19PC;
|
||||
use crate::macros::bigfiles::bigfiles;
|
||||
use crate::names::{Name, NameContext};
|
||||
use crate::traits::ReferencedNames;
|
||||
use crate::traits::ReferencedNames as _;
|
||||
|
||||
pub static DEFAULT_TAG: &str = "made with <3 by bff contributors (https://github.com/widberg/bff)";
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ impl BigFile {
|
|||
_platform: crate::bigfile::platforms::Platform,
|
||||
version_override: Option<&crate::bigfile::versions::Version>,
|
||||
) -> crate::BffResult<crate::names::NameType> {
|
||||
use binrw::BinRead;
|
||||
use binrw::BinRead as _;
|
||||
|
||||
let start = reader.stream_position()?;
|
||||
let version: crate::bigfile::versions::Version =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinWrite, binrw};
|
||||
use binrw::{BinRead as _, BinWrite as _, binrw};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ use crate::bigfile::versions::Version;
|
|||
use crate::class::Class;
|
||||
use crate::class::bff_class::BffClass;
|
||||
use crate::names::{NameContext, NameType};
|
||||
use crate::traits::FromResource;
|
||||
use crate::traits::FromResource as _;
|
||||
|
||||
pub struct BffResource {
|
||||
pub header: BffResourceHeader,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use std::cmp::max;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian};
|
||||
use block::Block;
|
||||
use header::{BlockDescription, Header};
|
||||
use resource::Resource;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian, args, binread, parser};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian, args, binread, parser};
|
||||
|
||||
use crate::bigfile::resource::ResourceData::SplitData;
|
||||
use crate::lz::lzrs_decompress_body_parser;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use std::cmp::max;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _};
|
||||
use block::Block;
|
||||
use header::*;
|
||||
use resource::Resource;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian, binread};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian, binread};
|
||||
|
||||
use crate::bigfile::resource::ResourceData::{Data, SplitData};
|
||||
use crate::bigfile::v1_06_63_02_pc::resource::body_parser;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ use std::cmp::max;
|
|||
use std::collections::{HashMap, HashSet, hash_map};
|
||||
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian};
|
||||
use header::*;
|
||||
use pool::{Pool, PoolManifest, ResourceDescription, calculate_padded_pool_header_size};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ use std::cmp::max;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian};
|
||||
use block::*;
|
||||
use header::*;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::cmp::max;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian, binread, binrw, parser};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite, Endian, binread, binrw, parser};
|
||||
|
||||
use crate::BffResult;
|
||||
use crate::bigfile::BigFile;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ pub mod resource;
|
|||
|
||||
use std::cmp::max;
|
||||
use std::collections::{HashMap, HashSet, hash_map};
|
||||
use std::default::Default;
|
||||
use std::default::Default as _;
|
||||
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian};
|
||||
use block::Block;
|
||||
use header::{BlockDescription, Header};
|
||||
use pool::Pool;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian, args, binread, parser};
|
||||
use binrw::{BinRead, BinResult, BinWrite as _, Endian, args, binread, parser};
|
||||
use derive_more::{Deref, DerefMut};
|
||||
|
||||
use crate::bigfile::resource::ResourceData::SplitData;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pub mod resource;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult};
|
||||
use binrw::{BinRead as _, BinResult};
|
||||
use block::*;
|
||||
use header::{BlockDescription, Header, Resources};
|
||||
use resource::Resource;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pub mod resource;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult};
|
||||
use binrw::{BinRead as _, BinResult};
|
||||
use block::*;
|
||||
use header::{BlockDescription, Header, Resources};
|
||||
use resource::Resource;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ pub mod header;
|
|||
use std::collections::HashMap;
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinResult};
|
||||
use binrw::{BinRead as _, BinResult};
|
||||
use header::{BlockDescription, Header, Resources};
|
||||
|
||||
use crate::BffResult;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use crate::bigfile::resource::bff_resource::{BffResource, BffResourceHeader};
|
|||
use crate::bigfile::versions::Version;
|
||||
use crate::class::Class;
|
||||
use crate::names::NameContext;
|
||||
use crate::traits::ToResource;
|
||||
use crate::traits::ToResource as _;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
|
||||
pub struct BffClass {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use binrw::{BinRead, BinResult, BinWrite};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _};
|
||||
|
||||
use crate::class::trivial_class::TrivialClass;
|
||||
use crate::helpers::{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::io::{Read, Seek, Write};
|
|||
|
||||
use bff_derive::ReferencedNames;
|
||||
use bilge::prelude::*;
|
||||
use binrw::{BinRead, BinResult, BinWrite, BinWriterExt, Endian};
|
||||
use binrw::{BinRead, BinResult, BinWrite, BinWriterExt as _, Endian};
|
||||
use derive_more::{Deref, DerefMut};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ impl Import for MaterialObjV1_381_67_09PC {}
|
|||
mod material_obj_entries {
|
||||
use indexmap::IndexMap;
|
||||
use serde::de::Error as _;
|
||||
use serde::ser::SerializeSeq;
|
||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||
use serde::ser::SerializeSeq as _;
|
||||
use serde::{Deserialize as _, Deserializer, Serialize, Serializer};
|
||||
|
||||
use super::MaterialObjEntryV1_381_67_09PC;
|
||||
use crate::helpers::{BffMap, DynArray};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use std::io::{BufRead, Cursor};
|
||||
use std::io::{BufRead as _, Cursor};
|
||||
|
||||
use bff_derive::ReferencedNames;
|
||||
use binrw::{BinRead, BinWrite};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use std::str::from_utf8;
|
|||
use bff_derive::ReferencedNames;
|
||||
use binrw::io::{Read, Seek};
|
||||
use binrw::meta::{EndianKind, ReadEndian, WriteEndian};
|
||||
use binrw::{BinRead, BinResult, BinWrite, BinWriterExt, Endian, Error, NullString, args};
|
||||
use binrw::{BinRead, BinResult, BinWrite, BinWriterExt as _, Endian, Error, NullString, args};
|
||||
use derive_more::{Constructor, Deref, DerefMut, Display, Error, From, Into};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::io::{Cursor, Read, Seek, SeekFrom, Write};
|
|||
|
||||
use arcode::bitbit::{BitReader, BitWriter, LSB};
|
||||
use arcode::{ArithmeticDecoder, ArithmeticEncoder, EOFKind, Model};
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian, args};
|
||||
use binrw::{BinRead as _, BinResult, BinWrite as _, Endian, args};
|
||||
|
||||
use crate::BffResult;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinReaderExt, BinResult, BinWrite, Endian, args};
|
||||
use binrw::{BinRead as _, BinReaderExt as _, BinResult, BinWrite as _, Endian, args};
|
||||
|
||||
use crate::BffResult;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use std::cmp::{max, min};
|
||||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinReaderExt, BinResult, BinWriterExt, Endian};
|
||||
use binrw::{BinReaderExt as _, BinResult, BinWriterExt as _, Endian};
|
||||
|
||||
use crate::BffResult;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::io::{Read, Seek, SeekFrom, Write};
|
||||
|
||||
use binrw::{BinRead, BinReaderExt, BinResult, BinWrite, Endian, args};
|
||||
use binrw::{BinRead as _, BinReaderExt as _, BinResult, BinWrite as _, Endian, args};
|
||||
use flate2::read::ZlibDecoder;
|
||||
use flate2::write::ZlibEncoder;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use const_power_of_two::PowerOfTwoUsize;
|
|||
|
||||
use super::scope::{current_name_type, with_name_context};
|
||||
use super::{NameContext, NameType};
|
||||
use crate::traits::{NameHashFunction, NameTarget};
|
||||
use crate::traits::{NameHashFunction, NameTarget as _};
|
||||
|
||||
const FORCED_NAME_STRING_CHAR: char = '$';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,16 @@
|
|||
use std::io::{Cursor, Read, Seek, Write};
|
||||
use std::path::Path;
|
||||
|
||||
use binrw::{BinRead, BinReaderExt, BinResult, BinWrite, BinWriterExt, Endian, NullString, args};
|
||||
use binrw::{
|
||||
BinRead,
|
||||
BinReaderExt as _,
|
||||
BinResult,
|
||||
BinWrite,
|
||||
BinWriterExt as _,
|
||||
Endian,
|
||||
NullString,
|
||||
args,
|
||||
};
|
||||
|
||||
use crate::BffResult;
|
||||
use crate::crc::racenet32;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use std::path::PathBuf;
|
|||
|
||||
use binrw::meta::{EndianKind, ReadEndian, WriteEndian};
|
||||
use binrw::{BinRead, BinResult, BinWrite, Endian};
|
||||
use itertools::Itertools;
|
||||
use itertools::Itertools as _;
|
||||
|
||||
use crate::BffResult;
|
||||
use crate::helpers::StringUntilNull;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use bff::bigfile::platforms::Platform;
|
|||
use bff::bigfile::resource::Resource;
|
||||
use bff::class::bff_class::BffClass;
|
||||
use bff::names::NameContext;
|
||||
use bff::traits::{Export, Import, ToResource};
|
||||
use bff::traits::{Export as _, Import as _, ToResource as _};
|
||||
use binrw::io::BufReader;
|
||||
|
||||
use crate::path_helpers::resolve_bigfile_path;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue