From ac9fd7dfba24335d09793a55d94ea54039253f62 Mon Sep 17 00:00:00 2001 From: facile pop culture reference Date: Tue, 4 Aug 2026 12:23:14 +0300 Subject: [PATCH] update doctexts and fix a reexport --- src/layout/axis.rs | 15 +++++++++------ src/layout/azimuth.rs | 24 ++++++++++++------------ src/lib.rs | 33 ++------------------------------- src/term.rs | 2 +- 4 files changed, 24 insertions(+), 50 deletions(-) diff --git a/src/layout/axis.rs b/src/layout/axis.rs index 0cb59e9..7d6d6bb 100644 --- a/src/layout/axis.rs +++ b/src/layout/axis.rs @@ -57,7 +57,7 @@ def_layout_modifier!( Self::WH(item, w, h) => (item, (*w).into().unwrap_or(h0), (*h).into().unwrap_or(h0)), _ => unreachable!() }; - to.draw(XYWH(x, y, w0, h0), item) + to.draw(XYWH(x, y, w, h), item) } ); @@ -161,12 +161,15 @@ def_layout_modifier!( /// /// ``` /// # fn doctest_layout_full () -> Result<(), Box> { -/// use tengri::{Layout, Draw, XYWH}; +/// use tengri::{Layout, Draw, XYWH, Tui, Perhaps, Screen}; /// let area = XYWH(0u16, 0, 80, 25); -/// assert_eq!("1".layout(area)?, Some(XYWH(0u16, 0, 1, 1))); -/// assert_eq!("1".full_w().layout(area)?, Some(XYWH(0u16, 0, 80, 1))); -/// assert_eq!("1".full_h().layout(area)?, Some(XYWH(0u16, 0, 1, 25))); -/// assert_eq!("1".full_wh().layout(area)?, Some(XYWH(0u16, 0, 80, 25))); +/// assert_eq!(layout("1")?, Some(XYWH(0u16, 0, 1, 1))); +/// assert_eq!(layout("1".full_w())?, Some(XYWH(0u16, 0, 80, 1))); +/// assert_eq!(layout("1".full_h())?, Some(XYWH(0u16, 0, 1, 25))); +/// assert_eq!(layout("1".full_wh())?, Some(XYWH(0u16, 0, 80, 25))); +/// fn layout (t: impl Draw) -> Perhaps> { +/// Tui::Layout(XYWH(0u16, 0, 80, 25)).size(None, t) +/// } /// # Ok(()) } /// ``` pub enum Full> { diff --git a/src/layout/azimuth.rs b/src/layout/azimuth.rs index ce72b95..ac749b8 100644 --- a/src/layout/azimuth.rs +++ b/src/layout/azimuth.rs @@ -181,12 +181,12 @@ impl Split { /// ``` /// use tengri::*; - /// let _ = Split::Above.stack("", ""); - /// let _ = Split::Below.stack("", ""); - /// let _ = Split::North.stack("", ""); - /// let _ = Split::South.stack("", ""); - /// let _ = Split::East.stack("", ""); - /// let _ = Split::West.stack("", ""); + /// let _ = Split::Above.stack(&"", &""); + /// let _ = Split::Below.stack(&"", &""); + /// let _ = Split::North.stack(&"", &""); + /// let _ = Split::South.stack(&"", &""); + /// let _ = Split::East.stack(&"", &""); + /// let _ = Split::West.stack(&"", &""); /// ``` pub const fn stack , B: Draw> (&self, a: A, b: B) -> impl Draw { Pair(*self, a, b, PhantomData) @@ -194,12 +194,12 @@ impl Split { /// ``` /// use tengri::*; - /// let _ = Split::Above.half("", ""); - /// let _ = Split::Below.half("", ""); - /// let _ = Split::North.half("", ""); - /// let _ = Split::South.half("", ""); - /// let _ = Split::East.half("", ""); - /// let _ = Split::West.half("", ""); + /// let _ = Split::Above.half(&"", &""); + /// let _ = Split::Below.half(&"", &""); + /// let _ = Split::North.half(&"", &""); + /// let _ = Split::South.half(&"", &""); + /// let _ = Split::East.half(&"", &""); + /// let _ = Split::West.half(&"", &""); /// ``` pub const fn half , B: Draw> (&self, a: &A, b: &B) -> impl Draw { draw(move|to: &mut S|{ diff --git a/src/lib.rs b/src/lib.rs index 036b573..119bd52 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -349,7 +349,7 @@ macro_rules! eval_xy ( #[cfg(feature = "sing")] pub use self::sing::*; #[cfg(feature = "sing")] mod sing { use crate::{*, time::PerfModel}; - pub use ::jack::{*, contrib::{TimebaseInfo, ClosureProcessHandler, Position as JackPosition}}; + pub use ::jack::{*, contrib::{TimebaseInfo, ClosureProcessHandler, PositionBBT, Position as JackPosition}}; pub use ::midly::{Smf, TrackEventKind, MidiMessage, Error as MidiError, num::*, live::*}; use ConnectName::*; use ConnectScope::*; @@ -1349,36 +1349,7 @@ macro_rules! eval_xy ( use Azimuth::*; use Split::*; - /// Output target. - /// - /// ``` - /// use tengri::*; - /// struct TestOut { w: u16, h: u16 }; - /// impl Wide for TestOut {} - /// impl Tall for TestOut {} - /// impl Xy for TestOut { - /// fn x (&self) -> u16 { 0 } - /// fn y (&self) -> u16 { 0 } - /// } - /// impl Screen for TestOut { - /// type Unit = u16; - /// fn area (&self) -> XYWH { - /// Default::default() - /// } - /// fn draw ( - /// &mut self, - /// area: impl Into>>, - /// draw: Draw - /// ) -> Perhaps> { - /// draw.draw(self) - /// } - /// } - /// - /// impl_draw!(|self: String, to: TestOut|{ - /// to.w = self.len() as u16; - /// Ok(None) - /// }); - /// ``` + /// Output target. See [Tui] for example implementation. pub trait Screen: Xy + Wh + Send + Sync + Sized { type Unit: Coord; /// Get current clipping area diff --git a/src/term.rs b/src/term.rs index 86617db..9a66b5d 100644 --- a/src/term.rs +++ b/src/term.rs @@ -302,7 +302,7 @@ impl Tui { /// Ok(None), /// Err("fail".into()), /// ] { - /// let _ = tengri::Tui::catcher(variant); + /// let _ = tengri::Tui::catcher(&variant); /// } /// ``` pub fn catcher > (result: &Usually) -> impl Draw {