diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
| commit | c23a457e72abe608715ac76f076f47dc42af07a5 (patch) | |
| tree | 2772049aaf84b5c9d0ed12ec8d86812f7a7904b6 /vendor/is-terminal | |
| parent | Releasing progress-linux version 1.73.0+dfsg1-1~progress7.99u1. (diff) | |
| download | rustc-c23a457e72abe608715ac76f076f47dc42af07a5.tar.xz rustc-c23a457e72abe608715ac76f076f47dc42af07a5.zip | |
Merging upstream version 1.74.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/is-terminal')
| -rw-r--r-- | vendor/is-terminal/.cargo-checksum.json | 2 | ||||
| -rw-r--r-- | vendor/is-terminal/Cargo.toml | 2 | ||||
| -rw-r--r-- | vendor/is-terminal/src/lib.rs | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/vendor/is-terminal/.cargo-checksum.json b/vendor/is-terminal/.cargo-checksum.json index c006045f8..a9633aa3e 100644 --- a/vendor/is-terminal/.cargo-checksum.json +++ b/vendor/is-terminal/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"2fc1b230aeeba472a175fdeebf800f38a7adf0443830b323234d377e37e45eea","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE-MIT-atty":"bab426a663ce3d5bbbcea9cdc300da74e94d76c3c79e46699a953f967a08e533","README.md":"252ffd0e461bf2c22cbedd3b05746cc133a3e9e5426635d6a147e575e8295ec3","src/lib.rs":"8df39830a1d8f08194bbf736da9cb23cc357f80f7e7ab472caa941bfb546639f"},"package":"24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"}
\ No newline at end of file +{"files":{"Cargo.toml":"5b39dac082469ca2ed9a1df1dfdc80d5d014c7cafc646f8806fe44be4bd665cd","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE-MIT-atty":"bab426a663ce3d5bbbcea9cdc300da74e94d76c3c79e46699a953f967a08e533","README.md":"252ffd0e461bf2c22cbedd3b05746cc133a3e9e5426635d6a147e575e8295ec3","src/lib.rs":"e0564f31ae15b98afc4bb0e3e8c60a63698637d2f87df6b0283077734f627af5"},"package":"cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"}
\ No newline at end of file diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml index e0baea0f1..08933a7c1 100644 --- a/vendor/is-terminal/Cargo.toml +++ b/vendor/is-terminal/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.63" name = "is-terminal" -version = "0.4.8" +version = "0.4.9" authors = [ "softprops <d.tangren@gmail.com>", "Dan Gohman <dev@sunfishcode.online>", diff --git a/vendor/is-terminal/src/lib.rs b/vendor/is-terminal/src/lib.rs index e68e60ffa..56810b7d9 100644 --- a/vendor/is-terminal/src/lib.rs +++ b/vendor/is-terminal/src/lib.rs @@ -27,10 +27,10 @@ #![cfg_attr(unix, no_std)] -#[cfg(not(any(windows, target_os = "unknown")))] +#[cfg(not(any(windows, target_os = "hermit", target_os = "unknown")))] use rustix::fd::AsFd; #[cfg(target_os = "hermit")] -use std::os::hermit::io::AsRawFd; +use std::os::hermit::io::AsFd; #[cfg(windows)] use std::os::windows::io::{AsHandle, AsRawHandle, BorrowedHandle}; #[cfg(windows)] @@ -80,7 +80,8 @@ impl<Stream: AsFd> IsTerminal for Stream { #[cfg(target_os = "hermit")] { - hermit_abi::isatty(self.as_fd().as_raw_fd()) + use std::os::hermit::io::AsRawFd; + hermit_abi::isatty(self.as_fd().as_fd().as_raw_fd()) } } } |