Skip to content

Commit

Permalink
cargo update
Browse files Browse the repository at this point in the history
Transitive deps now require rust 1.71, so update for that, as well
as some other minor changes required by transitive deps.
  • Loading branch information
wez committed Jul 31, 2023
1 parent afb485e commit d1d4db2
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 96 deletions.
181 changes: 97 additions & 84 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bidi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ impl BidiContext {
== Some(BidiClass::PopDirectionalIsolate)
{
// we matched the criteria for adding this run to the sequence.
let mut iso_run = iso_runs.last_mut().unwrap();
let iso_run = iso_runs.last_mut().unwrap();
iso_run.runs.push(idx);
iso_run.len += run.len;
run.seq_id = seq_id;
Expand Down
2 changes: 1 addition & 1 deletion ci/check-rust-version.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

min_rust="1.67.0"
min_rust="1.71.0"
rust_ver="$(rustc --version | cut -d' ' -f2)"

check_rust_version() {
Expand Down
2 changes: 1 addition & 1 deletion docs/install/source.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ macOS.

* Install `rustup` to get the `rust` compiler installed on your system.
[Install rustup](https://www.rust-lang.org/en-US/install.html)
* Rust version 1.56 or later is required
* Rust version 1.71 or later is required
* Build in release mode: `cargo build --release`
* Run it via either `cargo run --release --bin wezterm` or `target/release/wezterm`

Expand Down
1 change: 0 additions & 1 deletion mux/src/tab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,6 @@ impl TabInner {
best.replace(target);
}
}
drop(recency);

if let Some((_, target)) = best.take() {
return Some(target.index);
Expand Down
2 changes: 1 addition & 1 deletion termwiz/src/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ impl CellAttributes {
|| fat.foreground != ColorAttribute::Default
{
res.allocate_fat_attributes();
let mut new_fat = res.fat.as_mut().unwrap();
let new_fat = res.fat.as_mut().unwrap();
new_fat.foreground = fat.foreground;
new_fat.background = fat.background;
}
Expand Down
2 changes: 1 addition & 1 deletion wezterm-gui/src/termwindow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2289,7 +2289,7 @@ impl TermWindow {

/// Returns the Prompt semantic zones
fn get_semantic_prompt_zones(&mut self, pane: &Arc<dyn Pane>) -> &[StableRowIndex] {
let mut cache = self
let cache = self
.semantic_zones
.entry(pane.pane_id())
.or_insert_with(SemanticZoneCache::default);
Expand Down
2 changes: 1 addition & 1 deletion window/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ winreg = "0.10"
dirs-next = "2.0"
filedescriptor = { version="0.8", path = "../filedescriptor" }
x11 = {version ="2.19", features = ["xlib_xcb", "xlib"]}
xcb = {version="1.2", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present"]}
xcb = {version="1.2", features=["render", "randr", "dri2", "xkb", "xlib_xcb", "present", "as-raw-xcb-connection"]}
xkbcommon = { version = "0.5.0", features = ["x11", "wayland"] }
mio = {version="0.8", features=["os-ext"]}
libc = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion window/src/os/wayland/inputhandler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Inner {
) {
log::trace!("{event:?}");
let conn = WaylandConnection::get().unwrap().wayland();
let mut pending_state = self.pending_state.entry(wl_id(&**input)).or_default();
let pending_state = self.pending_state.entry(wl_id(&**input)).or_default();
match event {
Event::PreeditString {
text,
Expand Down
6 changes: 2 additions & 4 deletions window/src/os/wayland/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl Inner {
) {
log::debug!("handle_zwlr_mode_event {event:?}");
let id = wl_id(mode.detach());
let mut info = self.zwlr_mode_info.entry(id).or_insert_with(|| ModeInfo {
let info = self.zwlr_mode_info.entry(id).or_insert_with(|| ModeInfo {
id,
..ModeInfo::default()
});
Expand All @@ -83,7 +83,6 @@ impl Inner {
info.preferred = true;
}
ZwlrOutputModeEvent::Finished => {
drop(info);
self.zwlr_mode_info.remove(&id);
self.zwlr_modes.remove(&id);
}
Expand All @@ -100,7 +99,7 @@ impl Inner {
) {
log::debug!("handle_zwlr_head_event {event:?}");
let id = wl_id(head.detach());
let mut info = self.zwlr_head_info.entry(id).or_insert_with(|| HeadInfo {
let info = self.zwlr_head_info.entry(id).or_insert_with(|| HeadInfo {
id,
..HeadInfo::default()
});
Expand Down Expand Up @@ -154,7 +153,6 @@ impl Inner {
info.serial_number = serial_number;
}
ZwlrOutputHeadEvent::Finished => {
drop(info);
log::debug!("remove head with id {id}");
self.zwlr_heads.remove(&id);
self.zwlr_head_info.remove(&id);
Expand Down

0 comments on commit d1d4db2

Please sign in to comment.