summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLibravatar Clark Moody <clark@clarkmoody.com>2020-03-31 16:44:02 -0500
committerLibravatar Clark Moody <clark@clarkmoody.com>2020-04-24 15:13:22 -0500
commit7b15e4b0e29c64d53a00fbe6709ff2069630fec5 (patch)
treef505078305b58ba34edaa109f8ed21b5622740a3 /core
parente926e4374242cc590ac507b059e3ce0cfa97d52f (diff)
downloadiced-7b15e4b0e29c64d53a00fbe6709ff2069630fec5.tar.gz
iced-7b15e4b0e29c64d53a00fbe6709ff2069630fec5.tar.bz2
iced-7b15e4b0e29c64d53a00fbe6709ff2069630fec5.zip
Feature name colors -> palette
Diffstat (limited to 'core')
-rw-r--r--core/Cargo.toml3
-rw-r--r--core/src/color.rs10
2 files changed, 5 insertions, 8 deletions
diff --git a/core/Cargo.toml b/core/Cargo.toml
index e05f824c..b52bf315 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -7,9 +7,6 @@ description = "The essential concepts of Iced"
license = "MIT"
repository = "https://github.com/hecrj/iced"
-[features]
-colors = ["palette"]
-
[dependencies]
[dependencies.palette]
diff --git a/core/src/color.rs b/core/src/color.rs
index 4f0d974b..be1a2870 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "colors")]
+#[cfg(feature = "palette")]
use palette::rgb::Srgba;
/// A color in the sRGB color space.
@@ -116,7 +116,7 @@ impl Color {
]
}
- #[cfg(feature = "colors")]
+ #[cfg(feature = "palette")]
/// Convert from palette's [`Srgba`] type to a [`Color`]
///
/// [`Srgba`]: ../palette/rgb/type.Srgba.html
@@ -125,7 +125,7 @@ impl Color {
Color::new(srgba.red, srgba.green, srgba.blue, srgba.alpha)
}
- #[cfg(feature = "colors")]
+ #[cfg(feature = "palette")]
/// Convert from [`Color`] to palette's [`Srgba`] type
///
/// [`Color`]: struct.Color.html
@@ -159,7 +159,7 @@ impl From<[f32; 4]> for Color {
}
}
-#[cfg(feature = "colors")]
+#[cfg(feature = "palette")]
/// Convert from palette's [`Srgba`] type to a [`Color`]
///
/// [`Srgba`]: ../palette/rgb/type.Srgba.html
@@ -170,7 +170,7 @@ impl From<Srgba> for Color {
}
}
-#[cfg(feature = "colors")]
+#[cfg(feature = "palette")]
/// Convert from [`Color`] to palette's [`Srgba`] type
///
/// [`Color`]: struct.Color.html