diff options
author | Vincent Ambo <mail@tazj.in> | 2022-02-07T15·49+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-02-08T12·06+0000 |
commit | 3d8ee620875085ae7e8d7ef31f4f8e3738cfdca1 (patch) | |
tree | c4597319495abbb82c9753791fbde11bfdb644f0 /fun | |
parent | 3318982f81c01b570b7021fd9f71aa2bfe192271 (diff) |
style(rust): Format all Rust code with rustfmt r/3791
Change-Id: Iab7e00cc26a4f9727d3ab98691ef379921a33052 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5240 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'fun')
-rw-r--r-- | fun/defer_rs/examples/defer-with-error.rs | 12 | ||||
-rw-r--r-- | fun/defer_rs/examples/defer.rs | 6 | ||||
-rw-r--r-- | fun/defer_rs/examples/undefer.rs | 4 | ||||
-rw-r--r-- | fun/paroxysm/src/keyword.rs | 3 | ||||
-rw-r--r-- | fun/paroxysm/src/main.rs | 8 |
5 files changed, 17 insertions, 16 deletions
diff --git a/fun/defer_rs/examples/defer-with-error.rs b/fun/defer_rs/examples/defer-with-error.rs index 26d56d77cf1b..f8b8a014131f 100644 --- a/fun/defer_rs/examples/defer-with-error.rs +++ b/fun/defer_rs/examples/defer-with-error.rs @@ -4,17 +4,17 @@ use std::rc::Rc; use std::sync::RwLock; struct Defer<F: Fn()> { - f: F + f: F, } -impl <F: Fn()> Drop for Defer<F> { +impl<F: Fn()> Drop for Defer<F> { fn drop(&mut self) { (self.f)() } } // Only added this for Go-syntax familiarity ;-) -fn defer<F: Fn()>(f: F) -> Defer<F> { +fn defer<F: Fn()>(f: F) -> Defer<F> { Defer { f } } @@ -29,7 +29,9 @@ type ErrorHandle<T> = Rc<RwLock<Option<T>>>; /////////////////// #[derive(Debug)] // Debug trait for some default way to print the type. -enum Error { DropError } +enum Error { + DropError, +} fn main() { // Create a place to store the error. @@ -60,7 +62,7 @@ fn main() { match *drop_err.read().unwrap() { Some(ref err) => println!("Oh no, an error occured: {:?}!", err), - None => println!("Phew, everything went well.") + None => println!("Phew, everything went well."), }; } diff --git a/fun/defer_rs/examples/defer.rs b/fun/defer_rs/examples/defer.rs index eadac795f8bc..0c99d00c82df 100644 --- a/fun/defer_rs/examples/defer.rs +++ b/fun/defer_rs/examples/defer.rs @@ -1,17 +1,17 @@ // Go's defer in Rust! struct Defer<F: Fn()> { - f: F + f: F, } -impl <F: Fn()> Drop for Defer<F> { +impl<F: Fn()> Drop for Defer<F> { fn drop(&mut self) { (self.f)() } } // Only added this for Go-syntax familiarity ;-) -fn defer<F: Fn()>(f: F) -> Defer<F> { +fn defer<F: Fn()>(f: F) -> Defer<F> { Defer { f } } diff --git a/fun/defer_rs/examples/undefer.rs b/fun/defer_rs/examples/undefer.rs index 17ad8a6b5485..fa659de8910e 100644 --- a/fun/defer_rs/examples/undefer.rs +++ b/fun/defer_rs/examples/undefer.rs @@ -1,10 +1,10 @@ // Go's defer in Rust, with a little twist! struct Defer<F: Fn()> { - f: F + f: F, } -impl <F: Fn()> Drop for Defer<F> { +impl<F: Fn()> Drop for Defer<F> { fn drop(&mut self) { (self.f)() } diff --git a/fun/paroxysm/src/keyword.rs b/fun/paroxysm/src/keyword.rs index 1b2b6ce592a0..fa40f5347a75 100644 --- a/fun/paroxysm/src/keyword.rs +++ b/fun/paroxysm/src/keyword.rs @@ -1,8 +1,7 @@ use crate::models::{Entry, Keyword, NewEntry, NewKeyword}; use diesel::pg::PgConnection; use diesel::prelude::*; -use failure::format_err; -use failure::Error; +use failure::{format_err, Error}; use std::borrow::Cow; /// Maximum number of times we'll follow a `see: ` pointer. diff --git a/fun/paroxysm/src/main.rs b/fun/paroxysm/src/main.rs index 11a0e7bf60b5..998d125bf41c 100644 --- a/fun/paroxysm/src/main.rs +++ b/fun/paroxysm/src/main.rs @@ -7,8 +7,7 @@ use crate::cfg::Config; use crate::keyword::KeywordDetails; use diesel::pg::PgConnection; use diesel::r2d2::{ConnectionManager, Pool}; -use failure::format_err; -use failure::Error; +use failure::{format_err, Error}; use irc::client::prelude::*; use lazy_static::lazy_static; use log::{debug, info, warn}; @@ -153,8 +152,9 @@ impl App { // Use `nick` here, so things like "grfn: see glittershark" work. let val = if let Some(last) = chan_lastmsgs.get(nick_to_grab) { if last.starts_with("\x01ACTION ") { - // Yes, this is inefficient, but it's better than writing some hacky CTCP parsing code - // I guess (also, characters are hard, so just blindly slicing seems like a bad idea) + // Yes, this is inefficient, but it's better than writing some hacky CTCP parsing + // code I guess (also, characters are hard, so just blindly slicing + // seems like a bad idea) format!( "* {} {}", nick_to_grab, |