Rust edition 2024

src/commands/client_to_client/channels.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct Channels;

src/commands/client_to_client/readmessages.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct ReadMessages;

src/commands/connection_settings/protocol.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct Protocol;

src/commands/connection_settings/protocol_all.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolAll;

src/commands/connection_settings/protocol_available.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolAvailable;

src/commands/connection_settings/protocol_clear.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolClear;

src/commands/connection_settings/protocol_disable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ProtocolDisable;

src/commands/connection_settings/protocol_enable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ProtocolEnable;

src/commands/connection_settings/tag_types.rs

@@ -30,7 +30,7 @@ impl Command for TagTypes {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "tagtype", "Binary",
-                    ))
+                    ));
                 }
             };
 

src/commands/connection_settings/tag_types_all.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesAll;

src/commands/connection_settings/tag_types_available.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesAvailable;

src/commands/connection_settings/tag_types_clear.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesClear;

src/commands/connection_settings/tag_types_disable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesDisable;

src/commands/connection_settings/tag_types_enable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesEnable;

src/commands/connection_settings/tag_types_reset.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesReset;

src/commands/mounts_and_neighbors/listmounts.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ListMounts;

src/commands/mounts_and_neighbors/listneighbors.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ListNeighbors;

src/commands/mounts_and_neighbors/mount.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Mount;

src/commands/mounts_and_neighbors/unmount.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Unmount;

src/commands/music_database/albumart.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, get_property, Command, Request, RequestParserError,
-        RequestParserResult, ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property, get_property,
     },
     common::Offset,
 };

src/commands/music_database/count.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property,
     },
     filter::parse_filter,
 };

src/commands/music_database/getfingerprint.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_and_parse_property,
 };
 
 pub struct GetFingerprint;

src/commands/music_database/list.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{
-        expect_property_type, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, expect_property_type,
     },
     filter::parse_filter,
 };

src/commands/music_database/readpicture.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, get_optional_property, get_property, Command, Request,
-        RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property, get_optional_property, get_property,
     },
     common::Offset,
 };

src/commands/music_database/rescan.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property,
 };
 
 pub struct Rescan;

src/commands/music_database/searchcount.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property,
     },
     filter::parse_filter,
 };

src/commands/music_database/update.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property,
 };
 
 pub struct Update;

src/commands/partition_commands/listpartitions.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct ListPartitions;

src/commands/playback_options/getvol.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-        ResponseParserError,
+        Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+        get_and_parse_property,
     },
     common::VolumeValue,
 };

src/commands/playback_options/replay_gain_status.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{
-        get_property, Command, Request, RequestParserResult, ResponseAttributes,
-        ResponseParserError,
+        Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+        get_property,
     },
     common::ReplayGainModeMode,
 };

src/commands/querying_mpd_status/stats.rs

@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    get_and_parse_optional_property, get_and_parse_property, Command, Request, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_optional_property, get_and_parse_property,
 };
 
 pub struct Stats;

src/commands/querying_mpd_status/status.rs

@@ -6,9 +6,9 @@ use serde::{Deserialize, Serialize};
 use crate::common::{Audio, BoolOrOneshot, SongId, SongPosition};
 
 use crate::commands::{
-    get_and_parse_optional_property, get_and_parse_property, get_optional_property, get_property,
     Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    ResponseParserError, get_and_parse_optional_property, get_and_parse_property,
+    get_optional_property, get_property,
 };
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

src/commands/queue/addid.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{
-        get_next_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_next_and_parse_property,
     },
     common::{SongId, SongPosition},
 };

src/commands/queue/addtagid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct AddTagId;

src/commands/queue/cleartagid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ClearTagId;

src/commands/queue/delete.rs

@@ -1,11 +1,11 @@
 use std::str::FromStr;
 
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     common::OneOrRange,
-    Request,
 };
 
 pub struct Delete;

src/commands/queue/deleteid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct DeleteId;

src/commands/queue/move_.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Move;

src/commands/queue/moveid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct MoveId;

src/commands/queue/playlist.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct Playlist;

src/commands/queue/playlistfind.rs

@@ -1,9 +1,9 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     filter::parse_filter,
-    Request,
 };
 
 pub struct PlaylistFind;

src/commands/queue/playlistid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlaylistId;

src/commands/queue/playlistinfo.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlaylistInfo;

src/commands/queue/playlistsearch.rs

@@ -1,9 +1,9 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     filter::parse_filter,
-    Request,
 };
 
 pub struct PlaylistSearch;

src/commands/queue/plchanges.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlChanges;

src/commands/queue/plchangesposid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlChangesPosId;

src/commands/queue/prio.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Prio;

src/commands/queue/prioid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PrioId;

src/commands/queue/rangeid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct RangeId;

src/commands/queue/shuffle.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Shuffle;

src/commands/queue/swap.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Swap;

src/commands/queue/swapid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct SwapId;

src/commands/reflection/commands.rs

@@ -30,7 +30,7 @@ impl Command for Commands {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "handler", "Binary",
-                    ))
+                    ));
                 }
             };
             result.push(value.to_string());

src/commands/reflection/config.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, get_property, Command, Request, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property, get_property,
 };
 
 pub struct Config;

src/commands/reflection/not_commands.rs

@@ -30,7 +30,7 @@ impl Command for NotCommands {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "handler", "Binary",
-                    ))
+                    ));
                 }
             };
             result.push(value.to_string());

src/commands/reflection/url_handlers.rs

@@ -30,7 +30,7 @@ impl Command for UrlHandlers {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "handler", "Binary",
-                    ))
+                    ));
                 }
             };
             url_handlers.push(value.to_string());

src/commands/stickers/sticker_find.rs

@@ -87,7 +87,7 @@ impl Command for StickerFind {
             let uri = match uri.1 {
                 GenericResponseValue::Text(s) => s.to_string(),
                 GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(uri.0, "Binary"))
+                    return Err(ResponseParserError::UnexpectedPropertyType(uri.0, "Binary"));
                 }
             };
 
@@ -96,7 +96,7 @@ impl Command for StickerFind {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "sticker", "Binary",
-                    ))
+                    ));
                 }
             };
 

src/commands/stickers/sticker_get.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    get_next_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_next_property,
 };
 
 pub struct StickerGet;

src/commands/stickers/stickernames.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct StickerNames;

src/commands/stickers/stickernamestypes.rs

@@ -39,7 +39,7 @@ impl Command for StickerNamesTypes {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "name", "Binary",
-                    ))
+                    ));
                 }
             };
 
@@ -48,7 +48,7 @@ impl Command for StickerNamesTypes {
                 GenericResponseValue::Binary(_) => {
                     return Err(ResponseParserError::UnexpectedPropertyType(
                         "type", "Binary",
-                    ))
+                    ));
                 }
             };
 

src/commands/stickers/stickertypes.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct StickerTypes;

src/commands/stored_playlists/playlistlength.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_and_parse_property,
 };
 
 pub struct PlaylistLength;

src/request.rs

@@ -239,7 +239,7 @@ impl Request {
                         .ok_or(RequestParserError::MissingCommandListEnd(i))?;
                     match line.trim() {
                         "command_list_begin" => {
-                            return Err(RequestParserError::NestedCommandList(i))
+                            return Err(RequestParserError::NestedCommandList(i));
                         }
                         "command_list_end" => {
                             return Ok((Request::CommandList(commands), rest));

src/server.rs

@@ -1,4 +1,4 @@
-use crate::{common::SubSystem, Request, Response};
+use crate::{Request, Response, common::SubSystem};
 
 pub trait MPDServer {
     type Error;