Merging upstream version 1.67.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 392 insertions, 165 deletions

diff --git a/vendor/rustix/src/termios/cf.rs b/vendor/rustix/src/termios/cf.rs
index d28b65e03..d79eab5c8 100644
--- a/vendor/rustix/src/termios/cf.rs
+++ b/vendor/rustix/src/termios/cf.rs
@@ -1,40 +1,40 @@
 use crate::termios::{Speed, Termios};
-use crate::{imp, io};
+use crate::{backend, io};
 
 /// `cfgetospeed(termios)`
 #[inline]
 #[must_use]
 pub fn cfgetospeed(termios: &Termios) -> Speed {
-    imp::termios::syscalls::cfgetospeed(termios)
+    backend::termios::syscalls::cfgetospeed(termios)
 }
 
 /// `cfgetispeed(termios)`
 #[inline]
 #[must_use]
 pub fn cfgetispeed(termios: &Termios) -> Speed {
-    imp::termios::syscalls::cfgetispeed(termios)
+    backend::termios::syscalls::cfgetispeed(termios)
 }
 
 /// `cfmakeraw(termios)`
 #[inline]
 pub fn cfmakeraw(termios: &mut Termios) {
-    imp::termios::syscalls::cfmakeraw(termios)
+    backend::termios::syscalls::cfmakeraw(termios)
 }
 
 /// `cfsetospeed(termios, speed)`
 #[inline]
 pub fn cfsetospeed(termios: &mut Termios, speed: Speed) -> io::Result<()> {
-    imp::termios::syscalls::cfsetospeed(termios, speed)
+    backend::termios::syscalls::cfsetospeed(termios, speed)
 }
 
 /// `cfsetispeed(termios, speed)`
 #[inline]
 pub fn cfsetispeed(termios: &mut Termios, speed: Speed) -> io::Result<()> {
-    imp::termios::syscalls::cfsetispeed(termios, speed)
+    backend::termios::syscalls::cfsetispeed(termios, speed)
 }
 
 /// `cfsetspeed(termios, speed)`
 #[inline]
 pub fn cfsetspeed(termios: &mut Termios, speed: Speed) -> io::Result<()> {
-    imp::termios::syscalls::cfsetspeed(termios, speed)
+    backend::termios::syscalls::cfsetspeed(termios, speed)
 }
diff --git a/vendor/rustix/src/termios/constants.rs b/vendor/rustix/src/termios/constants.rs
index 5c10c12ed..e96f139eb 100644
--- a/vendor/rustix/src/termios/constants.rs
+++ b/vendor/rustix/src/termios/constants.rs
@@ -1,102 +1,142 @@
-use crate::imp;
+use crate::backend;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B1000000;
+pub use backend::termios::types::B1000000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B1152000;
+pub use backend::termios::types::B1152000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B1500000;
+pub use backend::termios::types::B1500000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B2000000;
+pub use backend::termios::types::B2000000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B2500000;
+pub use backend::termios::types::B2500000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B3000000;
+pub use backend::termios::types::B3000000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B3500000;
+pub use backend::termios::types::B3500000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B4000000;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
-pub use imp::termios::types::B460800;
+pub use backend::termios::types::B4000000;
+#[cfg(not(any(
+    target_os = "dragonfly",
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "openbsd"
+)))]
+pub use backend::termios::types::B460800;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B500000;
+pub use backend::termios::types::B500000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::B576000;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
-pub use imp::termios::types::B921600;
+pub use backend::termios::types::B576000;
+#[cfg(not(any(
+    target_os = "dragonfly",
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "openbsd"
+)))]
+pub use backend::termios::types::B921600;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::BRKINT;
+pub use backend::termios::types::BRKINT;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -107,8 +147,9 @@ pub use imp::termios::types::BRKINT;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::BS0;
+pub use backend::termios::types::BS0;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -121,8 +162,9 @@ pub use imp::termios::types::BS0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::BS1;
+pub use backend::termios::types::BS1;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -132,54 +174,61 @@ pub use imp::termios::types::BS1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::BSDLY;
+pub use backend::termios::types::BSDLY;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
 )))]
-pub use imp::termios::types::CBAUD;
+pub use backend::termios::types::CBAUD;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CBAUDEX;
+pub use backend::termios::types::CBAUDEX;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
 )))]
-pub use imp::termios::types::CIBAUD;
+pub use backend::termios::types::CIBAUD;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CLOCAL;
+pub use backend::termios::types::CLOCAL;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CMSPAR;
+pub use backend::termios::types::CMSPAR;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -190,8 +239,9 @@ pub use imp::termios::types::CMSPAR;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CR0;
+pub use backend::termios::types::CR0;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -204,8 +254,9 @@ pub use imp::termios::types::CR0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CR1;
+pub use backend::termios::types::CR1;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -218,8 +269,9 @@ pub use imp::termios::types::CR1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CR2;
+pub use backend::termios::types::CR2;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -232,8 +284,9 @@ pub use imp::termios::types::CR2;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CR3;
+pub use backend::termios::types::CR3;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -243,56 +296,66 @@ pub use imp::termios::types::CR3;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::CRDLY;
+pub use backend::termios::types::CRDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CREAD;
+pub use backend::termios::types::CREAD;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::CRTSCTS;
+pub use backend::termios::types::CRTSCTS;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CS5;
+pub use backend::termios::types::CS5;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CS6;
+pub use backend::termios::types::CS6;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CS7;
+pub use backend::termios::types::CS7;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CS8;
+pub use backend::termios::types::CS8;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CSIZE;
+pub use backend::termios::types::CSIZE;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::CSTOPB;
+pub use backend::termios::types::CSTOPB;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ECHO;
+pub use backend::termios::types::ECHO;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::ECHOCTL;
+pub use backend::termios::types::ECHOCTL;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ECHOE;
+pub use backend::termios::types::ECHOE;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ECHOK;
+pub use backend::termios::types::ECHOK;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::ECHOKE;
+pub use backend::termios::types::ECHOKE;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ECHONL;
+pub use backend::termios::types::ECHONL;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::ECHOPRT;
+pub use backend::termios::types::ECHOPRT;
 #[cfg(not(any(
     target_os = "emscripten",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::EXTA;
+pub use backend::termios::types::EXTA;
 #[cfg(not(any(
     target_os = "emscripten",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::EXTB;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::EXTPROC;
+pub use backend::termios::types::EXTB;
+#[cfg(not(any(
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "redox"
+)))]
+pub use backend::termios::types::EXTPROC;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -303,8 +366,9 @@ pub use imp::termios::types::EXTPROC;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::FF0;
+pub use backend::termios::types::FF0;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -317,8 +381,9 @@ pub use imp::termios::types::FF0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::FF1;
+pub use backend::termios::types::FF1;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -329,32 +394,38 @@ pub use imp::termios::types::FF1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::FFDLY;
+pub use backend::termios::types::FFDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::FLUSHO;
+pub use backend::termios::types::FLUSHO;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::HUPCL;
+pub use backend::termios::types::HUPCL;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ICRNL;
+pub use backend::termios::types::ICRNL;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IEXTEN;
+pub use backend::termios::types::IEXTEN;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IGNBRK;
+pub use backend::termios::types::IGNBRK;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IGNCR;
+pub use backend::termios::types::IGNCR;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IGNPAR;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::IMAXBEL;
+pub use backend::termios::types::IGNPAR;
+#[cfg(not(any(
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "redox"
+)))]
+pub use backend::termios::types::IMAXBEL;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::INLCR;
+pub use backend::termios::types::INLCR;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::INPCK;
+pub use backend::termios::types::INPCK;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ISIG;
+pub use backend::termios::types::ISIG;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ISTRIP;
+pub use backend::termios::types::ISTRIP;
 #[cfg(any(
     linux_raw,
     all(
@@ -362,25 +433,27 @@ pub use imp::termios::types::ISTRIP;
         any(target_os = "haiku", target_os = "illumos", target_os = "solaris"),
     )
 ))]
-pub use imp::termios::types::IUCLC;
+pub use backend::termios::types::IUCLC;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::IUTF8;
+pub use backend::termios::types::IUTF8;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::IXANY;
+pub use backend::termios::types::IXANY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IXOFF;
+pub use backend::termios::types::IXOFF;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::IXON;
+pub use backend::termios::types::IXON;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -391,8 +464,9 @@ pub use imp::termios::types::IXON;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::NL0;
+pub use backend::termios::types::NL0;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -403,8 +477,9 @@ pub use imp::termios::types::NL0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::NL1;
+pub use backend::termios::types::NL1;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -414,12 +489,13 @@ pub use imp::termios::types::NL1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::NLDLY;
+pub use backend::termios::types::NLDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::NOFLSH;
+pub use backend::termios::types::NOFLSH;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::OCRNL;
+pub use backend::termios::types::OCRNL;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -428,7 +504,7 @@ pub use imp::termios::types::OCRNL;
     target_os = "netbsd",
     target_os = "openbsd",
 )))]
-pub use imp::termios::types::OFDEL;
+pub use backend::termios::types::OFDEL;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -437,7 +513,7 @@ pub use imp::termios::types::OFDEL;
     target_os = "netbsd",
     target_os = "openbsd",
 )))]
-pub use imp::termios::types::OFILL;
+pub use backend::termios::types::OFILL;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -446,24 +522,25 @@ pub use imp::termios::types::OFILL;
     target_os = "netbsd",
     target_os = "redox",
 )))]
-pub use imp::termios::types::OLCUC;
+pub use backend::termios::types::OLCUC;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ONLCR;
+pub use backend::termios::types::ONLCR;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ONLRET;
+pub use backend::termios::types::ONLRET;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::ONOCR;
+pub use backend::termios::types::ONOCR;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::OPOST;
+pub use backend::termios::types::OPOST;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::PARENB;
+pub use backend::termios::types::PARENB;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::PARMRK;
+pub use backend::termios::types::PARMRK;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::PARODD;
+pub use backend::termios::types::PARODD;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
-pub use imp::termios::types::PENDIN;
+pub use backend::termios::types::PENDIN;
 #[cfg(not(any(
+    target_os = "dragonfly",
     target_os = "fuchsia",
     target_os = "illumos",
     target_os = "ios",
@@ -471,8 +548,9 @@ pub use imp::termios::types::PENDIN;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::TAB0;
+pub use backend::termios::types::TAB0;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -485,8 +563,9 @@ pub use imp::termios::types::TAB0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::TAB1;
+pub use backend::termios::types::TAB1;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -499,10 +578,12 @@ pub use imp::termios::types::TAB1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::TAB2;
+pub use backend::termios::types::TAB2;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
+    target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "fuchsia",
     target_os = "illumos",
@@ -511,29 +592,34 @@ pub use imp::termios::types::TAB2;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::TAB3;
+pub use backend::termios::types::TAB3;
 #[cfg(not(any(
+    target_os = "dragonfly",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "illumos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::TABDLY;
+pub use backend::termios::types::TABDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-pub use imp::termios::types::TOSTOP;
+pub use backend::termios::types::TOSTOP;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::VSWTC;
+pub use backend::termios::types::VSWTC;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
@@ -544,8 +630,9 @@ pub use imp::termios::types::VSWTC;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::VT0;
+pub use backend::termios::types::VT0;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -558,8 +645,9 @@ pub use imp::termios::types::VT0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::VT1;
+pub use backend::termios::types::VT1;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
     target_os = "dragonfly",
@@ -570,26 +658,31 @@ pub use imp::termios::types::VT1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::VTDLY;
+pub use backend::termios::types::VTDLY;
 #[cfg(any(linux_raw, all(libc, any(target_arch = "s390x", target_os = "haiku"))))]
-pub use imp::termios::types::XCASE;
+pub use backend::termios::types::XCASE;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
-pub use imp::termios::types::XTABS;
-pub use imp::termios::types::{
+pub use backend::termios::types::XTABS;
+pub use backend::termios::types::{
     B0, B110, B115200, B1200, B134, B150, B1800, B19200, B200, B230400, B2400, B300, B38400, B4800,
-    B50, B57600, B600, B75, B9600, ICANON, VDISCARD, VEOF, VEOL, VEOL2, VERASE, VINTR, VKILL,
-    VLNEXT, VMIN, VQUIT, VREPRINT, VSTART, VSTOP, VSUSP, VTIME, VWERASE,
+    B50, B57600, B600, B75, B9600, ICANON, VEOF, VEOL, VEOL2, VERASE, VINTR, VKILL, VMIN, VQUIT,
+    VSTART, VSTOP, VSUSP, VTIME,
 };
+#[cfg(not(target_os = "haiku"))]
+pub use backend::termios::types::{VDISCARD, VLNEXT, VREPRINT, VWERASE};
 
 /// Translate from a `Speed` code to a speed value `u32`.
 ///
@@ -597,123 +690,163 @@ pub use imp::termios::types::{
 /// let speed = rustix::termios::speed_value(rustix::termios::B57600);
 /// assert_eq!(speed, Some(57600));
 /// ```
-pub fn speed_value(speed: imp::termios::types::Speed) -> Option<u32> {
+pub fn speed_value(speed: backend::termios::types::Speed) -> Option<u32> {
     match speed {
-        imp::termios::types::B0 => Some(0),
-        imp::termios::types::B50 => Some(50),
-        imp::termios::types::B75 => Some(75),
-        imp::termios::types::B110 => Some(110),
-        imp::termios::types::B134 => Some(134),
-        imp::termios::types::B150 => Some(150),
-        imp::termios::types::B200 => Some(200),
-        imp::termios::types::B300 => Some(300),
-        imp::termios::types::B600 => Some(600),
-        imp::termios::types::B1200 => Some(1200),
-        imp::termios::types::B1800 => Some(1800),
-        imp::termios::types::B2400 => Some(2400),
-        imp::termios::types::B4800 => Some(4800),
-        imp::termios::types::B9600 => Some(9600),
-        imp::termios::types::B19200 => Some(19200),
-        imp::termios::types::B38400 => Some(38400),
-        imp::termios::types::B57600 => Some(57600),
-        imp::termios::types::B115200 => Some(115_200),
-        imp::termios::types::B230400 => Some(230_400),
-        #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
-        imp::termios::types::B460800 => Some(460_800),
+        backend::termios::types::B0 => Some(0),
+        backend::termios::types::B50 => Some(50),
+        backend::termios::types::B75 => Some(75),
+        backend::termios::types::B110 => Some(110),
+        backend::termios::types::B134 => Some(134),
+        backend::termios::types::B150 => Some(150),
+        backend::termios::types::B200 => Some(200),
+        backend::termios::types::B300 => Some(300),
+        backend::termios::types::B600 => Some(600),
+        backend::termios::types::B1200 => Some(1200),
+        backend::termios::types::B1800 => Some(1800),
+        backend::termios::types::B2400 => Some(2400),
+        backend::termios::types::B4800 => Some(4800),
+        backend::termios::types::B9600 => Some(9600),
+        backend::termios::types::B19200 => Some(19200),
+        backend::termios::types::B38400 => Some(38400),
+        backend::termios::types::B57600 => Some(57600),
+        backend::termios::types::B115200 => Some(115_200),
+        backend::termios::types::B230400 => Some(230_400),
+        #[cfg(not(any(
+            target_os = "dragonfly",
+            target_os = "haiku",
+            target_os = "ios",
+            target_os = "macos",
+            target_os = "openbsd"
+        )))]
+        backend::termios::types::B460800 => Some(460_800),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "illumos",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B500000 => Some(500_000),
+        backend::termios::types::B500000 => Some(500_000),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "illumos",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
+        )))]
+        backend::termios::types::B576000 => Some(576_000),
+        #[cfg(not(any(
+            target_os = "dragonfly",
+            target_os = "haiku",
+            target_os = "ios",
+            target_os = "macos",
+            target_os = "openbsd"
         )))]
-        imp::termios::types::B576000 => Some(576_000),
-        #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
-        imp::termios::types::B921600 => Some(921_600),
+        backend::termios::types::B921600 => Some(921_600),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B1000000 => Some(1_000_000),
+        backend::termios::types::B1000000 => Some(1_000_000),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B1152000 => Some(1_152_000),
+        backend::termios::types::B1152000 => Some(1_152_000),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B1500000 => Some(1_500_000),
+        backend::termios::types::B1500000 => Some(1_500_000),
         #[cfg(not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B2000000 => Some(2_000_000),
+        backend::termios::types::B2000000 => Some(2_000_000),
         #[cfg(not(any(
+            target_arch = "sparc",
+            target_arch = "sparc64",
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B2500000 => Some(2_500_000),
+        backend::termios::types::B2500000 => Some(2_500_000),
         #[cfg(not(any(
+            target_arch = "sparc",
+            target_arch = "sparc64",
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B3000000 => Some(3_000_000),
+        backend::termios::types::B3000000 => Some(3_000_000),
         #[cfg(not(any(
+            target_arch = "sparc",
+            target_arch = "sparc64",
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B3500000 => Some(3_500_000),
+        backend::termios::types::B3500000 => Some(3_500_000),
         #[cfg(not(any(
+            target_arch = "sparc",
+            target_arch = "sparc64",
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "haiku",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
             target_os = "openbsd",
+            target_os = "solaris",
         )))]
-        imp::termios::types::B4000000 => Some(4_000_000),
+        backend::termios::types::B4000000 => Some(4_000_000),
         _ => None,
     }
 }
diff --git a/vendor/rustix/src/termios/mod.rs b/vendor/rustix/src/termios/mod.rs
index 79f2f6b38..ec35f96fb 100644
--- a/vendor/rustix/src/termios/mod.rs
+++ b/vendor/rustix/src/termios/mod.rs
@@ -10,98 +10,138 @@ pub use cf::{cfgetispeed, cfgetospeed, cfmakeraw, cfsetispeed, cfsetospeed, cfse
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B1000000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B1152000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B1500000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B2000000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B2500000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B3000000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B3500000;
 #[cfg(not(any(
+    target_arch = "sparc",
+    target_arch = "sparc64",
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B4000000;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
+#[cfg(not(any(
+    target_os = "dragonfly",
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "openbsd"
+)))]
 pub use constants::B460800;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B500000;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::B576000;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "openbsd")))]
+#[cfg(not(any(
+    target_os = "dragonfly",
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "openbsd"
+)))]
 pub use constants::B921600;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
 pub use constants::BRKINT;
@@ -115,6 +155,7 @@ pub use constants::BRKINT;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::BS0;
 #[cfg(not(any(
@@ -129,6 +170,7 @@ pub use constants::BS0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::BS1;
 #[cfg(not(any(
@@ -140,11 +182,13 @@ pub use constants::BS1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::BSDLY;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
@@ -155,18 +199,21 @@ pub use constants::CBAUD;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CBAUDEX;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
@@ -180,12 +227,14 @@ pub use constants::CLOCAL;
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CMSPAR;
 #[cfg(not(any(
@@ -198,6 +247,7 @@ pub use constants::CMSPAR;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CR0;
 #[cfg(not(any(
@@ -212,6 +262,7 @@ pub use constants::CR0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CR1;
 #[cfg(not(any(
@@ -226,6 +277,7 @@ pub use constants::CR1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CR2;
 #[cfg(not(any(
@@ -240,6 +292,7 @@ pub use constants::CR2;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CR3;
 #[cfg(not(any(
@@ -251,6 +304,7 @@ pub use constants::CR3;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::CRDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
@@ -285,21 +339,30 @@ pub use constants::ECHONL;
 pub use constants::ECHOPRT;
 #[cfg(not(any(
     target_os = "emscripten",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::EXTA;
 #[cfg(not(any(
     target_os = "emscripten",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::EXTB;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
+#[cfg(not(any(
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "redox"
+)))]
 pub use constants::EXTPROC;
 #[cfg(not(any(
     target_os = "dragonfly",
@@ -311,6 +374,7 @@ pub use constants::EXTPROC;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::FF0;
 #[cfg(not(any(
@@ -325,6 +389,7 @@ pub use constants::FF0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::FF1;
 #[cfg(not(any(
@@ -337,6 +402,7 @@ pub use constants::FF1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::FFDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
@@ -353,7 +419,12 @@ pub use constants::IGNBRK;
 pub use constants::IGNCR;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
 pub use constants::IGNPAR;
-#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
+#[cfg(not(any(
+    target_os = "haiku",
+    target_os = "ios",
+    target_os = "macos",
+    target_os = "redox"
+)))]
 pub use constants::IMAXBEL;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
 pub use constants::INLCR;
@@ -375,12 +446,14 @@ pub use constants::IUCLC;
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::IUTF8;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
@@ -399,6 +472,7 @@ pub use constants::IXON;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::NL0;
 #[cfg(not(any(
@@ -411,6 +485,7 @@ pub use constants::NL0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::NL1;
 #[cfg(not(any(
@@ -422,6 +497,7 @@ pub use constants::NL1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::NLDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
@@ -472,6 +548,7 @@ pub use constants::PARODD;
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
 pub use constants::PENDIN;
 #[cfg(not(any(
+    target_os = "dragonfly",
     target_os = "fuchsia",
     target_os = "illumos",
     target_os = "ios",
@@ -479,6 +556,7 @@ pub use constants::PENDIN;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::TAB0;
 #[cfg(not(any(
@@ -493,6 +571,7 @@ pub use constants::TAB0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::TAB1;
 #[cfg(not(any(
@@ -507,10 +586,12 @@ pub use constants::TAB1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::TAB2;
 #[cfg(not(any(
     all(libc, target_env = "musl"),
+    target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "fuchsia",
     target_os = "illumos",
@@ -519,15 +600,18 @@ pub use constants::TAB2;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::TAB3;
 #[cfg(not(any(
+    target_os = "dragonfly",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "illumos",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::TABDLY;
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
@@ -535,11 +619,13 @@ pub use constants::TOSTOP;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
+    target_os = "solaris",
 )))]
 pub use constants::VSWTC;
 #[cfg(not(any(
@@ -552,6 +638,7 @@ pub use constants::VSWTC;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::VT0;
 #[cfg(not(any(
@@ -566,6 +653,7 @@ pub use constants::VT0;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::VT1;
 #[cfg(not(any(
@@ -578,6 +666,7 @@ pub use constants::VT1;
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::VTDLY;
 #[cfg(any(linux_raw, all(libc, any(target_arch = "s390x", target_os = "haiku"))))]
@@ -585,19 +674,23 @@ pub use constants::XCASE;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "haiku",
     target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox",
+    target_os = "solaris",
 )))]
 pub use constants::XTABS;
 pub use constants::{
     speed_value, B0, B110, B115200, B1200, B134, B150, B1800, B19200, B200, B230400, B2400, B300,
-    B38400, B4800, B50, B57600, B600, B75, B9600, ICANON, VDISCARD, VEOF, VEOL, VEOL2, VERASE,
-    VINTR, VKILL, VLNEXT, VMIN, VQUIT, VREPRINT, VSTART, VSTOP, VSUSP, VTIME, VWERASE,
+    B38400, B4800, B50, B57600, B600, B75, B9600, ICANON, VEOF, VEOL, VEOL2, VERASE, VINTR, VKILL,
+    VMIN, VQUIT, VSTART, VSTOP, VSUSP, VTIME,
 };
+#[cfg(not(target_os = "haiku"))]
+pub use constants::{VDISCARD, VLNEXT, VREPRINT, VWERASE};
 pub use tc::{
     tcdrain, tcflow, tcflush, tcgetattr, tcgetpgrp, tcgetsid, tcgetwinsize, tcsendbreak, tcsetattr,
     tcsetpgrp, tcsetwinsize, Action, OptionalActions, QueueSelector, Speed, Tcflag, Termios,
diff --git a/vendor/rustix/src/termios/tc.rs b/vendor/rustix/src/termios/tc.rs
index b44eafde3..e1a87b623 100644
--- a/vendor/rustix/src/termios/tc.rs
+++ b/vendor/rustix/src/termios/tc.rs
@@ -1,8 +1,8 @@
 use crate::fd::AsFd;
 use crate::process::Pid;
-use crate::{imp, io};
+use crate::{backend, io};
 
-pub use imp::termios::types::{
+pub use backend::termios::types::{
     Action, OptionalActions, QueueSelector, Speed, Tcflag, Termios, Winsize,
 };
 
@@ -22,7 +22,7 @@ pub use imp::termios::types::{
 #[inline]
 #[doc(alias = "TCGETS")]
 pub fn tcgetattr<Fd: AsFd>(fd: Fd) -> io::Result<Termios> {
-    imp::termios::syscalls::tcgetattr(fd.as_fd())
+    backend::termios::syscalls::tcgetattr(fd.as_fd())
 }
 
 /// `tcgetwinsize(fd)`—Get the current terminal window size.
@@ -37,7 +37,7 @@ pub fn tcgetattr<Fd: AsFd>(fd: Fd) -> io::Result<Termios> {
 #[inline]
 #[doc(alias = "TIOCGWINSZ")]
 pub fn tcgetwinsize<Fd: AsFd>(fd: Fd) -> io::Result<Winsize> {
-    imp::termios::syscalls::tcgetwinsize(fd.as_fd())
+    backend::termios::syscalls::tcgetwinsize(fd.as_fd())
 }
 
 /// `tcgetpgrp(fd)`—Get the terminal foreground process group.
@@ -54,7 +54,7 @@ pub fn tcgetwinsize<Fd: AsFd>(fd: Fd) -> io::Result<Winsize> {
 #[inline]
 #[doc(alias = "TIOCGPGRP")]
 pub fn tcgetpgrp<Fd: AsFd>(fd: Fd) -> io::Result<Pid> {
-    imp::termios::syscalls::tcgetpgrp(fd.as_fd())
+    backend::termios::syscalls::tcgetpgrp(fd.as_fd())
 }
 
 /// `tcsetpgrp(fd, pid)`—Set the terminal foreground process group.
@@ -71,7 +71,7 @@ pub fn tcgetpgrp<Fd: AsFd>(fd: Fd) -> io::Result<Pid> {
 #[inline]
 #[doc(alias = "TIOCSPGRP")]
 pub fn tcsetpgrp<Fd: AsFd>(fd: Fd, pid: Pid) -> io::Result<()> {
-    imp::termios::syscalls::tcsetpgrp(fd.as_fd(), pid)
+    backend::termios::syscalls::tcsetpgrp(fd.as_fd(), pid)
 }
 
 /// `tcsetattr(fd)`—Set terminal attributes.
@@ -93,7 +93,7 @@ pub fn tcsetattr<Fd: AsFd>(
     optional_actions: OptionalActions,
     termios: &Termios,
 ) -> io::Result<()> {
-    imp::termios::syscalls::tcsetattr(fd.as_fd(), optional_actions, termios)
+    backend::termios::syscalls::tcsetattr(fd.as_fd(), optional_actions, termios)
 }
 
 /// `tcsendbreak(fd, 0)`—Transmit zero-valued bits.
@@ -115,7 +115,7 @@ pub fn tcsetattr<Fd: AsFd>(
 #[inline]
 #[doc(alias = "TCSBRK")]
 pub fn tcsendbreak<Fd: AsFd>(fd: Fd) -> io::Result<()> {
-    imp::termios::syscalls::tcsendbreak(fd.as_fd())
+    backend::termios::syscalls::tcsendbreak(fd.as_fd())
 }
 
 /// `tcdrain(fd, duration)`—Wait until all pending output has been written.
@@ -130,7 +130,7 @@ pub fn tcsendbreak<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 /// [Linux `termios`]: https://man7.org/linux/man-pages/man3/termios.3.html
 #[inline]
 pub fn tcdrain<Fd: AsFd>(fd: Fd) -> io::Result<()> {
-    imp::termios::syscalls::tcdrain(fd.as_fd())
+    backend::termios::syscalls::tcdrain(fd.as_fd())
 }
 
 /// `tcflush(fd, queue_selector)`—Wait until all pending output has been
@@ -147,7 +147,7 @@ pub fn tcdrain<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 #[inline]
 #[doc(alias = "TCFLSH")]
 pub fn tcflush<Fd: AsFd>(fd: Fd, queue_selector: QueueSelector) -> io::Result<()> {
-    imp::termios::syscalls::tcflush(fd.as_fd(), queue_selector)
+    backend::termios::syscalls::tcflush(fd.as_fd(), queue_selector)
 }
 
 /// `tcflow(fd, action)`—Suspend or resume transmission or reception.
@@ -163,7 +163,7 @@ pub fn tcflush<Fd: AsFd>(fd: Fd, queue_selector: QueueSelector) -> io::Result<()
 #[inline]
 #[doc(alias = "TCXONC")]
 pub fn tcflow<Fd: AsFd>(fd: Fd, action: Action) -> io::Result<()> {
-    imp::termios::syscalls::tcflow(fd.as_fd(), action)
+    backend::termios::syscalls::tcflow(fd.as_fd(), action)
 }
 
 /// `tcgetsid(fd)`—Return the session ID of the current session with `fd` as
@@ -178,7 +178,7 @@ pub fn tcflow<Fd: AsFd>(fd: Fd, action: Action) -> io::Result<()> {
 #[inline]
 #[doc(alias = "TIOCGSID")]
 pub fn tcgetsid<Fd: AsFd>(fd: Fd) -> io::Result<Pid> {
-    imp::termios::syscalls::tcgetsid(fd.as_fd())
+    backend::termios::syscalls::tcgetsid(fd.as_fd())
 }
 
 /// `tcsetwinsize(fd)`—Set the current terminal window size.
@@ -192,5 +192,5 @@ pub fn tcgetsid<Fd: AsFd>(fd: Fd) -> io::Result<Pid> {
 #[inline]
 #[doc(alias = "TIOCSWINSZ")]
 pub fn tcsetwinsize<Fd: AsFd>(fd: Fd, winsize: Winsize) -> io::Result<()> {
-    imp::termios::syscalls::tcsetwinsize(fd.as_fd(), winsize)
+    backend::termios::syscalls::tcsetwinsize(fd.as_fd(), winsize)
 }
diff --git a/vendor/rustix/src/termios/tty.rs b/vendor/rustix/src/termios/tty.rs
index 1651a3c3b..9a1692330 100644
--- a/vendor/rustix/src/termios/tty.rs
+++ b/vendor/rustix/src/termios/tty.rs
@@ -1,19 +1,20 @@
 //! Functions which operate on file descriptors which might be terminals.
 
-use crate::imp;
+use crate::backend;
 #[cfg(any(
     all(linux_raw, feature = "procfs"),
     all(libc, not(any(target_os = "fuchsia", target_os = "wasi"))),
 ))]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "procfs")))]
 use crate::io;
-use imp::fd::AsFd;
+use backend::fd::AsFd;
 #[cfg(any(
     all(linux_raw, feature = "procfs"),
     all(libc, not(any(target_os = "fuchsia", target_os = "wasi"))),
 ))]
 use {
-    crate::ffi::CString, crate::path::SMALL_PATH_BUFFER_SIZE, alloc::vec::Vec, imp::fd::BorrowedFd,
+    crate::ffi::CString, crate::path::SMALL_PATH_BUFFER_SIZE, alloc::vec::Vec,
+    backend::fd::BorrowedFd,
 };
 
 /// `isatty(fd)`—Tests whether a file descriptor refers to a terminal.
@@ -26,7 +27,7 @@ use {
 /// [Linux]: https://man7.org/linux/man-pages/man3/isatty.3.html
 #[inline]
 pub fn isatty<Fd: AsFd>(fd: Fd) -> bool {
-    imp::termios::syscalls::isatty(fd.as_fd())
+    backend::termios::syscalls::isatty(fd.as_fd())
 }
 
 /// `ttyname_r(fd)`
@@ -57,7 +58,7 @@ fn _ttyname(dirfd: BorrowedFd<'_>, mut buffer: Vec<u8>) -> io::Result<CString> {
     buffer.resize(buffer.capacity(), 0_u8);
 
     loop {
-        match imp::termios::syscalls::ttyname(dirfd, &mut buffer) {
+        match backend::termios::syscalls::ttyname(dirfd, &mut buffer) {
             Err(io::Errno::RANGE) => {
                 buffer.reserve(1); // use `Vec` reallocation strategy to grow capacity exponentially
                 buffer.resize(buffer.capacity(), 0_u8);