Skip to content

Commit

Permalink
deps: update
Browse files Browse the repository at this point in the history
Main thing to note here is that the open crate has deprecated
open::that_in_background, but made open::that non-blocking.

I think this is OK, but I'm a little cagey about what will
happen with this on Windows.  We may need to spawn our own
thread for this if things go awry.
  • Loading branch information
wez committed Jun 13, 2022
1 parent eb213c2 commit 75066cb
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 46 deletions.
126 changes: 90 additions & 36 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion color-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ license = "MIT"
use_serde = ["serde"]

[dependencies]
csscolorparser = "0.5"
csscolorparser = "0.6"
lazy_static = "1.4"
serde = {version="1.0", features = ["derive"], optional=true}
2 changes: 1 addition & 1 deletion config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git2 = { version = "0.14", default-features = false }
anyhow = "1.0"
bitflags = "1.3"
chrono = {version="0.4", features=["unstable-locales"]}
colorgrad = "0.5"
colorgrad = "0.6"
dirs-next = "2.0"
enum-display-derive = "0.1"
hostname = "0.3"
Expand Down
3 changes: 2 additions & 1 deletion lua-api-crates/spawn-funcs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ edition = "2021"
anyhow = "1.0"
config = { path = "../../config" }
wezterm-dynamic = { path = "../../wezterm-dynamic" }
log = "0.4"
luahelper = { path = "../../luahelper" }
smol = "1.2"
bstr = "0.2"
open = "2.0"
open = "3.0"

[target."cfg(windows)".dependencies]
winapi = { version = "0.3", features = ["winuser"]}
4 changes: 3 additions & 1 deletion lua-api-crates/spawn-funcs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ fn open_with<'lua>(_: &'lua Lua, (url, app): (String, Option<String>)) -> mlua::
if let Some(app) = app {
open::with_in_background(url, app);
} else {
open::that_in_background(url);
if let Err(err) = open::that(&url) {
log::error!("Error opening {}: {:#}", url, err);
}
}
Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion term/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use_serde = ["termwiz/use_serde"]
[dependencies]
anyhow = "1.0"
bitflags = "1.3"
csscolorparser = "0.5"
csscolorparser = "0.6"
miniz_oxide = "0.4"
hex = "0.4"
image = "0.24"
Expand Down
4 changes: 2 additions & 2 deletions wezterm-gui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bitflags = "1.3"
chrono = {version="0.4", features=["unstable-locales"]}
clap = {version="3.1", features=["derive"]}
codec = { path = "../codec" }
colorgrad = "0.5"
colorgrad = "0.6"
config = { path = "../config" }
downcast-rs = "1.0"
dirs-next = "2.0"
Expand All @@ -45,7 +45,7 @@ luahelper = { path = "../luahelper" }
metrics = { version="0.17", features=["std"]}
mlua = "0.8.0-beta.4"
mux = { path = "../mux" }
open = "2.0"
open = "3.0"
ordered-float = "3.0"
portable-pty = { path = "../pty", features = ["serde_support", "ssh"]}
promise = { path = "../promise" }
Expand Down
4 changes: 3 additions & 1 deletion wezterm-gui/src/termwindow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2476,7 +2476,9 @@ impl TermWindow {
};
if default_click {
log::info!("clicking {}", link);
open::that_in_background(&link);
if let Err(err) = open::that(&link) {
log::error!("Error opening {}: {:#}", link, err);
}
}
Ok(())
}
Expand Down
Loading

0 comments on commit 75066cb

Please sign in to comment.