Second fmt pass

.github/workflows/rust.yml

@@ -20,13 +20,13 @@ jobs:
           - nightly
     steps:
       - uses: actions/checkout@v2
+
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-          components: rustfmt, clippy
+          components: clippy
-
       - uses: actions-rs/cargo@v1
         with:
           command: build
@@ -35,11 +35,18 @@ jobs:
         with:
           command: test
           args: --features all --verbose
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --verbose --all -- --check
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
           args: --features all -- -D warnings
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --verbose --all -- --check

src/entities/account.rs

@@ -4,8 +4,7 @@ use crate::status_builder;
 use chrono::prelude::*;
 use serde::{
     de::{self, Unexpected},
-    Deserialize,
+    Deserialize, Serialize,
-    Serialize,
 };
 use std::path::PathBuf;
 
@@ -104,7 +103,7 @@ fn string_or_bool<'de, D: de::Deserializer<'de>>(val: D) -> ::std::result::Resul
                     &"true or false",
                 ));
             }
-        },
+        }
     })
 }
 

src/lib.rs

@@ -90,11 +90,7 @@ pub use crate::{
     media_builder::MediaBuilder,
     registration::Registration,
     requests::{
-        AddFilterRequest,
+        AddFilterRequest, AddPushRequest, StatusesRequest, UpdateCredsRequest, UpdatePushRequest,
-        AddPushRequest,
-        StatusesRequest,
-        UpdateCredsRequest,
-        UpdatePushRequest,
     },
     status_builder::{NewStatus, StatusBuilder},
 };
@@ -130,13 +126,7 @@ mod macros;
 /// Automatically import the things you need
 pub mod prelude {
     pub use crate::{
-        scopes::Scopes,
+        scopes::Scopes, Data, Mastodon, MastodonClient, NewStatus, Registration, StatusBuilder,
-        Data,
-        Mastodon,
-        MastodonClient,
-        NewStatus,
-        Registration,
-        StatusBuilder,
         StatusesRequest,
     };
 }
@@ -719,18 +709,18 @@ impl<R: EventStream> EventReader<R> {
                 })?;
                 let notification = serde_json::from_str::<Notification>(&data)?;
                 Event::Notification(notification)
-            },
+            }
             "update" => {
                 let data =
                     data.ok_or_else(|| Error::Other("Missing `data` line for update".to_string()))?;
                 let status = serde_json::from_str::<Status>(&data)?;
                 Event::Update(status)
-            },
+            }
             "delete" => {
                 let data =
                     data.ok_or_else(|| Error::Other("Missing `data` line for delete".to_string()))?;
                 Event::Delete(data)
-            },
+            }
             "filters_changed" => Event::FiltersChanged,
             _ => return Err(Error::Other(format!("Unknown event `{}`", event))),
         })
@@ -872,7 +862,7 @@ fn deserialise<T: for<'de> serde::Deserialize<'de>>(response: Response) -> Resul
         Ok(t) => {
             log::debug!("{}", String::from_utf8_lossy(&reader.bytes));
             Ok(t)
-        },
+        }
         // If deserializing into the desired type fails try again to
         // see if this is an error response.
         Err(e) => {
@@ -881,6 +871,6 @@ fn deserialise<T: for<'de> serde::Deserialize<'de>>(response: Response) -> Resul
                 return Err(Error::Api(error));
             }
             Err(e.into())
-        },
+        }
     }
 }

src/mastodon_client.rs

@@ -7,11 +7,7 @@ use crate::{
     media_builder::MediaBuilder,
     page::Page,
     requests::{
-        AddFilterRequest,
+        AddFilterRequest, AddPushRequest, StatusesRequest, UpdateCredsRequest, UpdatePushRequest,
-        AddPushRequest,
-        StatusesRequest,
-        UpdateCredsRequest,
-        UpdatePushRequest,
     },
     status_builder::NewStatus,
 };

src/registration.rs

@@ -9,11 +9,7 @@ use crate::{
     apps::{App, AppBuilder},
     http_send::{HttpSend, HttpSender},
     scopes::Scopes,
-    Data,
+    Data, Error, Mastodon, MastodonBuilder, Result,
-    Error,
-    Mastodon,
-    MastodonBuilder,
-    Result,
 };
 
 const DEFAULT_REDIRECT_URI: &str = "urn:ietf:wg:oauth:2.0:oob";

src/requests/push.rs

@@ -606,9 +606,7 @@ mod tests {
             form,
             update_data::Form {
                 id: "some-id".to_string(),
-                data: update_data::Data {
+                data: update_data::Data { alerts: None },
-                    alerts: None,
-                },
             }
         );
     }

src/scopes.rs

@@ -9,9 +9,7 @@ use std::{
 use crate::errors::Error;
 use serde::{
     de::{self, Visitor},
-    Deserialize,
+    Deserialize, Deserializer, Serialize,
-    Deserializer,
-    Serialize,
 };
 
 /// Represents a set of OAuth scopes
@@ -40,9 +38,7 @@ impl FromStr for Scopes {
             let scope = Scope::from_str(&scope)?;
             set.insert(scope);
         }
-        Ok(Scopes {
+        Ok(Scopes { scopes: set })
-            scopes: set,
-        })
     }
 }
 
@@ -214,14 +210,8 @@ impl Scopes {
     /// let read_write = read.and(write);
     /// ```
     pub fn and(self, other: Scopes) -> Scopes {
-        let newset: HashSet<_> = self
+        let newset: HashSet<_> = self.scopes.union(&other.scopes).copied().collect();
-            .scopes
+        Scopes { scopes: newset }
-            .union(&other.scopes)
-            .copied()
-            .collect();
-        Scopes {
-            scopes: newset,
-        }
     }
 
     fn _write(subscope: Option<Write>) -> Scopes {
@@ -235,9 +225,7 @@ impl Scopes {
     fn new(scope: Scope) -> Scopes {
         let mut set = HashSet::new();
         set.insert(scope);
-        Scopes {
+        Scopes { scopes: set }
-            scopes: set,
-        }
     }
 }
 
@@ -325,11 +313,11 @@ impl FromStr for Scope {
             read if read.starts_with("read:") => {
                 let r: Read = Read::from_str(&read[5..])?;
                 Scope::Read(Some(r))
-            },
+            }
             write if write.starts_with("write:") => {
                 let w: Write = Write::from_str(&write[6..])?;
                 Scope::Write(Some(w))
-            },
+            }
             _ => return Err(Error::Other("Unknown scope".to_string())),
         })
     }