kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: address clippy lints

Browse source
This commit is contained in:
Julian Orth 2024-12-07 14:59:28 +01:00
parent 558fe3d3ce
commit e2f31646f2
19 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
toml-config/src/config/context.rs
View file

@ -50,7 +50,7 @@ impl<'a> Context<'a> {
}
}
impl<'a> ErrorHandler for Context<'a> {
impl ErrorHandler for Context<'_> {
fn handle(&self, err: Spanned<ParserError>) {
log::warn!("{}", Report::new(self.error(err)));
}

4
toml-config/src/config/error.rs
View file

@ -17,7 +17,7 @@ pub struct SpannedError<'a, E> {
pub cause: Option<E>,
}
impl<'a, E: Error> Display for SpannedError<'a, E> {
impl<E: Error> Display for SpannedError<'_, E> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
let original = self.input.deref();
let span = self.span;
@ -57,7 +57,7 @@ impl<'a, E: Error> Display for SpannedError<'a, E> {
}
}
impl<'a, E: Error> Error for SpannedError<'a, E> {}
impl<E: Error> Error for SpannedError<'_, E> {}
fn translate_position(input: &[u8], index: usize) -> (usize, usize) {
if input.is_empty() {

2
toml-config/src/config/extractor.rs
View file

@ -69,7 +69,7 @@ impl<'v> Extractor<'v> {
}
}
impl<'v> Drop for Extractor<'v> {
impl Drop for Extractor<'_> {
fn drop(&mut self) {
if !self.log_unused {
return;

2
toml-config/src/config/parsers/action.rs
View file

@ -314,7 +314,7 @@ impl ActionParser<'_> {
}
}
impl<'a> Parser for ActionParser<'a> {
impl Parser for ActionParser<'_> {
type Value = Action;
type Error = ActionParserError;
const EXPECTED: &'static [DataType] = &[DataType::String, DataType::Array, DataType::Table];

4
toml-config/src/config/parsers/connector.rs
View file

@ -28,7 +28,7 @@ pub enum ConnectorParserError {
pub struct ConnectorParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for ConnectorParser<'a> {
impl Parser for ConnectorParser<'_> {
type Value = ConfigConnector;
type Error = ConnectorParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table];
@ -49,7 +49,7 @@ impl<'a> Parser for ConnectorParser<'a> {
pub struct ConnectorsParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for ConnectorsParser<'a> {
impl Parser for ConnectorsParser<'_> {
type Value = Vec<ConfigConnector>;
type Error = ConnectorParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

2
toml-config/src/config/parsers/connector_match.rs
View file

@ -25,7 +25,7 @@ pub enum ConnectorMatchParserError {
pub struct ConnectorMatchParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for ConnectorMatchParser<'a> {
impl Parser for ConnectorMatchParser<'_> {
type Value = ConnectorMatch;
type Error = ConnectorMatchParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

4
toml-config/src/config/parsers/drm_device.rs
View file

@ -34,7 +34,7 @@ pub struct DrmDeviceParser<'a> {
pub name_ok: bool,
}
impl<'a> Parser for DrmDeviceParser<'a> {
impl Parser for DrmDeviceParser<'_> {
type Value = ConfigDrmDevice;
type Error = DrmDeviceParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table];
@ -89,7 +89,7 @@ impl<'a> Parser for DrmDeviceParser<'a> {
pub struct DrmDevicesParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for DrmDevicesParser<'a> {
impl Parser for DrmDevicesParser<'_> {
type Value = Vec<ConfigDrmDevice>;
type Error = DrmDeviceParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

4
toml-config/src/config/parsers/input.rs
View file

@ -53,7 +53,7 @@ pub struct InputParser<'a> {
pub is_inputs_array: bool,
}
impl<'a> Parser for InputParser<'a> {
impl Parser for InputParser<'_> {
type Value = Input;
type Error = InputParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table];
@ -254,7 +254,7 @@ impl<'a> Parser for InputParser<'a> {
pub struct InputsParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for InputsParser<'a> {
impl Parser for InputsParser<'_> {
type Value = Vec<Input>;
type Error = InputParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

2
toml-config/src/config/parsers/input_match.rs
View file

@ -25,7 +25,7 @@ pub enum InputMatchParserError {
pub struct InputMatchParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for InputMatchParser<'a> {
impl Parser for InputMatchParser<'_> {
type Value = InputMatch;
type Error = InputMatchParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

2
toml-config/src/config/parsers/mode.rs
View file

@ -25,7 +25,7 @@ pub enum ModeParserError {
pub struct ModeParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for ModeParser<'a> {
impl Parser for ModeParser<'_> {
type Value = Mode;
type Error = ModeParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table];

4
toml-config/src/config/parsers/output.rs
View file

@ -38,7 +38,7 @@ pub struct OutputParser<'a> {
pub name_ok: bool,
}
impl<'a> Parser for OutputParser<'a> {
impl Parser for OutputParser<'_> {
type Value = Output;
type Error = OutputParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table];
@ -150,7 +150,7 @@ impl<'a> Parser for OutputParser<'a> {
pub struct OutputsParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for OutputsParser<'a> {
impl Parser for OutputsParser<'_> {
type Value = Vec<Output>;
type Error = OutputParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Array];

2
toml-config/src/config/parsers/output_match.rs
View file

@ -25,7 +25,7 @@ pub enum OutputMatchParserError {
pub struct OutputMatchParser<'a>(pub &'a Context<'a>);
impl<'a> Parser for OutputMatchParser<'a> {
impl Parser for OutputMatchParser<'_> {
type Value = OutputMatch;
type Error = OutputMatchParserError;
const EXPECTED: &'static [DataType] = &[DataType::Table, DataType::Table];

2
toml-config/src/toml/toml_lexer.rs
View file

@ -14,7 +14,7 @@ pub enum Token<'a> {
Literal(&'a [u8]),
}
impl<'a> Token<'a> {
impl Token<'_> {
pub fn name(self, value_context: bool) -> &'static str {
match self {
Token::Dot => "`.`",

2
toml-config/src/toml/toml_parser.rs
View file

@ -58,7 +58,7 @@ struct Parser<'a, 'b> {
type Key = VecDeque<Spanned<String>>;
impl<'a, 'b> Parser<'a, 'b> {
impl<'a> Parser<'a, '_> {
fn parse(mut self) -> Result<Spanned<Value>, Spanned<ParserError>> {
self.parse_document()
}