diff --git a/src/lib.rs b/src/lib.rs index 15ce0e3..9cc2b10 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ #![warn(clippy::all, clippy::pedantic)] -pub mod os; pub mod ansi; +pub mod os; diff --git a/src/os/unix.rs b/src/os/unix.rs index 1a247e4..9adfc7a 100644 --- a/src/os/unix.rs +++ b/src/os/unix.rs @@ -46,7 +46,8 @@ struct Termios { cc: [u8; NCCS], } -#[must_use] pub fn is_terminal() -> bool { +#[must_use] +pub fn is_terminal() -> bool { unsafe { isatty(1) != 0 } } @@ -85,14 +86,14 @@ pub fn disable_raw_mode() -> io::Result<()> { fn get_attributes(fd: c_int, termios: &mut Termios) -> io::Result<()> { if unsafe { tcgetattr(fd, &raw mut *termios) } != 0 { - return Err(io::Error::last_os_error()) + return Err(io::Error::last_os_error()); } Ok(()) } fn set_attributes(fd: c_int, termios: &mut Termios) -> io::Result<()> { if unsafe { tcsetattr(fd, 0, std::ptr::from_mut(termios)) } != 0 { - return Err(io::Error::last_os_error()) + return Err(io::Error::last_os_error()); } Ok(()) } diff --git a/src/os/windows.rs b/src/os/windows.rs index 1d934d2..c51c702 100644 --- a/src/os/windows.rs +++ b/src/os/windows.rs @@ -9,7 +9,7 @@ const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 4; const ENABLE_ECHO_INPUT: u32 = 4; const ENABLE_LINE_INPUT: u32 = 2; const ENABLE_PROCESSED_INPUT: u32 = 1; -const INVALID_HANDLE_VALUE: usize = usize::MAX-1; +const INVALID_HANDLE_VALUE: usize = usize::MAX - 1; unsafe extern "system" { fn GetStdHandle(nStdHandle: u32) -> usize; @@ -43,7 +43,7 @@ pub fn is_terminal() -> bool { Ok(handle) => { let mut dwMode = 0; return unsafe { GetConsoleMode(handle, &mut dwMode) != 0 }; - }, + } _ => false, } } diff --git a/test.c b/test.c deleted file mode 100644 index 9ad847f..0000000 --- a/test.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include - -int main() { - printf("ECHO: 0x%x\n", ECHO); - printf("ICANON: 0x%x\n", ICANON); - printf("ISIG: 0x%x\n", ISIG); - - printf("\nNCCS: 0x%x\n", NCCS); - printf("TIOCFWINSZ: 0x%x\n", TIOCGWINSZ); - return 0; -} diff --git a/test.o b/test.o deleted file mode 100755 index ffe01e3..0000000 Binary files a/test.o and /dev/null differ