Configure rustfmt for consistent use formatting

.github/workflows/ci.yml

@@ -51,16 +51,22 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Setup Rust
+      - name: Setup Rust (nightly)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           override: true
+          components: rustfmt
       - name: Run rustfmt
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: -- --check
+      - name: Setup Rust (stable)
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Run clippy
         uses: actions-rs/cargo@v1
         with:

rustfmt.toml

@@ -0,0 +1,2 @@
+group_imports = "StdExternalCrate"
+imports_granularity= "Crate"

src/client/general.rs

@@ -1,9 +1,10 @@
 use serde::Serialize;
 
 use super::Client;
-use crate::requests::{KeyModifier, Projector, ProjectorInternal, QtGeometry, RequestType};
-use crate::responses;
-use crate::{Error, Result};
+use crate::{
+    requests::{KeyModifier, Projector, ProjectorInternal, QtGeometry, RequestType},
+    responses, Error, Result,
+};
 
 /// General functions of the API.
 pub struct General<'a> {

src/client/media_control.rs

@@ -1,9 +1,7 @@
 use chrono::Duration;
 
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to media control.
 pub struct MediaControl<'a> {

src/client/mod.rs

@@ -29,6 +29,12 @@ use tokio::{
 };
 use tokio_tungstenite::{tungstenite::Message, MaybeTlsStream, WebSocketStream};
 
+pub use self::{
+    general::General, media_control::MediaControl, outputs::Outputs, profiles::Profiles,
+    recording::Recording, replay_buffer::ReplayBuffer, scene_collections::SceneCollections,
+    scene_items::SceneItems, scenes::Scenes, sources::Sources, streaming::Streaming,
+    studio_mode::StudioMode, transitions::Transitions, virtual_cam::VirtualCam,
+};
 #[cfg(feature = "events")]
 use crate::events::{Event, EventType};
 use crate::{
@@ -37,13 +43,6 @@ use crate::{
     Error, Result,
 };
 
-pub use self::{
-    general::General, media_control::MediaControl, outputs::Outputs, profiles::Profiles,
-    recording::Recording, replay_buffer::ReplayBuffer, scene_collections::SceneCollections,
-    scene_items::SceneItems, scenes::Scenes, sources::Sources, streaming::Streaming,
-    studio_mode::StudioMode, transitions::Transitions, virtual_cam::VirtualCam,
-};
-
 mod general;
 mod media_control;
 mod outputs;

src/client/outputs.rs

@@ -1,7 +1,5 @@
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to outputs.
 pub struct Outputs<'a> {

src/client/profiles.rs

@@ -1,7 +1,5 @@
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to profiles.
 pub struct Profiles<'a> {

src/client/recording.rs

@@ -1,9 +1,7 @@
 use std::path::{Path, PathBuf};
 
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to recording.
 pub struct Recording<'a> {

src/client/replay_buffer.rs

@@ -1,7 +1,5 @@
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to the replay buffer.
 pub struct ReplayBuffer<'a> {

src/client/scene_collections.rs

@@ -1,7 +1,5 @@
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to scene collections.
 pub struct SceneCollections<'a> {

src/client/scene_items.rs

@@ -1,12 +1,13 @@
 use either::Either;
 
 use super::Client;
-use crate::requests::{
-    AddSceneItem, DuplicateSceneItem, RequestType, SceneItemProperties, SceneItemRender,
-    SceneItemSpecification,
+use crate::{
+    requests::{
+        AddSceneItem, DuplicateSceneItem, RequestType, SceneItemProperties, SceneItemRender,
+        SceneItemSpecification,
+    },
+    responses, Result,
 };
-use crate::responses;
-use crate::Result;
 
 /// API functions related to scene items.
 pub struct SceneItems<'a> {

src/client/scenes.rs

@@ -1,7 +1,8 @@
 use super::Client;
-use crate::requests::{RequestType, SceneItem, SceneTransitionOverride};
-use crate::responses;
-use crate::Result;
+use crate::{
+    requests::{RequestType, SceneItem, SceneTransitionOverride},
+    responses, Result,
+};
 
 /// API functions related to scenes.
 pub struct Scenes<'a> {

src/client/sources.rs

@@ -2,14 +2,15 @@ use chrono::Duration;
 use serde::de::DeserializeOwned;
 
 use super::Client;
-use crate::common::MonitorType;
-use crate::requests::{
-    AddFilter, CreateSource, MoveFilter, ReorderFilter, RequestType, SourceFilterSettings,
-    SourceFilterVisibility, SourceScreenshot, SourceSettings, TextFreetype2Properties,
-    TextGdiPlusProperties, Volume,
+use crate::{
+    common::MonitorType,
+    requests::{
+        AddFilter, CreateSource, MoveFilter, ReorderFilter, RequestType, SourceFilterSettings,
+        SourceFilterVisibility, SourceScreenshot, SourceSettings, TextFreetype2Properties,
+        TextGdiPlusProperties, Volume,
+    },
+    responses, Result,
 };
-use crate::responses;
-use crate::Result;
 
 /// API functions related to sources.
 pub struct Sources<'a> {

src/client/streaming.rs

@@ -1,7 +1,8 @@
 use super::Client;
-use crate::requests::{RequestType, SetStreamSettings, Stream};
-use crate::responses;
-use crate::Result;
+use crate::{
+    requests::{RequestType, SetStreamSettings, Stream},
+    responses, Result,
+};
 
 /// API functions related to streaming.
 pub struct Streaming<'a> {

src/client/studio_mode.rs

@@ -1,7 +1,8 @@
 use super::Client;
-use crate::requests::{RequestType, Transition};
-use crate::responses;
-use crate::Result;
+use crate::{
+    requests::{RequestType, Transition},
+    responses, Result,
+};
 
 /// API functions related to the studio mode.
 pub struct StudioMode<'a> {

src/client/transitions.rs

@@ -2,9 +2,7 @@ use chrono::Duration;
 use serde::Serialize;
 
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::{Error, Result};
+use crate::{requests::RequestType, responses, Error, Result};
 
 /// API functions related to transitions.
 pub struct Transitions<'a> {

src/client/virtual_cam.rs

@@ -1,7 +1,5 @@
 use super::Client;
-use crate::requests::RequestType;
-use crate::responses;
-use crate::Result;
+use crate::{requests::RequestType, responses, Result};
 
 /// API functions related to the virtual cam.
 pub struct VirtualCam<'a> {

src/de.rs

@@ -1,9 +1,11 @@
 //! Custom deserializers that are used in both the [`events`](crate::events) and
 //! [`responses`](crate::responses) modules.
 
-use std::convert::TryFrom;
-use std::fmt::{self, Display};
-use std::marker::PhantomData;
+use std::{
+    convert::TryFrom,
+    fmt::{self, Display},
+    marker::PhantomData,
+};
 
 use chrono::Duration;
 use serde::de::{self, Deserializer, Visitor};

src/requests/mod.rs

@@ -5,11 +5,10 @@ use std::path::Path;
 use bitflags::bitflags;
 use chrono::Duration;
 use either::Either;
+pub use rgb::RGBA8;
 use serde::Serialize;
 use serde_with::skip_serializing_none;
 
-pub use rgb::RGBA8;
-
 use crate::common::{Align, Alignment, BoundsType, FontFlags, MonitorType, StreamType, Valign};
 
 mod ser;

src/responses/de.rs

@@ -1,7 +1,4 @@
-use std::convert::TryFrom;
-use std::fmt;
-use std::iter::FromIterator;
-use std::marker::PhantomData;
+use std::{convert::TryFrom, fmt, iter::FromIterator, marker::PhantomData};
 
 use rgb::RGBA8;
 use serde::de::{Deserializer, Error, Visitor};

src/responses/mod.rs

@@ -1,13 +1,11 @@
 //! All responses that can be received from the API.
 
-use std::collections::HashSet;
-use std::path::PathBuf;
+use std::{collections::HashSet, path::PathBuf};
 
 use chrono::Duration;
-use serde::Deserialize;
-
 pub use rgb::RGBA8;
 pub use semver::Version as SemVerVersion;
+use serde::Deserialize;
 
 use crate::common::{
     Align, Bounds, Crop, FontFlags, MonitorType, Position, Scale, SceneItem, SceneItemTransform,

tests/common/mod.rs

@@ -1,6 +1,4 @@
-use std::env;
-use std::sync::Once;
-use std::time::Duration;
+use std::{env, sync::Once, time::Duration};
 
 use anyhow::{ensure, Result};
 use obws::{

tests/media_control.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 use futures_util::{pin_mut, StreamExt};
 use obws::events::{Event, EventType};
 
-use common::TEST_MEDIA;
+use crate::common::TEST_MEDIA;
 
 #[macro_use]
 mod common;

tests/outputs.rs

@@ -2,7 +2,7 @@
 
 use anyhow::Result;
 
-use common::TEST_OUTPUT;
+use crate::common::TEST_OUTPUT;
 
 mod common;
 

tests/profiles.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use anyhow::Result;
 use tokio::time;
 
-use common::TEST_PROFILE;
+use crate::common::TEST_PROFILE;
 
 mod common;
 

tests/recording.rs

@@ -1,7 +1,6 @@
 #![cfg(feature = "test-integration")]
 
-use std::path::Path;
-use std::time::Duration;
+use std::{path::Path, time::Duration};
 
 use anyhow::Result;
 use futures_util::{pin_mut, StreamExt};

tests/scene_collections.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use anyhow::{Context, Result};
 use tokio::time;
 
-use common::TEST_COLLECTION;
+use crate::common::TEST_COLLECTION;
 
 mod common;
 

tests/scene_items.rs

@@ -6,7 +6,7 @@ use obws::requests::{
     DuplicateSceneItem, SceneItemProperties, SceneItemRender, SceneItemSpecification,
 };
 
-use common::{TEST_SCENE, TEXT_SOURCE};
+use crate::common::{TEST_SCENE, TEXT_SOURCE};
 
 mod common;
 

tests/scenes.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 use chrono::Duration;
 use obws::requests::{SceneItem, SceneTransitionOverride};
 
-use common::{
+use crate::common::{
     TEST_BROWSER, TEST_MEDIA, TEST_SCENE, TEST_SCENE_2, TEST_TRANSITION, TEXT_SOURCE, TEXT_SOURCE_2,
 };
 

tests/sources.rs

@@ -11,7 +11,7 @@ use obws::{
 };
 use serde_json::json;
 
-use common::{SOURCE_KIND_VLC, TEST_BROWSER, TEST_MEDIA, TEXT_SOURCE};
+use crate::common::{SOURCE_KIND_VLC, TEST_BROWSER, TEST_MEDIA, TEXT_SOURCE};
 
 mod common;
 

tests/studio_mode.rs

@@ -1,11 +1,11 @@
 #![cfg(feature = "test-integration")]
 
 use anyhow::Result;
-
 use chrono::Duration;
-use common::{TEST_SCENE_2, TEST_TRANSITION};
 use obws::requests::Transition;
 
+use crate::common::{TEST_SCENE_2, TEST_TRANSITION};
+
 mod common;
 
 #[tokio::test]

tests/transitions.rs

@@ -2,7 +2,7 @@
 
 use anyhow::Result;
 
-use common::TEST_TRANSITION_2;
+use crate::common::TEST_TRANSITION_2;
 
 mod common;