From 101a00c694f204382008212145e17d9611897a98 Mon Sep 17 00:00:00 2001
From: Conrad Kleinespel <conradk@conradk.com>
Date: Mon, 25 Jan 2021 22:29:08 +0100
Subject: [PATCH] Bump version to 2.9.0

---
 Cargo.lock          | 2 +-
 Cargo.toml          | 2 +-
 README.md           | 8 ++------
 src/clip.rs         | 7 +++----
 src/shell_escape.rs | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5849e680..2fe516bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -572,7 +572,7 @@ dependencies = [
 
 [[package]]
 name = "rooster"
-version = "2.8.6"
+version = "2.9.0"
 dependencies = [
  "ansi_term",
  "byteorder",
diff --git a/Cargo.toml b/Cargo.toml
index 93229737..4c5e4bb2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rooster"
-version = "2.8.6"
+version = "2.9.0"
 authors = ["Conrad Kleinespel <conradk@conradk.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/conradkleinespel/rooster"
diff --git a/README.md b/README.md
index 54e1e1b5..dec4b607 100644
--- a/README.md
+++ b/README.md
@@ -74,12 +74,8 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y
 cargo install --root /usr rooster
 ```
 
-On **Wayland**:
-
-install [wl-clipboard](https://github.com/bugaevc/wl-clipboard)
-
-Make sure you have the following environment variable set: `XDG_SESSION_TYPE=wayland`
-
+If you use **Wayland** instead of X11, install [wl-clipboard](https://github.com/bugaevc/wl-clipboard) and make sure you have the following
+environment variable set: `XDG_SESSION_TYPE=wayland`.
 
 For other distributions, the various Docker files can help you find which dependencies you need.
 
diff --git a/src/clip.rs b/src/clip.rs
index bc2fedcd..9b161cec 100644
--- a/src/clip.rs
+++ b/src/clip.rs
@@ -35,8 +35,8 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
 pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
     use quale::which;
     use shell_escape;
-    use std::process::Command;
     use std::env;
+    use std::process::Command;
 
     let password = SafeString::new(shell_escape::escape(s.deref().into()).into());
 
@@ -101,7 +101,7 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
                     }
                 }
                 None => Err(()),
-            }
+            },
         }
     }
 
@@ -110,7 +110,7 @@ pub fn copy_to_clipboard(s: &SafeString) -> Result<(), ()> {
             let s = wayland_clipboards(&password);
             match s {
                 Ok(_) => Ok(()),
-                Err(_) => x11_clipboards(&password)
+                Err(_) => x11_clipboards(&password),
             }
         }
         _ => x11_clipboards(&password),
@@ -173,4 +173,3 @@ pub fn confirm_password_retrieved<
         }
     }
 }
-
diff --git a/src/shell_escape.rs b/src/shell_escape.rs
index dc356f90..975be058 100644
--- a/src/shell_escape.rs
+++ b/src/shell_escape.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 //! Escape characters that may have special meaning in a shell.
-#![doc(html_root_url="https://docs.rs/shell-escape/0.1")]
+#![doc(html_root_url = "https://docs.rs/shell-escape/0.1")]
 
 use std::borrow::Cow;
 use std::env;