dsl,input,output,proc,tui: fix warnings

This commit is contained in:
🪞👃🪞 2025-06-12 19:29:12 +03:00
parent 08593571fa
commit 21832453d9
13 changed files with 19 additions and 20 deletions

View file

@ -1,6 +1,5 @@
use crate::*; use crate::*;
use std::sync::Arc; use std::sync::Arc;
use std::borrow::Cow;
#[derive(Debug, Clone, Default, PartialEq)] #[derive(Debug, Clone, Default, PartialEq)]
pub struct Ast(pub Value<Arc<str>, AstIter>); pub struct Ast(pub Value<Arc<str>, AstIter>);

View file

@ -1,5 +1,5 @@
use crate::*; use crate::*;
use std::fmt::{Debug, Display, Formatter, Error as FormatError}; use std::fmt::{Display, Formatter, Error as FormatError};
impl Display for Ast { impl Display for Ast {
fn fmt (&self, out: &mut Formatter) -> Result<(), FormatError> { fn fmt (&self, out: &mut Formatter) -> Result<(), FormatError> {
use Value::*; use Value::*;

View file

@ -73,12 +73,12 @@ impl<S: Clone, X: Clone,> Clone for Value<S, X> {
} }
impl<S: Copy, X: Copy,> Copy for Value<S, X> {} impl<S: Copy, X: Copy,> Copy for Value<S, X> {}
impl<S: Debug, X: Debug,> Debug for Value<S, X> { impl<S: Debug, X: Debug,> Debug for Value<S, X> {
fn fmt (&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { fn fmt (&self, _f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
todo!() todo!()
} }
} }
impl<S: Display, X: Display,> Display for Value<S, X> { impl<S: Display, X: Display,> Display for Value<S, X> {
fn fmt (&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { fn fmt (&self, _f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
todo!() todo!()
} }
} }

View file

@ -42,7 +42,7 @@ pub(crate) use thiserror::Error;
pub(crate) use self::DslError::*; pub(crate) use self::DslError::*;
mod dsl_ast; pub use self::dsl_ast::*; mod dsl_ast; pub use self::dsl_ast::*;
mod dsl_cst; pub use self::dsl_cst::*; mod dsl_cst; pub use self::dsl_cst::*;
mod dsl_display; pub use self::dsl_display::*; mod dsl_display; //pub use self::dsl_display::*;
mod dsl_domain; pub use self::dsl_domain::*; mod dsl_domain; pub use self::dsl_domain::*;
mod dsl_error; pub use self::dsl_error::*; mod dsl_error; pub use self::dsl_error::*;
mod dsl_iter; pub use self::dsl_iter::*; mod dsl_iter; pub use self::dsl_iter::*;

View file

@ -1,5 +1,5 @@
use crate::*; use crate::*;
use std::marker::PhantomData; //use std::marker::PhantomData;
use std::fmt::Debug; use std::fmt::Debug;
#[derive(Default, Debug)] pub struct InputLayers(Vec<InputLayer>); #[derive(Default, Debug)] pub struct InputLayers(Vec<InputLayer>);

View file

@ -53,7 +53,7 @@ mod map; pub use self::map::*;
mod memo; pub use self::memo::*; mod memo; pub use self::memo::*;
mod stack; pub use self::stack::*; mod stack; pub use self::stack::*;
mod thunk; pub use self::thunk::*; mod thunk; pub use self::thunk::*;
mod transform; pub use self::transform::*; mod transform; //pub use self::transform::*;
/// Renders multiple things on top of each other, /// Renders multiple things on top of each other,
#[macro_export] macro_rules! lay { #[macro_export] macro_rules! lay {

View file

@ -1,4 +1,4 @@
use crate::*; //use crate::*;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
#[derive(Debug, Default)] pub struct Memo<T, U> { #[derive(Debug, Default)] pub struct Memo<T, U> {

View file

@ -24,7 +24,7 @@ impl<E, F> Stack<E, F> {
} }
} }
impl<E: Output, F: Fn(&mut dyn FnMut(&dyn Render<E>)->())->()> Content<E> for Stack<E, F> { impl<E: Output, F: Fn(&mut dyn FnMut(&dyn Render<E>)->())->()> Content<E> for Stack<E, F> {
fn layout (&self, mut to: E::Area) -> E::Area { fn layout (&self, to: E::Area) -> E::Area {
let mut x = to.x(); let mut x = to.x();
let mut y = to.y(); let mut y = to.y();
let (mut w_used, mut w_remaining) = (E::Unit::zero(), to.w()); let (mut w_used, mut w_remaining) = (E::Unit::zero(), to.w());

View file

@ -73,16 +73,16 @@ impl ToTokens for CommandDef {
out out
}); });
let matchers = exposed.values().map(|arm|{ let _matchers = exposed.values().map(|arm|{
let key = LitStr::new(&arm.to_key(), Span::call_site()); let key = LitStr::new(&arm.to_key(), Span::call_site());
let variant = { let variant = {
let mut out = TokenStream2::new(); let mut out = TokenStream2::new();
out.append(arm.to_enum_variant_ident()); out.append(arm.to_enum_variant_ident());
let ident = &arm.0; let _ident = &arm.0;
if arm.has_args() { if arm.has_args() {
out.append(Group::new(Delimiter::Brace, { out.append(Group::new(Delimiter::Brace, {
let mut out = TokenStream2::new(); let mut out = TokenStream2::new();
for (arg, ty) in arm.args() { for (arg, _ty) in arm.args() {
write_quote_to(&mut out, quote! { write_quote_to(&mut out, quote! {
#arg: Take::take_or_fail(self, words)?, #arg: Take::take_or_fail(self, words)?,
}); });
@ -193,7 +193,7 @@ impl CommandArm {
unreachable!("only typed args should be present at this position"); unreachable!("only typed args should be present at this position");
}) })
} }
fn to_enum_variant_def (&self) -> TokenStream2 { fn _to_enum_variant_def (&self) -> TokenStream2 {
let mut out = TokenStream2::new(); let mut out = TokenStream2::new();
out.append(self.to_enum_variant_ident()); out.append(self.to_enum_variant_ident());
//let ident = &self.0; //let ident = &self.0;

View file

@ -79,11 +79,11 @@ impl ToTokens for ViewDef {
} }
} }
fn builtins_with_holes () -> impl Iterator<Item=TokenStream2> { fn _builtins_with_holes () -> impl Iterator<Item=TokenStream2> {
builtins_with(quote! { _ }, quote! { _ }) builtins_with(quote! { _ }, quote! { _ })
} }
fn builtins_with_boxes () -> impl Iterator<Item=TokenStream2> { fn _builtins_with_boxes () -> impl Iterator<Item=TokenStream2> {
builtins_with(quote! { _ }, quote! { Box<dyn Render<_>> }) builtins_with(quote! { _ }, quote! { Box<dyn Render<_>> })
} }

View file

@ -13,12 +13,12 @@ macro_rules! impl_content_layout_render {
} }
mod tui_border; pub use self::tui_border::*; mod tui_border; pub use self::tui_border::*;
mod tui_button; pub use self::tui_button::*; mod tui_button; //pub use self::tui_button::*;
mod tui_color; pub use self::tui_color::*; mod tui_color; pub use self::tui_color::*;
mod tui_field; pub use self::tui_field::*; mod tui_field; pub use self::tui_field::*;
mod tui_phat; pub use self::tui_phat::*; mod tui_phat; pub use self::tui_phat::*;
mod tui_repeat; pub use self::tui_repeat::*; mod tui_repeat; pub use self::tui_repeat::*;
mod tui_number; pub use self::tui_number::*; mod tui_number; //pub use self::tui_number::*;
mod tui_scroll; pub use self::tui_scroll::*; mod tui_scroll; pub use self::tui_scroll::*;
mod tui_string; pub use self::tui_string::*; mod tui_string; pub use self::tui_string::*;
mod tui_style; pub use self::tui_style::*; mod tui_style; pub use self::tui_style::*;

View file

@ -1 +1 @@
use crate::{*, Color::*}; //use crate::{*, Color::*};

View file

@ -3,7 +3,7 @@ use crate::*;
pub struct FieldH<T, U>(pub ItemTheme, pub T, pub U); pub struct FieldH<T, U>(pub ItemTheme, pub T, pub U);
impl<T: Content<TuiOut>, U: Content<TuiOut>> Content<TuiOut> for FieldH<T, U> { impl<T: Content<TuiOut>, U: Content<TuiOut>> Content<TuiOut> for FieldH<T, U> {
fn content (&self) -> impl Render<TuiOut> { fn content (&self) -> impl Render<TuiOut> {
let Self(ItemTheme { darkest, dark, lighter, lightest, .. }, title, value) = self; let Self(ItemTheme { darkest, dark, lightest, .. }, title, value) = self;
row!( row!(
Tui::fg_bg(dark.rgb, darkest.rgb, ""), Tui::fg_bg(dark.rgb, darkest.rgb, ""),
Tui::fg_bg(lightest.rgb, dark.rgb, title), Tui::fg_bg(lightest.rgb, dark.rgb, title),
@ -16,7 +16,7 @@ impl<T: Content<TuiOut>, U: Content<TuiOut>> Content<TuiOut> for FieldH<T, U> {
pub struct FieldV<T, U>(pub ItemTheme, pub T, pub U); pub struct FieldV<T, U>(pub ItemTheme, pub T, pub U);
impl<T: Content<TuiOut>, U: Content<TuiOut>> Content<TuiOut> for FieldV<T, U> { impl<T: Content<TuiOut>, U: Content<TuiOut>> Content<TuiOut> for FieldV<T, U> {
fn content (&self) -> impl Render<TuiOut> { fn content (&self) -> impl Render<TuiOut> {
let Self(ItemTheme { darkest, dark, lighter, lightest, .. }, title, value) = self; let Self(ItemTheme { darkest, dark, lightest, .. }, title, value) = self;
Bsp::n( Bsp::n(
Align::w(Tui::bg(darkest.rgb, Tui::fg(lightest.rgb, Tui::bold(true, value)))), Align::w(Tui::bg(darkest.rgb, Tui::fg(lightest.rgb, Tui::bold(true, value)))),
Fill::x(Align::w(row!( Fill::x(Align::w(row!(