Release swayr v0.14.0

Cargo.lock

@@ -42,9 +42,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.0.14"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
+checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77"
 dependencies = [
  "atty",
  "bitflags",
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.0.14"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85"
+checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -105,9 +105,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
  "cfg-if",
  "libc",
@@ -165,9 +165,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.117"
+version = "0.2.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
 
 [[package]]
 name = "log"
@@ -243,14 +243,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
  "rand_core",
- "rand_hc",
 ]
 
 [[package]]
@@ -272,15 +271,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.10"
@@ -383,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "swayipc-types"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d63c88513504fd598a6c2218bd83d19e1f8cc6dd1a9892f2f982b223f01a803"
+checksum = "620c3054335b817901d36f06fa5ef715f04d59d7b96f48ecc1a7bf408f194af7"
 dependencies = [
  "serde",
  "serde_json",
@@ -394,7 +384,7 @@ dependencies = [
 
 [[package]]
 name = "swayr"
-version = "0.13.0"
+version = "0.14.0"
 dependencies = [
  "clap",
  "directories",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swayr"
-version = "0.13.0"
+version = "0.14.0"
 description = "A LRU window-switcher (and more) for the sway window manager"
 homepage = "https://sr.ht/~tsdh/swayr/"
 repository = "https://git.sr.ht/~tsdh/swayr"

NEWS.md

@@ -1,3 +1,13 @@
+swayr v0.14.0
+=============
+
+- Instead of just printing everything to stdout and stderr, there's now proper
+  logging with timestamps and filtering.  You can define the log level using an
+  environment variable like so: `env RUST_LOG=swayr=debug swayrd`.  That would
+  start swayr with log level `debug`.  Valid log levels in the order from
+  logging more to logging less are: `trace`, `debug`, `info`, `warn`, `error`,
+  `off`.
+
 swayr v0.13.0
 =============
 

README.md

@@ -174,8 +174,8 @@ of the output to some logfile is optional but helps a lot when something
 doesn't work.  Especially, if you encounter a crash in certain situations and
 you want to report a bug, it would be utmost helpful if you could reproduce the
 issue with backtrace and logging at the `debug` level and attach that to your
-bug report.  (Valid log levels are: `trace`, `debug`, `info`, `warn`, `error`,
+bug report.  Valid log levels in the order from logging more to logging less
-`off`.)
+are: `trace`, `debug`, `info`, `warn`, `error`, `off`.
 
 Next to starting the demon, you want to bind swayr commands to some keys like
 so:

src/cmds.rs

@@ -880,8 +880,8 @@ fn tile_current_workspace(floating: &ConsiderFloating, shuffle: bool) {
     match layout::relayout_current_workspace(
         floating == &ConsiderFloating::IncludeFloating,
         Box::new(move |wins, con: &mut s::Connection| {
-            con.run_command("focus parent".to_string())?;
+            con.run_command("focus parent")?;
-            con.run_command("layout splith".to_string())?;
+            con.run_command("layout splith")?;
 
             let mut placed_wins = vec![];
             let mut rng = rand::thread_rng();
@@ -922,8 +922,8 @@ fn tab_current_workspace(floating: &ConsiderFloating) {
     match layout::relayout_current_workspace(
         floating == &ConsiderFloating::IncludeFloating,
         Box::new(move |wins, con: &mut s::Connection| {
-            con.run_command("focus parent".to_string())?;
+            con.run_command("focus parent")?;
-            con.run_command("layout tabbed".to_string())?;
+            con.run_command("layout tabbed")?;
 
             let mut placed_wins = vec![];
             wins.reverse();

src/config.rs

@@ -35,7 +35,7 @@ fn tilde_expand_file_names(file_names: Vec<String>) -> Vec<String> {
     for file_name in file_names {
         if file_name.starts_with('~') {
             ret.push(file_name.replacen(
-                "~",
+                '~',
                 &std::env::var("HOME").expect("$HOME not defined"),
                 1,
             ));

src/tree.rs

@@ -436,9 +436,9 @@ lazy_static! {
 
 fn maybe_html_escape(do_it: bool, text: String) -> String {
     if do_it {
-        text.replace("<", "&lt;")
+        text.replace('<', "&lt;")
-            .replace(">", "&gt;")
+            .replace('>', "&gt;")
-            .replace("&", "&amp;")
+            .replace('&', "&amp;")
     } else {
         text
     }