diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs index 90b2c735260..298cdb47698 100644 --- a/crates/egui/src/containers/collapsing_header.rs +++ b/crates/egui/src/containers/collapsing_header.rs @@ -424,7 +424,6 @@ impl CollapsingHeader { /// Explicitly set the source of the [`Id`] of this widget, instead of using title label. /// This is useful if the title label is dynamic or not unique. - #[deprecated = "Renamed id_salt"] #[inline] pub fn id_salt(mut self, id_salt: impl Hash) -> Self { self.id_salt = Id::new(id_salt); diff --git a/crates/egui/src/ui_builder.rs b/crates/egui/src/ui_builder.rs index 1bcf7e7cae7..f1c3178e10c 100644 --- a/crates/egui/src/ui_builder.rs +++ b/crates/egui/src/ui_builder.rs @@ -29,17 +29,6 @@ impl UiBuilder { Self::default() } - /// Seed the child `Ui` with this `id_source`, which will be mixed - /// with the [`Ui::id`] of the parent. - /// - /// You should give each [`Ui`] an `id_source` that is unique - /// within the parent, or give it none at all. - #[deprecated = "Renamed id_salt"] - #[inline] - pub fn id_source(self, id_salt: impl Hash) -> Self { - self.id_salt(id_salt) - } - /// Seed the child `Ui` with this `id_salt`, which will be mixed /// with the [`Ui::id`] of the parent. /// diff --git a/crates/egui_extras/src/datepicker/button.rs b/crates/egui_extras/src/datepicker/button.rs index 653f257af1c..53993512638 100644 --- a/crates/egui_extras/src/datepicker/button.rs +++ b/crates/egui_extras/src/datepicker/button.rs @@ -39,17 +39,17 @@ impl<'a> DatePickerButton<'a> { /// Add id source. /// Must be set if multiple date picker buttons are in the same Ui. #[inline] - #[deprecated = "Renamed id_salt"] - pub fn id_source(self, id_salt: &'a str) -> Self { - self.id_salt(id_salt) + pub fn id_salt(mut self, id_salt: &'a str) -> Self { + self.id_salt = Some(id_salt); + self } /// Add id source. /// Must be set if multiple date picker buttons are in the same Ui. #[inline] - pub fn id_salt(mut self, id_salt: &'a str) -> Self { - self.id_salt = Some(id_salt); - self + #[deprecated = "Renamed id_salt"] + pub fn id_source(self, id_salt: &'a str) -> Self { + self.id_salt(id_salt) } /// Show combo boxes in date picker popup. (Default: true) diff --git a/crates/epaint/src/shadow.rs b/crates/epaint/src/shadow.rs index ea6454f99cf..bb386d21dc7 100644 --- a/crates/epaint/src/shadow.rs +++ b/crates/epaint/src/shadow.rs @@ -11,7 +11,7 @@ pub struct Shadow { /// Move the shadow by this much. /// /// For instance, a value of `[1.0, 2.0]` will move the shadow 1 point to the right and 2 points down, - /// causing a drop-shadow effet. + /// causing a drop-shadow effect. pub offset: Vec2, /// The width of the blur, i.e. the width of the fuzzy penumbra.