diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-12-08 19:28:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-08 19:28:25 +0000 |
| commit | 2e2fc0754dd2d1a1469b05b3b26a6b704ab5b6a6 (patch) | |
| tree | 5eac0e2b3f209892c8ebbbdb3c3bf5dea9c8b696 | |
| parent | fa7adee5dc9915621f3962367efb0c2c2abaee74 (diff) | |
| parent | 68ca71e4407d4eaaf1af5595314a9b33f4523487 (diff) | |
| download | nix-2e2fc0754dd2d1a1469b05b3b26a6b704ab5b6a6.tar.gz | |
Use from_bits_retain for all Termios wrapper fields. am: c7abcf1bf0 am: 474a9e7741 am: 68ca71e440
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2864705
Change-Id: I71768accf9c25322a01fd51cfbb83f5108c17289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/sys/termios.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sys/termios.rs b/src/sys/termios.rs index ecaa3ea..74c5fc5 100644 --- a/src/sys/termios.rs +++ b/src/sys/termios.rs @@ -307,10 +307,10 @@ impl Termios { /// Updates the wrapper values from the internal `libc::termios` data structure. pub(crate) fn update_wrapper(&mut self) { let termios = *self.inner.borrow_mut(); - self.input_flags = InputFlags::from_bits_truncate(termios.c_iflag); - self.output_flags = OutputFlags::from_bits_truncate(termios.c_oflag); + self.input_flags = InputFlags::from_bits_retain(termios.c_iflag); + self.output_flags = OutputFlags::from_bits_retain(termios.c_oflag); self.control_flags = ControlFlags::from_bits_retain(termios.c_cflag); - self.local_flags = LocalFlags::from_bits_truncate(termios.c_lflag); + self.local_flags = LocalFlags::from_bits_retain(termios.c_lflag); self.control_chars = termios.c_cc; #[cfg(any( target_os = "linux", @@ -327,10 +327,10 @@ impl From<libc::termios> for Termios { fn from(termios: libc::termios) -> Self { Termios { inner: RefCell::new(termios), - input_flags: InputFlags::from_bits_truncate(termios.c_iflag), - output_flags: OutputFlags::from_bits_truncate(termios.c_oflag), - control_flags: ControlFlags::from_bits_truncate(termios.c_cflag), - local_flags: LocalFlags::from_bits_truncate(termios.c_lflag), + input_flags: InputFlags::from_bits_retain(termios.c_iflag), + output_flags: OutputFlags::from_bits_retain(termios.c_oflag), + control_flags: ControlFlags::from_bits_retain(termios.c_cflag), + local_flags: LocalFlags::from_bits_retain(termios.c_lflag), control_chars: termios.c_cc, #[cfg(any( target_os = "linux", |