diff --git a/corcovado/src/io.rs b/corcovado/src/io.rs
index c48367e2..44b754b2 100644
--- a/corcovado/src/io.rs
+++ b/corcovado/src/io.rs
@@ -1,9 +1,9 @@
 // Re-export the io::Result / Error types for convenience
 // pub use std::io::{Error, ErrorKind, Read, Result, Write};
 
-pub use std::io::Result;
 #[cfg(not(target_os = "windows"))]
 pub use std::io::ErrorKind;
+pub use std::io::Result;
 
 // TODO: Delete this
 /// A helper trait to provide the map_non_block function on Results.
diff --git a/corcovado/src/sys/mod.rs b/corcovado/src/sys/mod.rs
index 2698898e..30812ca7 100644
--- a/corcovado/src/sys/mod.rs
+++ b/corcovado/src/sys/mod.rs
@@ -9,9 +9,7 @@ pub use self::unix::READY_ALL;
 pub mod unix;
 
 #[cfg(windows)]
-pub use self::windows::{
-    Awakener, Binding, Events, Overlapped, Selector,
-};
+pub use self::windows::{Awakener, Binding, Events, Overlapped, Selector};
 
 #[cfg(windows)]
 mod windows;
diff --git a/corcovado/src/sys/windows/from_raw_arc.rs b/corcovado/src/sys/windows/from_raw_arc.rs
index 8274ce69..97c15f65 100644
--- a/corcovado/src/sys/windows/from_raw_arc.rs
+++ b/corcovado/src/sys/windows/from_raw_arc.rs
@@ -43,7 +43,9 @@ impl<T> FromRawArc<T> {
             cnt: AtomicUsize::new(1),
         });
         FromRawArc {
-            _inner: unsafe { mem::transmute::<std::boxed::Box<Inner<T>>, *mut Inner<T>>(x) },
+            _inner: unsafe {
+                mem::transmute::<std::boxed::Box<Inner<T>>, *mut Inner<T>>(x)
+            },
         }
     }
 
diff --git a/frontends/rioterm/src/context.rs b/frontends/rioterm/src/context.rs
index 93ef66ce..0c3d28ab 100644
--- a/frontends/rioterm/src/context.rs
+++ b/frontends/rioterm/src/context.rs
@@ -688,7 +688,6 @@ impl<T: EventListener + Clone + std::marker::Send + 'static> ContextManager<T> {
     ) {
         let mut working_dir = None;
         if self.config.use_current_path && self.config.working_dir.is_none() {
-
             #[cfg(not(target_os = "windows"))]
             {
                 let current_context = self.current();
diff --git a/teletypewriter/src/windows/spsc.rs b/teletypewriter/src/windows/spsc.rs
index 8dbc1ca4..8cb24358 100644
--- a/teletypewriter/src/windows/spsc.rs
+++ b/teletypewriter/src/windows/spsc.rs
@@ -1,9 +1,9 @@
 // Single-producer single-consumer buffer for Rust
 
-use std::rc::Rc;
 use std::cell::UnsafeCell;
 use std::io::{self, Read, Write};
 use std::mem;
+use std::rc::Rc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 struct SpscBuffer {