Make many functions const

The point is to set up repeated components or boilerplate before their
use sites.

The majority of these make sense as `const`. However, some functions
such as those regarding state may not make sense as `const`.
This commit is contained in:
Nikolai Vazquez 2019-11-29 21:24:52 -05:00
parent 811d8b90d7
commit 267e242238
16 changed files with 60 additions and 57 deletions

View file

@ -113,8 +113,8 @@ impl State {
/// Creates a new [`State`].
///
/// [`State`]: struct.State.html
pub fn new() -> State {
State::default()
pub const fn new() -> State {
State
}
}

View file

@ -24,7 +24,7 @@ impl<'a, Message> Column<'a, Message> {
/// Creates an empty [`Column`].
///
/// [`Column`]: struct.Column.html
pub fn new() -> Self {
pub const fn new() -> Self {
Column {
spacing: 0,
padding: 0,
@ -42,7 +42,7 @@ impl<'a, Message> Column<'a, Message> {
/// Custom margins per element do not exist in Iced. You should use this
/// method instead! While less flexible, it helps you keep spacing between
/// elements consistent.
pub fn spacing(mut self, units: u16) -> Self {
pub const fn spacing(mut self, units: u16) -> Self {
self.spacing = units;
self
}
@ -50,7 +50,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the padding of the [`Column`].
///
/// [`Column`]: struct.Column.html
pub fn padding(mut self, units: u16) -> Self {
pub const fn padding(mut self, units: u16) -> Self {
self.padding = units;
self
}
@ -58,7 +58,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the width of the [`Column`].
///
/// [`Column`]: struct.Column.html
pub fn width(mut self, width: Length) -> Self {
pub const fn width(mut self, width: Length) -> Self {
self.width = width;
self
}
@ -66,7 +66,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the height of the [`Column`].
///
/// [`Column`]: struct.Column.html
pub fn height(mut self, height: Length) -> Self {
pub const fn height(mut self, height: Length) -> Self {
self.height = height;
self
}
@ -74,7 +74,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the maximum width of the [`Column`].
///
/// [`Column`]: struct.Column.html
pub fn max_width(mut self, max_width: u32) -> Self {
pub const fn max_width(mut self, max_width: u32) -> Self {
self.max_width = max_width;
self
}
@ -82,7 +82,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the maximum height of the [`Column`] in pixels.
///
/// [`Column`]: struct.Column.html
pub fn max_height(mut self, max_height: u32) -> Self {
pub const fn max_height(mut self, max_height: u32) -> Self {
self.max_height = max_height;
self
}
@ -90,7 +90,7 @@ impl<'a, Message> Column<'a, Message> {
/// Sets the horizontal alignment of the contents of the [`Column`] .
///
/// [`Column`]: struct.Column.html
pub fn align_items(mut self, align: Align) -> Self {
pub const fn align_items(mut self, align: Align) -> Self {
self.align_items = align;
self
}

View file

@ -24,7 +24,7 @@ impl<'a, Message> Row<'a, Message> {
/// Creates an empty [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn new() -> Self {
pub const fn new() -> Self {
Row {
spacing: 0,
padding: 0,
@ -42,7 +42,7 @@ impl<'a, Message> Row<'a, Message> {
/// Custom margins per element do not exist in Iced. You should use this
/// method instead! While less flexible, it helps you keep spacing between
/// elements consistent.
pub fn spacing(mut self, units: u16) -> Self {
pub const fn spacing(mut self, units: u16) -> Self {
self.spacing = units;
self
}
@ -50,7 +50,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the padding of the [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn padding(mut self, units: u16) -> Self {
pub const fn padding(mut self, units: u16) -> Self {
self.padding = units;
self
}
@ -58,7 +58,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the width of the [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn width(mut self, width: Length) -> Self {
pub const fn width(mut self, width: Length) -> Self {
self.width = width;
self
}
@ -66,7 +66,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the height of the [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn height(mut self, height: Length) -> Self {
pub const fn height(mut self, height: Length) -> Self {
self.height = height;
self
}
@ -74,7 +74,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the maximum width of the [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn max_width(mut self, max_width: u32) -> Self {
pub const fn max_width(mut self, max_width: u32) -> Self {
self.max_width = max_width;
self
}
@ -82,7 +82,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the maximum height of the [`Row`].
///
/// [`Row`]: struct.Row.html
pub fn max_height(mut self, max_height: u32) -> Self {
pub const fn max_height(mut self, max_height: u32) -> Self {
self.max_height = max_height;
self
}
@ -90,7 +90,7 @@ impl<'a, Message> Row<'a, Message> {
/// Sets the vertical alignment of the contents of the [`Row`] .
///
/// [`Row`]: struct.Row.html
pub fn align_items(mut self, align: Align) -> Self {
pub const fn align_items(mut self, align: Align) -> Self {
self.align_items = align;
self
}

View file

@ -151,7 +151,7 @@ impl State {
/// Creates a new [`State`] with the scrollbar located at the top.
///
/// [`State`]: struct.State.html
pub fn new() -> Self {
State::default()
pub const fn new() -> Self {
State
}
}

View file

@ -147,7 +147,7 @@ impl State {
/// Creates a new [`State`].
///
/// [`State`]: struct.State.html
pub fn new() -> Self {
pub const fn new() -> Self {
Self
}
}

View file

@ -191,7 +191,7 @@ impl State {
/// Creates a new [`State`], representing an unfocused [`TextInput`].
///
/// [`State`]: struct.State.html
pub fn new() -> Self {
Self::default()
pub const fn new() -> Self {
Self
}
}