summaryrefslogtreecommitdiffstats
path: root/style/src
diff options
context:
space:
mode:
Diffstat (limited to 'style/src')
-rw-r--r--style/src/button.rs10
-rw-r--r--style/src/checkbox.rs10
-rw-r--r--style/src/container.rs10
-rw-r--r--style/src/pane_grid.rs10
-rw-r--r--style/src/pick_list.rs6
-rw-r--r--style/src/progress_bar.rs6
-rw-r--r--style/src/radio.rs10
-rw-r--r--style/src/rule.rs7
-rw-r--r--style/src/scrollable.rs10
-rw-r--r--style/src/slider.rs10
-rw-r--r--style/src/text_input.rs10
-rw-r--r--style/src/toggler.rs6
12 files changed, 52 insertions, 53 deletions
diff --git a/style/src/button.rs b/style/src/button.rs
index 2281e32f..de2de4f4 100644
--- a/style/src/button.rs
+++ b/style/src/button.rs
@@ -80,17 +80,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/checkbox.rs b/style/src/checkbox.rs
index 566136bb..f8bc6241 100644
--- a/style/src/checkbox.rs
+++ b/style/src/checkbox.rs
@@ -39,17 +39,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/container.rs b/style/src/container.rs
index 1ce6a7ca..2f411611 100644
--- a/style/src/container.rs
+++ b/style/src/container.rs
@@ -43,17 +43,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs
index e39ee797..a12ac3f5 100644
--- a/style/src/pane_grid.rs
+++ b/style/src/pane_grid.rs
@@ -35,17 +35,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/pick_list.rs b/style/src/pick_list.rs
index d1801e5f..ad96b201 100644
--- a/style/src/pick_list.rs
+++ b/style/src/pick_list.rs
@@ -56,15 +56,15 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: 'a + StyleSheet,
{
fn from(style: T) -> Self {
Box::new(style)
diff --git a/style/src/progress_bar.rs b/style/src/progress_bar.rs
index d0878c84..a0195c7a 100644
--- a/style/src/progress_bar.rs
+++ b/style/src/progress_bar.rs
@@ -26,15 +26,15 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: 'a + StyleSheet,
{
fn from(style: T) -> Self {
Box::new(style)
diff --git a/style/src/radio.rs b/style/src/radio.rs
index c41b70c0..6fb1cb6c 100644
--- a/style/src/radio.rs
+++ b/style/src/radio.rs
@@ -37,17 +37,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/rule.rs b/style/src/rule.rs
index 221f48fb..12a40f7d 100644
--- a/style/src/rule.rs
+++ b/style/src/rule.rs
@@ -1,5 +1,4 @@
//! Display a horizontal or vertical rule for dividing content.
-
use iced_core::Color;
/// The fill mode of a rule.
@@ -104,15 +103,15 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: 'a + StyleSheet,
{
fn from(style: T) -> Self {
Box::new(style)
diff --git a/style/src/scrollable.rs b/style/src/scrollable.rs
index 65da9803..748ba888 100644
--- a/style/src/scrollable.rs
+++ b/style/src/scrollable.rs
@@ -60,17 +60,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/slider.rs b/style/src/slider.rs
index 9148fcbe..1bb28b09 100644
--- a/style/src/slider.rs
+++ b/style/src/slider.rs
@@ -79,17 +79,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/text_input.rs b/style/src/text_input.rs
index 19acea65..3d5817cc 100644
--- a/style/src/text_input.rs
+++ b/style/src/text_input.rs
@@ -73,17 +73,17 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: StyleSheet + 'a,
{
- fn from(style: T) -> Self {
- Box::new(style)
+ fn from(style_sheet: T) -> Self {
+ Box::new(style_sheet)
}
}
diff --git a/style/src/toggler.rs b/style/src/toggler.rs
index 5a155123..c06a8cd1 100644
--- a/style/src/toggler.rs
+++ b/style/src/toggler.rs
@@ -41,15 +41,15 @@ impl StyleSheet for Default {
}
}
-impl std::default::Default for Box<dyn StyleSheet> {
+impl<'a> std::default::Default for Box<dyn StyleSheet + 'a> {
fn default() -> Self {
Box::new(Default)
}
}
-impl<T> From<T> for Box<dyn StyleSheet>
+impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where
- T: 'static + StyleSheet,
+ T: 'a + StyleSheet,
{
fn from(style: T) -> Self {
Box::new(style)
generated by cgit (git 2.34.1) at 2025-04-15 23:25:31 +0000