Skip to content

Commit

Permalink
Merge remote-tracking branch 'o/main' into feat/36
Browse files Browse the repository at this point in the history
  • Loading branch information
sassman committed Apr 18, 2022
2 parents 4e7d9fa + e767bb9 commit aa55a44
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
31 changes: 18 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ maintenance = { status = "actively-developed" }
[dependencies]
anyhow = "1.0.56"
tempfile = "3.3.0"
rayon = "1.5.1"
log = "0.4.14"
rayon = "1.5.2"
log = "0.4.16"
env_logger = "0.9.0"
simplerand = "1.3.0"
humantime = "2.1.0"
crossbeam-channel = "0.5"
blockhash = "0.3"

[dependencies.clap]
version = "3.1.6"
version = "3.1.9"
features = ["cargo"]

[dependencies.image]
Expand Down
5 changes: 2 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,8 @@ pub fn ls_win() -> Result<()> {
let api = setup()?;
println!("Window | Id");
for (window_owner, window_id) in api.window_list()? {
match (window_owner, window_id) {
(Some(window_owner), window_id) => println!("{} | {}", window_owner, window_id),
(_, _) => {}
if let (Some(window_owner), window_id) = (window_owner, window_id) {
println!("{} | {}", window_owner, window_id)
}
}

Expand Down

0 comments on commit aa55a44

Please sign in to comment.