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

all: set rust edition to 2024

Browse source
This commit is contained in:
Julian Orth 2025-02-21 10:44:29 +01:00
parent 02a18f620b
commit 3338909170
515 changed files with 1225 additions and 1187 deletions
Download patch file Download diff file Expand all files Collapse all files

6
toml-config/src/config.rs
View file

@ -17,14 +17,14 @@ use {
},
ahash::AHashMap,
jay_config::{
input::{acceleration::AccelProfile, SwitchEvent},
keyboard::{mods::Modifiers, Keymap, ModifiedKeySym},
Axis, Direction, Workspace,
input::{SwitchEvent, acceleration::AccelProfile},
keyboard::{Keymap, ModifiedKeySym, mods::Modifiers},
logging::LogLevel,
status::MessageFormat,
theme::Color,
video::{Format, GfxApi, TearingMode, Transform, VrrMode},
xwayland::XScalingMode,
Axis, Direction, Workspace,
},
std::{
error::Error,

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

@ -1,10 +1,12 @@
use {
crate::{
config::{
Action,
context::Context,
extractor::{arr, bol, n32, opt, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, arr, bol, n32, opt, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
StringParser, StringParserError,
connector::{ConnectorParser, ConnectorParserError},
drm_device::{DrmDeviceParser, DrmDeviceParserError},
drm_device_match::{DrmDeviceMatchParser, DrmDeviceMatchParserError},
@ -20,10 +22,8 @@ use {
repeat_rate::{RepeatRateParser, RepeatRateParserError},
status::{StatusParser, StatusParserError},
theme::{ThemeParser, ThemeParserError},
StringParser, StringParserError,
},
spanned::SpannedErrorExt,
Action,
},
toml::{
toml_span::{DespanExt, Span, Spanned, SpannedExt},
@ -32,8 +32,8 @@ use {
},
indexmap::IndexMap,
jay_config::{
get_workspace,
Axis::{Horizontal, Vertical},
get_workspace,
},
thiserror::Error,
};
@ -114,7 +114,9 @@ impl ActionParser<'_> {
"enable-window-management" => EnableWindowManagement(true),
"disable-window-management" => EnableWindowManagement(false),
_ => {
return Err(ActionParserError::UnknownSimpleAction(string.to_string()).spanned(span))
return Err(
ActionParserError::UnknownSimpleAction(string.to_string()).spanned(span)
);
}
};
Ok(Action::SimpleCommand { cmd })

8
toml-config/src/config/parsers/config.rs
View file

@ -1,8 +1,9 @@
use {
crate::{
config::{
Action, Config, Libei, Theme, UiDrag,
context::Context,
extractor::{arr, bol, opt, recover, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, arr, bol, opt, recover, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
action::ActionParser,
@ -19,8 +20,8 @@ use {
output::OutputsParser,
repeat_rate::RepeatRateParser,
shortcuts::{
parse_modified_keysym_str, ComplexShortcutsParser, ShortcutsParser,
ShortcutsParserError,
ComplexShortcutsParser, ShortcutsParser, ShortcutsParserError,
parse_modified_keysym_str,
},
status::StatusParser,
tearing::TearingParser,
@ -30,7 +31,6 @@ use {
xwayland::XwaylandParser,
},
spanned::SpannedErrorExt,
Action, Config, Libei, Theme, UiDrag,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

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

@ -1,11 +1,11 @@
use {
crate::{
config::{
ConfigConnector,
context::Context,
extractor::{bol, opt, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, bol, opt, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::connector_match::{ConnectorMatchParser, ConnectorMatchParserError},
ConfigConnector,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

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

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, str, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
ConnectorMatch,
context::Context,
extractor::{Extractor, ExtractorError, opt, str},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned},

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

@ -1,14 +1,14 @@
use {
crate::{
config::{
ConfigDrmDevice,
context::Context,
extractor::{bol, fltorint, opt, recover, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, bol, fltorint, opt, recover, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
drm_device_match::{DrmDeviceMatchParser, DrmDeviceMatchParserError},
gfx_api::GfxApiParser,
},
ConfigDrmDevice,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

6
toml-config/src/config/parsers/drm_device_match.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{n32, opt, recover, str, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
DrmDeviceMatch,
context::Context,
extractor::{Extractor, ExtractorError, n32, opt, recover, str},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{DespanExt, Span, Spanned},

6
toml-config/src/config/parsers/exec.rs
View file

@ -1,14 +1,14 @@
use {
crate::{
config::{
Exec,
context::Context,
extractor::{arr, bol, opt, recover, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, arr, bol, opt, recover, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
env::{EnvParser, EnvParserError},
StringParser, StringParserError,
env::{EnvParser, EnvParserError},
},
Exec,
},
toml::{
toml_span::{DespanExt, Span, Spanned, SpannedExt},

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

@ -2,7 +2,7 @@ use {
crate::{
config::{
context::Context,
extractor::{n64, opt, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, n64, opt, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{

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

@ -1,8 +1,9 @@
use {
crate::{
config::{
Input,
context::Context,
extractor::{bol, fltorint, opt, recover, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, bol, fltorint, opt, recover, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
action::ActionParser,
@ -10,7 +11,6 @@ use {
keymap::KeymapParser,
output_match::OutputMatchParser,
},
Input,
},
toml::{
toml_span::{DespanExt, Span, Spanned, SpannedExt},
@ -20,8 +20,8 @@ use {
ahash::AHashMap,
indexmap::IndexMap,
jay_config::input::{
acceleration::{ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT},
SwitchEvent,
acceleration::{ACCEL_PROFILE_ADAPTIVE, ACCEL_PROFILE_FLAT},
},
thiserror::Error,
};

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

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{bol, opt, str, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
InputMatch,
context::Context,
extractor::{Extractor, ExtractorError, bol, opt, str},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{DespanExt, Span, Spanned},

10
toml-config/src/config/parsers/keymap.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, str, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
ConfigKeymap,
context::Context,
extractor::{Extractor, ExtractorError, opt, str},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned, SpannedExt},
@ -14,7 +14,7 @@ use {
indexmap::IndexMap,
jay_config::{
config_dir,
keyboard::{parse_keymap, Keymap},
keyboard::{Keymap, parse_keymap},
},
std::{io, path::PathBuf},
thiserror::Error,
@ -73,7 +73,7 @@ impl Parser for KeymapParser<'_> {
Ok(c) => c,
Err(e) => {
return Err(KeymapParserError::ReadFile(root.display().to_string(), e)
.spanned(path.span))
.spanned(path.span));
}
};
map_val = Some(file_content.as_str().spanned(path.span));

6
toml-config/src/config/parsers/libei.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{bol, opt, recover, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
Libei,
context::Context,
extractor::{Extractor, ExtractorError, bol, opt, recover},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{DespanExt, Span, Spanned},

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

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{fltorint, opt, s32, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
Mode,
context::Context,
extractor::{Extractor, ExtractorError, fltorint, opt, s32},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{DespanExt, Span, Spanned},

6
toml-config/src/config/parsers/modified_keysym.rs
View file

@ -7,11 +7,11 @@ use {
toml::toml_span::{Span, SpannedExt},
},
jay_config::keyboard::{
ModifiedKeySym,
mods::{
Modifiers, ALT, CAPS, CTRL, LOCK, LOGO, MOD1, MOD2, MOD3, MOD4, MOD5, NUM, RELEASE,
ALT, CAPS, CTRL, LOCK, LOGO, MOD1, MOD2, MOD3, MOD4, MOD5, Modifiers, NUM, RELEASE,
SHIFT,
},
ModifiedKeySym,
},
thiserror::Error,
};
@ -51,7 +51,7 @@ impl Parser for ModifiedKeysymParser {
Some(_) => return Err(ModifiedKeysymParserError::MoreThanOneSym.spanned(span)),
_ => {
return Err(ModifiedKeysymParserError::UnknownKeysym(part.to_string())
.spanned(span))
.spanned(span));
}
},
};

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

@ -1,8 +1,9 @@
use {
crate::{
config::{
Output,
context::Context,
extractor::{fltorint, opt, recover, s32, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, fltorint, opt, recover, s32, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
format::FormatParser,
@ -11,7 +12,6 @@ use {
tearing::TearingParser,
vrr::VrrParser,
},
Output,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

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

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, str, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
OutputMatch,
context::Context,
extractor::{Extractor, ExtractorError, opt, str},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{DespanExt, Span, Spanned},

6
toml-config/src/config/parsers/repeat_rate.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{s32, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
RepeatRate,
context::Context,
extractor::{Extractor, ExtractorError, s32},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned},

6
toml-config/src/config/parsers/shortcuts.rs
View file

@ -1,8 +1,9 @@
use {
crate::{
config::{
Action, Shortcut, SimpleCommand,
context::Context,
extractor::{opt, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, opt, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::{
action::{ActionParser, ActionParserError},
@ -11,7 +12,6 @@ use {
},
},
spanned::SpannedErrorExt,
Action, Shortcut, SimpleCommand,
},
toml::{
toml_span::{Span, Spanned, SpannedExt},
@ -19,7 +19,7 @@ use {
},
},
indexmap::IndexMap,
jay_config::keyboard::{mods::Modifiers, ModifiedKeySym},
jay_config::keyboard::{ModifiedKeySym, mods::Modifiers},
std::collections::HashSet,
thiserror::Error,
};

6
toml-config/src/config/parsers/status.rs
View file

@ -1,11 +1,11 @@
use {
crate::{
config::{
Status,
context::Context,
extractor::{opt, recover, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, opt, recover, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::exec::{ExecParser, ExecParserError},
Status,
},
toml::{
toml_span::{Span, Spanned, SpannedExt},
@ -55,7 +55,7 @@ impl Parser for StatusParser<'_> {
_ => {
return Err(
StatusParserError::UnknownFormat(f.value.to_string()).spanned(f.span)
)
);
}
},
_ => MessageFormat::Plain,

6
toml-config/src/config/parsers/tearing.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, val, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
Tearing,
context::Context,
extractor::{Extractor, ExtractorError, opt, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned, SpannedExt},

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

@ -1,11 +1,11 @@
use {
crate::{
config::{
Theme,
context::Context,
extractor::{opt, recover, s32, str, val, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, opt, recover, s32, str, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::color::ColorParser,
Theme,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

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

@ -1,11 +1,11 @@
use {
crate::{
config::{
UiDrag,
context::Context,
extractor::{bol, int, opt, recover, Extractor, ExtractorError},
extractor::{Extractor, ExtractorError, bol, int, opt, recover},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
parsers::exec::ExecParserError,
UiDrag,
},
toml::{
toml_span::{DespanExt, Span, Spanned},

6
toml-config/src/config/parsers/vrr.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, val, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
Vrr,
context::Context,
extractor::{Extractor, ExtractorError, opt, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned, SpannedExt},

6
toml-config/src/config/parsers/xwayland.rs
View file

@ -1,10 +1,10 @@
use {
crate::{
config::{
context::Context,
extractor::{opt, val, Extractor, ExtractorError},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
Xwayland,
context::Context,
extractor::{Extractor, ExtractorError, opt, val},
parser::{DataType, ParseResult, Parser, UnexpectedDataType},
},
toml::{
toml_span::{Span, Spanned, SpannedExt},

22
toml-config/src/lib.rs
View file

@ -5,20 +5,20 @@ mod toml;
use {
crate::config::{
parse_config, Action, Config, ConfigConnector, ConfigDrmDevice, ConfigKeymap,
ConnectorMatch, DrmDeviceMatch, Exec, Input, InputMatch, Output, OutputMatch, Shortcut,
SimpleCommand, Status, Theme,
Action, Config, ConfigConnector, ConfigDrmDevice, ConfigKeymap, ConnectorMatch,
DrmDeviceMatch, Exec, Input, InputMatch, Output, OutputMatch, Shortcut, SimpleCommand,
Status, Theme, parse_config,
},
ahash::{AHashMap, AHashSet},
error_reporter::Report,
jay_config::{
config, config_dir,
exec::{set_env, unset_env, Command},
exec::{Command, set_env, unset_env},
get_workspace,
input::{
capability::CAP_SWITCH, get_seat, input_devices, on_input_device_removed,
on_new_input_device, set_libei_socket_enabled, FocusFollowsMouseMode, InputDevice,
Seat, SwitchEvent,
FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, capability::CAP_SWITCH,
get_seat, input_devices, on_input_device_removed, on_new_input_device,
set_libei_socket_enabled,
},
is_reload,
keyboard::{Keymap, ModifiedKeySym},
@ -30,10 +30,10 @@ use {
switch_to_vt,
theme::{reset_colors, reset_font, reset_sizes, set_font},
video::{
connectors, drm_devices, on_connector_connected, on_connector_disconnected,
on_graphics_initialized, on_new_connector, on_new_drm_device,
set_direct_scanout_enabled, set_gfx_api, set_tearing_mode, set_vrr_cursor_hz,
set_vrr_mode, Connector, DrmDevice,
Connector, DrmDevice, connectors, drm_devices, on_connector_connected,
on_connector_disconnected, on_graphics_initialized, on_new_connector,
on_new_drm_device, set_direct_scanout_enabled, set_gfx_api, set_tearing_mode,
set_vrr_cursor_hz, set_vrr_mode,
},
xwayland::set_x_scaling_mode,
},

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

@ -2,7 +2,7 @@ use {
crate::{
config::error::SpannedError,
toml::{
toml_parser::{parse, ErrorHandler, ParserError},
toml_parser::{ErrorHandler, ParserError, parse},
toml_span::{Span, Spanned, SpannedExt},
toml_value::Value,
},
@ -11,7 +11,7 @@ use {
std::{
convert::Infallible,
os::unix::ffi::OsStrExt,
panic::{catch_unwind, AssertUnwindSafe},
panic::{AssertUnwindSafe, catch_unwind},
str::FromStr,
},
walkdir::WalkDir,

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

@ -6,8 +6,8 @@ use {
},
bstr::ByteSlice,
indexmap::{
map::{raw_entry_v1::RawEntryMut, RawEntryApiV1},
IndexMap,
map::{RawEntryApiV1, raw_entry_v1::RawEntryMut},
},
std::{collections::VecDeque, mem, str::FromStr},
thiserror::Error,