Skip to content

Upgrade nix, allow windows-sys >=0.59, <=0.61 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
passcod merged 3 commits into from
Jan 20, 2026
Merged

Upgrade nix, allow windows-sys >=0.59, <=0.61 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d4314b
Upgrade `nix`, allow `windows-sys` >=0.59, <=0.61
ColinFinck Jan 19, 2026
6c54b37
Fix warning in newer Rust versions.
ColinFinck Jan 19, 2026
b535537
Adapt to latest `nix` changes.
ColinFinck Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 45 additions & 103 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ thiserror = "2.0.11"
which = "8.0.0"

[target.'cfg(unix)'.dependencies.nix]
version = "0.29.0"
version = "0.30.1"
default-features = false
features = ["fs", "term"]

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.59.0"
version = ">=0.59, <=0.61"
default-features = false
features = [
"Win32_Foundation",
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ mod unix {
unistd::isatty,
};

use std::{fs::OpenOptions, io::stdin, os::fd::AsFd, os::unix::prelude::AsRawFd};
use std::{fs::OpenOptions, io::stdin, os::fd::AsFd};

pub(crate) fn vt_cooked() -> Result<(), Error> {
write_termios(|t| {
Expand Down Expand Up @@ -817,7 +817,7 @@ mod unix {
}

fn write_termios(f: impl Fn(&mut Termios)) -> Result<(), Error> {
if isatty(stdin().as_raw_fd()).map_err(NixError)? {
if isatty(stdin()).map_err(NixError)? {
let mut t = tcgetattr(stdin().as_fd()).map_err(NixError)?;
reset_termios(&mut t);
f(&mut t);
Expand Down Expand Up @@ -1257,7 +1257,7 @@ impl AsRef<[u8]> for ResetScrollback<'_> {

impl ResetScrollback<'_> {
#[inline]
fn expand(&self) -> Expansion<Self> {
fn expand(&self) -> Expansion<'_, Self> {
#[allow(dead_code)]
struct ExpansionHere<'a, T: 'a + AsRef<[u8]>> {
string: &'a T,
Expand Down