mirror of
https://github.com/ratatui-org/ratatui
synced 2024-11-10 07:04:17 +00:00
fix: formatting and clippy
This commit is contained in:
parent
f20c9751c4
commit
458b7b7bd2
3 changed files with 15 additions and 25 deletions
|
@ -50,6 +50,7 @@ unicode-width = "0.1.13"
|
|||
anyhow = "1.0.71"
|
||||
argh = "0.1.12"
|
||||
better-panic = "0.3.0"
|
||||
color-eyre = "0.6.2"
|
||||
criterion = { version = "0.5.1", features = ["html_reports"] }
|
||||
derive_builder = "0.20.0"
|
||||
fakeit = "1.1"
|
||||
|
|
|
@ -92,7 +92,6 @@ struct ColorsWidget {
|
|||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
install_error_hooks()?;
|
||||
let terminal = CrosstermBackend::stdout_with_defaults()?.to_terminal()?;
|
||||
App::default().run(terminal)?;
|
||||
Ok(())
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
//! the [Crossterm] crate to interact with the terminal.
|
||||
//!
|
||||
//! [Crossterm]: https://crates.io/crates/crossterm
|
||||
use std::io::{self, Write};
|
||||
use std::io;
|
||||
|
||||
#[cfg(feature = "underline-color")]
|
||||
use crate::crossterm::style::SetUnderlineColor;
|
||||
|
@ -88,7 +88,7 @@ use crate::{
|
|||
/// [Examples]: https://github.com/ratatui-org/ratatui/tree/main/examples/README.md
|
||||
#[derive(Debug, Default, Clone, Eq, PartialEq, Hash)]
|
||||
#[allow(clippy::struct_excessive_bools)]
|
||||
pub struct CrosstermBackend<W: Write> {
|
||||
pub struct CrosstermBackend<W: io::Write> {
|
||||
/// The writer used to send commands to the terminal.
|
||||
writer: W,
|
||||
restore_raw_mode_on_drop: bool,
|
||||
|
@ -99,10 +99,7 @@ pub struct CrosstermBackend<W: Write> {
|
|||
restore_keyboard_enhancement_flags_on_drop: bool,
|
||||
}
|
||||
|
||||
impl<W> CrosstermBackend<W>
|
||||
where
|
||||
W: Write,
|
||||
{
|
||||
impl<W: io::Write> CrosstermBackend<W> {
|
||||
/// Creates a new `CrosstermBackend` with the given writer.
|
||||
///
|
||||
/// Applications will typically use [`CrosstermBackend::stdout`] or [`CrosstermBackend::stderr`]
|
||||
|
@ -219,7 +216,7 @@ impl CrosstermBackend<io::Stderr> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<W: Write> CrosstermBackend<W> {
|
||||
impl<W: io::Write> CrosstermBackend<W> {
|
||||
/// Enables default settings for the terminal backend.
|
||||
///
|
||||
/// This enables raw mode and switches to the alternate screen. Mouse support is not enabled.
|
||||
|
@ -238,12 +235,12 @@ impl<W: Write> CrosstermBackend<W> {
|
|||
/// let backend = CrosstermBackend::stdout().with_defaults()?;
|
||||
/// # std::io::Result::Ok(())
|
||||
/// ```
|
||||
pub fn with_defaults(mut self) -> io::Result<Self> {
|
||||
pub fn with_defaults(self) -> io::Result<Self> {
|
||||
let backend = self.with_raw_mode()?.with_alternate_screen()?;
|
||||
#[cfg(feature = "color-eyre")]
|
||||
let backend = backend.with_color_eyre_hooks()?;
|
||||
#[cfg(not(feature = "color-eyre"))]
|
||||
let backend = backend.with_panic_hook()?;
|
||||
let backend = backend.with_panic_hook();
|
||||
Ok(backend)
|
||||
}
|
||||
|
||||
|
@ -376,7 +373,8 @@ impl<W: Write> CrosstermBackend<W> {
|
|||
/// let backend = CrosstermBackend::stdout().with_panic_hook()?;
|
||||
/// ```
|
||||
#[cfg(not(feature = "color-eyre"))]
|
||||
pub fn with_panic_hook(self) -> io::Result<Self> {
|
||||
#[must_use]
|
||||
pub fn with_panic_hook(self) -> Self {
|
||||
use std::panic;
|
||||
|
||||
let hook = panic::take_hook();
|
||||
|
@ -384,7 +382,7 @@ impl<W: Write> CrosstermBackend<W> {
|
|||
let _ = CrosstermBackend::reset(io::stderr());
|
||||
hook(info);
|
||||
}));
|
||||
Ok(self)
|
||||
self
|
||||
}
|
||||
|
||||
/// Installs the color-eyre panic and error report hooks.
|
||||
|
@ -397,6 +395,7 @@ impl<W: Write> CrosstermBackend<W> {
|
|||
/// use ratatui::backend::CrosstermBackend;
|
||||
///
|
||||
/// let backend = CrosstermBackend::stdout().with_color_eyre_hooks()?;
|
||||
/// # std::io::Result::Ok(())
|
||||
/// ```
|
||||
#[cfg(feature = "color-eyre")]
|
||||
pub fn with_color_eyre_hooks(self) -> io::Result<Self> {
|
||||
|
@ -455,7 +454,7 @@ impl<W: Write> CrosstermBackend<W> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<W: Write> Drop for CrosstermBackend<W> {
|
||||
impl<W: io::Write> Drop for CrosstermBackend<W> {
|
||||
fn drop(&mut self) {
|
||||
// note that these are not checked for errors because there is nothing that can be done if
|
||||
// they fail. The terminal is likely in a bad state, and the application is exiting anyway.
|
||||
|
@ -481,10 +480,7 @@ impl<W: Write> Drop for CrosstermBackend<W> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<W> Write for CrosstermBackend<W>
|
||||
where
|
||||
W: Write,
|
||||
{
|
||||
impl<W: io::Write> io::Write for CrosstermBackend<W> {
|
||||
/// Writes a buffer of bytes to the underlying buffer.
|
||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||
self.writer.write(buf)
|
||||
|
@ -496,10 +492,7 @@ where
|
|||
}
|
||||
}
|
||||
|
||||
impl<W> Backend for CrosstermBackend<W>
|
||||
where
|
||||
W: Write,
|
||||
{
|
||||
impl<W: io::Write> Backend for CrosstermBackend<W> {
|
||||
fn draw<'a, I>(&mut self, content: I) -> io::Result<()>
|
||||
where
|
||||
I: Iterator<Item = (u16, u16, &'a Cell)>,
|
||||
|
@ -687,10 +680,7 @@ struct ModifierDiff {
|
|||
}
|
||||
|
||||
impl ModifierDiff {
|
||||
fn queue<W>(self, mut w: W) -> io::Result<()>
|
||||
where
|
||||
W: io::Write,
|
||||
{
|
||||
fn queue<W: io::Write>(self, mut w: W) -> io::Result<()> {
|
||||
let removed = self.from - self.to;
|
||||
if removed.contains(Modifier::REVERSED) {
|
||||
queue!(w, SetAttribute(CAttribute::NoReverse))?;
|
||||
|
|
Loading…
Reference in a new issue