Small fixes

kas-gui · Mar 10, 2022 · 2c8974f · 2c8974f
1 parent fb3e040
commit 2c8974f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/crates/kas-core/src/theme/draw.rs b/crates/kas-core/src/theme/draw.rs
@@ -331,12 +331,11 @@ impl<'a> std::ops::BitOrAssign<TkAction> for DrawMgr<'a> {
 #[cfg_attr(not(feature = "internal_doc"), doc(hidden))]
 #[cfg_attr(doc_cfg, doc(cfg(internal_doc)))]
 #[autoimpl(for<H: trait + ?Sized> Box<H>)]
-#[cfg(feature = "stack_dst")]
-#[autoimpl(
+#[cfg_attr(feature = "stack_dst", autoimpl(
     for<'a, S: Default + Copy + AsRef<[usize]> + AsMut<[usize]>>
     stack_dst::ValueA<dyn DrawHandle + 'a, S>
     using dyn DrawHandle
-)]
+))]
 pub trait DrawHandle {
     /// Access components: [`SizeHandle`], [`DrawShared`], [`EventState`]
     fn components(&mut self) -> (&dyn SizeHandle, &mut dyn DrawShared, &mut EventState);

diff --git a/crates/kas-core/src/theme/size.rs b/crates/kas-core/src/theme/size.rs
@@ -12,9 +12,10 @@ use super::DrawMgr;
 use super::{FrameStyle, TextClass};
 use crate::geom::Size;
 use crate::layout::{AxisInfo, FrameRules, Margins, SizeRules};
+use crate::macros::autoimpl;
 use crate::text::TextApi;
+
 // for doc use
-use crate::macros::autoimpl;
 #[allow(unused)]
 use crate::text::TextApiExt;
 

diff --git a/crates/kas-core/src/updatable/data_traits.rs b/crates/kas-core/src/updatable/data_traits.rs
@@ -16,8 +16,7 @@ use std::fmt::Debug;
 /// Trait for viewable single data items
 // Note: we require Debug + 'static to allow widgets using this to implement
 // WidgetCore, which requires Debug + Any.
-#[autoimpl(for<T: trait + ?Sized> &T, &mut T)]
-#[autoimpl(for<T: trait + ?Sized> std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
+#[autoimpl(for<T: trait + ?Sized> &T, &mut T, std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
 pub trait SingleData: Debug {
     /// Output type
     type Item: Clone;
@@ -76,8 +75,7 @@ pub trait SingleDataMut: SingleData {
 
 /// Trait for viewable data lists
 #[allow(clippy::len_without_is_empty)]
-#[autoimpl(for<T: trait + ?Sized> &T, &mut T)]
-#[autoimpl(for<T: trait + ?Sized> std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
+#[autoimpl(for<T: trait + ?Sized> &T, &mut T, std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
 pub trait ListData: Debug {
     /// Key type
     type Key: Clone + Debug + PartialEq + Eq;
@@ -177,8 +175,7 @@ pub trait ListDataMut: ListData {
 /// Trait for viewable data matrices
 ///
 /// Data matrices are a kind of table where each cell has the same type.
-#[autoimpl(for<T: trait + ?Sized> &T, &mut T)]
-#[autoimpl(for<T: trait + ?Sized> std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
+#[autoimpl(for<T: trait + ?Sized> &T, &mut T, std::rc::Rc<T>, std::sync::Arc<T>, Box<T>)]
 pub trait MatrixData: Debug {
     /// Column key type
     type ColKey: Clone + Debug + PartialEq + Eq;