diff --git a/src/base/component/block.rs b/src/base/component/block.rs index dbd76eb8..30b0181d 100644 --- a/src/base/component/block.rs +++ b/src/base/component/block.rs @@ -22,7 +22,7 @@ impl ComponentTrait for Block { fn setup_before_prepare(&mut self, _cx: &mut Context) { self.alter_classes( ClassesOp::Prepend, - [String::from("block__container"), self.style().to_string()].join(" "), + ["block__container".to_string(), self.style().to_string()].join(" "), ); } diff --git a/src/base/component/button.rs b/src/base/component/button.rs index 865a583f..b97a2671 100644 --- a/src/base/component/button.rs +++ b/src/base/component/button.rs @@ -37,7 +37,7 @@ impl ComponentTrait for Button { self.alter_classes( ClassesOp::Prepend, [ - String::from("button__tap"), + "button__tap".to_string(), self.style().to_string(), self.font_size().to_string(), ] diff --git a/src/base/component/flex/container.rs b/src/base/component/flex/container.rs index 46a0b696..7bf5ac62 100644 --- a/src/base/component/flex/container.rs +++ b/src/base/component/flex/container.rs @@ -38,7 +38,7 @@ impl ComponentTrait for Container { self.alter_classes( ClassesOp::Prepend, [ - String::from("flex__container"), + "flex__container".to_string(), self.direction().to_string(), self.wrap().to_string(), self.justify().to_string(), diff --git a/src/base/component/flex/item.rs b/src/base/component/flex/item.rs index 680ab2e8..532e4e96 100644 --- a/src/base/component/flex/item.rs +++ b/src/base/component/flex/item.rs @@ -36,7 +36,7 @@ impl ComponentTrait for Item { self.alter_classes( ClassesOp::Prepend, [ - String::from("flex__item"), + "flex__item".to_string(), self.grow().to_string(), self.shrink().to_string(), self.size().to_string(), diff --git a/src/base/component/form/action_button.rs b/src/base/component/form/action_button.rs index 72a75554..e0cf2eb0 100644 --- a/src/base/component/form/action_button.rs +++ b/src/base/component/form/action_button.rs @@ -41,7 +41,7 @@ impl ComponentTrait for ActionButton { self.alter_classes( ClassesOp::Prepend, [ - String::from("button__tap"), + "button__tap".to_string(), self.style().to_string(), self.font_size().to_string(), ] diff --git a/src/util.rs b/src/util.rs index 12a0cb37..4f63f0f9 100644 --- a/src/util.rs +++ b/src/util.rs @@ -59,7 +59,7 @@ impl TypeInfo { .get(if start >= 0 { start as usize } else { - segments.len() - start.abs() as usize + segments.len() - start.unsigned_abs() }) .map_or(0, |&(s, _)| s); @@ -69,7 +69,7 @@ impl TypeInfo { if end >= 0 { end as usize } else { - segments.len() - end.abs() as usize + segments.len() - end.unsigned_abs() } } else { segments.len() - 1