From d8a795598f063cfc90b147cb20fd5591a21a8b08 Mon Sep 17 00:00:00 2001 From: Antoine Beyeler <49431240+abey79@users.noreply.github.com> Date: Fri, 8 Dec 2023 09:08:27 +0100 Subject: [PATCH 1/4] Fix `egui_extras::Table` scrolling bug (#3690) `egui_extras::Table` now uses the clip rectangle to decide which rows to draw when using `TableBody::rows()`. - Closes #3682 - Closes #3670 --- crates/egui_extras/src/table.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs index 8b497f20de0..81a75df43de 100644 --- a/crates/egui_extras/src/table.rs +++ b/crates/egui_extras/src/table.rs @@ -592,7 +592,7 @@ impl<'a> Table<'a> { auto_shrink, } = scroll_options; - let avail_rect = ui.available_rect_before_wrap(); + let cursor_position = ui.cursor().min; let mut scroll_area = ScrollArea::new([false, vscroll]) .auto_shrink(true) @@ -613,6 +613,8 @@ impl<'a> Table<'a> { scroll_area.show(ui, move |ui| { let mut scroll_to_y_range = None; + let clip_rect = ui.clip_rect(); + // Hide first-frame-jitters when auto-sizing. ui.add_visible_ui(!first_frame_auto_size_columns, |ui| { let layout = StripLayout::new(ui, CellDirection::Horizontal, cell_layout); @@ -624,8 +626,8 @@ impl<'a> Table<'a> { max_used_widths: max_used_widths_ref, striped, row_nr: 0, - start_y: avail_rect.top(), - end_y: avail_rect.bottom(), + start_y: clip_rect.top(), + end_y: clip_rect.bottom(), scroll_to_row: scroll_to_row.map(|(r, _)| r), scroll_to_y_range: &mut scroll_to_y_range, }); @@ -647,7 +649,7 @@ impl<'a> Table<'a> { let bottom = ui.min_rect().bottom(); let spacing_x = ui.spacing().item_spacing.x; - let mut x = avail_rect.left() - spacing_x * 0.5; + let mut x = cursor_position.x - spacing_x * 0.5; for (i, column_width) in state.column_widths.iter_mut().enumerate() { let column = &columns[i]; let column_is_resizable = column.resizable.unwrap_or(resizable); From b1721a3ce773bdfebe7c95ea9f83d9bf390d28be Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 8 Dec 2023 10:32:06 +0100 Subject: [PATCH 2/4] Release `egui_extras` 0.24.2 - Fix `Table` scrolling bug (#3691) Includes: * https://github.com/emilk/egui/pull/3690 --------- Co-authored-by: Antoine Beyeler <49431240+abey79@users.noreply.github.com> --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- crates/egui_extras/CHANGELOG.md | 4 ++++ crates/egui_extras/src/table.rs | 3 ++- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4de3c27ab52..748b3265d14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1099,7 +1099,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "cint", @@ -1110,7 +1110,7 @@ dependencies = [ [[package]] name = "eframe" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "cocoa", @@ -1146,7 +1146,7 @@ dependencies = [ [[package]] name = "egui" -version = "0.24.1" +version = "0.24.2" dependencies = [ "accesskit", "ahash", @@ -1162,7 +1162,7 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "document-features", @@ -1178,7 +1178,7 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.24.1" +version = "0.24.2" dependencies = [ "accesskit_winit", "arboard", @@ -1196,7 +1196,7 @@ dependencies = [ [[package]] name = "egui_demo_app" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "chrono", @@ -1220,7 +1220,7 @@ dependencies = [ [[package]] name = "egui_demo_lib" -version = "0.24.1" +version = "0.24.2" dependencies = [ "chrono", "criterion", @@ -1235,7 +1235,7 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.24.1" +version = "0.24.2" dependencies = [ "chrono", "document-features", @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "document-features", @@ -1274,7 +1274,7 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.24.1" +version = "0.24.2" dependencies = [ "document-features", "egui", @@ -1303,7 +1303,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.24.1" +version = "0.24.2" dependencies = [ "bytemuck", "document-features", @@ -1379,7 +1379,7 @@ dependencies = [ [[package]] name = "epaint" -version = "0.24.1" +version = "0.24.2" dependencies = [ "ab_glyph", "ahash", diff --git a/Cargo.toml b/Cargo.toml index bbf9fb19b03..7db8cec3594 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ edition = "2021" license = "MIT OR Apache-2.0" rust-version = "1.72" -version = "0.24.1" +version = "0.24.2" [profile.release] diff --git a/crates/egui_extras/CHANGELOG.md b/crates/egui_extras/CHANGELOG.md index 9208b85c860..5cc3804182c 100644 --- a/crates/egui_extras/CHANGELOG.md +++ b/crates/egui_extras/CHANGELOG.md @@ -5,6 +5,10 @@ This file is updated upon each release. Changes since the last release can be found at or by running the `scripts/generate_changelog.py` script. +## 0.24.2 - 2023-12-08 - `Table` scroll bug fix +* Fix `Table` scrolling bug [#3690](https://github.com/emilk/egui/pull/3690) + + ## 0.24.1 - 2023-11-30 * Add more years for datepicker [#3599](https://github.com/emilk/egui/pull/3599) (thanks [@vaqxai](https://github.com/vaqxai)!) diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs index 81a75df43de..c456ba9645e 100644 --- a/crates/egui_extras/src/table.rs +++ b/crates/egui_extras/src/table.rs @@ -802,7 +802,8 @@ impl<'a> TableBody<'a> { /// Add a single row with the given height. /// - /// If you have many thousands of row it can be more performant to instead use [`Self::rows`] or [`Self::heterogeneous_rows`]. + /// ⚠️ It is much more performant to use [`Self::rows`] or [`Self::heterogeneous_rows`], + /// as those functions will only render the visible rows. pub fn row(&mut self, height: f32, add_row_content: impl FnOnce(TableRow<'a, '_>)) { let top_y = self.layout.cursor.y; add_row_content(TableRow { From 8d4de866d4da1835b31e85f9068a5257e6ccbccb Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 8 Dec 2023 11:02:57 +0100 Subject: [PATCH 3/4] Remove deprecated functions (#3692) --- crates/egui/src/containers/area.rs | 7 ----- .../egui/src/containers/collapsing_header.rs | 30 ------------------- crates/egui/src/containers/frame.rs | 6 ---- crates/egui/src/containers/window.rs | 9 ------ crates/egui/src/context.rs | 10 ------- crates/egui/src/data/input.rs | 9 ------ crates/egui/src/data/output.rs | 8 ----- crates/egui/src/id.rs | 5 ---- crates/egui/src/memory.rs | 17 +---------- crates/egui/src/painter.rs | 10 ------- crates/egui/src/util/id_type_map.rs | 2 +- crates/egui/src/widgets/text_edit/builder.rs | 5 ---- crates/egui_extras/src/image.rs | 10 +------ crates/egui_extras/src/table.rs | 5 ---- crates/egui_glow/src/painter.rs | 5 ---- crates/egui_plot/src/items/mod.rs | 14 --------- crates/egui_plot/src/lib.rs | 18 ----------- crates/emath/src/rect.rs | 7 ----- crates/epaint/src/shape.rs | 11 ------- crates/epaint/src/stroke.rs | 8 +---- 20 files changed, 4 insertions(+), 192 deletions(-) diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs index c1eab977da7..a8c1d417139 100644 --- a/crates/egui/src/containers/area.rs +++ b/crates/egui/src/containers/area.rs @@ -173,13 +173,6 @@ impl Area { self } - #[deprecated = "Use `constrain_to` instead"] - #[inline] - pub fn drag_bounds(mut self, constrain_rect: Rect) -> Self { - self.constrain_rect = Some(constrain_rect); - self - } - /// Where the "root" of the area is. /// /// For instance, if you set this to [`Align2::RIGHT_TOP`] diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs index 2fc28d3dd51..96bf5cdef7e 100644 --- a/crates/egui/src/containers/collapsing_header.rs +++ b/crates/egui/src/containers/collapsing_header.rs @@ -424,36 +424,6 @@ impl CollapsingHeader { self } - /// Can the [`CollapsingHeader`] be selected by clicking it? Default: `false`. - #[deprecated = "Use the more powerful egui::collapsing_header::CollapsingState::show_header"] // Deprecated in 2022-04-28, before egui 0.18 - #[inline] - pub fn selectable(mut self, selectable: bool) -> Self { - self.selectable = selectable; - self - } - - /// If you set this to 'true', the [`CollapsingHeader`] will be shown as selected. - /// - /// Example: - /// ``` - /// # egui::__run_test_ui(|ui| { - /// let mut selected = false; - /// let response = egui::CollapsingHeader::new("Select and open me") - /// .selectable(true) - /// .selected(selected) - /// .show(ui, |ui| ui.label("Body")); - /// if response.header_response.clicked() { - /// selected = true; - /// } - /// # }); - /// ``` - #[deprecated = "Use the more powerful egui::collapsing_header::CollapsingState::show_header"] // Deprecated in 2022-04-28, before egui 0.18 - #[inline] - pub fn selected(mut self, selected: bool) -> Self { - self.selected = selected; - self - } - /// Should the [`CollapsingHeader`] show a background behind it? Default: `false`. /// /// To show it behind all [`CollapsingHeader`] you can just use: diff --git a/crates/egui/src/containers/frame.rs b/crates/egui/src/containers/frame.rs index 49829247193..01c04be79cf 100644 --- a/crates/egui/src/containers/frame.rs +++ b/crates/egui/src/containers/frame.rs @@ -152,12 +152,6 @@ impl Frame { self } - #[deprecated = "Renamed inner_margin in egui 0.18"] - #[inline] - pub fn margin(self, margin: impl Into) -> Self { - self.inner_margin(margin) - } - #[inline] pub fn shadow(mut self, shadow: Shadow) -> Self { self.shadow = shadow; diff --git a/crates/egui/src/containers/window.rs b/crates/egui/src/containers/window.rs index 66bb4a93081..cc0f28e90e5 100644 --- a/crates/egui/src/containers/window.rs +++ b/crates/egui/src/containers/window.rs @@ -209,15 +209,6 @@ impl<'open> Window<'open> { self } - #[deprecated = "Use `constrain_to` instead"] - #[inline] - pub fn drag_bounds(mut self, constrain_rect: Rect) -> Self { - #![allow(deprecated)] - - self.area = self.area.drag_bounds(constrain_rect); - self - } - /// Where the "root" of the window is. /// /// For instance, if you set this to [`Align2::RIGHT_TOP`] diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index 503177d1ff4..c24a9d02ba7 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -707,16 +707,6 @@ impl Context { }) } - /// Read-write access to [`Fonts`]. - #[inline] - #[deprecated = "This function will be removed"] - pub fn fonts_mut(&self, writer: impl FnOnce(Option<&mut Fonts>) -> R) -> R { - self.write(move |ctx| { - let pixels_per_point = ctx.pixels_per_point(); - writer(ctx.fonts.get_mut(&pixels_per_point.into())) - }) - } - /// Read-only access to [`Options`]. #[inline] pub fn options(&self, reader: impl FnOnce(&Options) -> R) -> R { diff --git a/crates/egui/src/data/input.rs b/crates/egui/src/data/input.rs index 50073338b3c..e550c0a4717 100644 --- a/crates/egui/src/data/input.rs +++ b/crates/egui/src/data/input.rs @@ -572,15 +572,6 @@ impl Modifiers { command: false, }; - #[deprecated = "Use `Modifiers::ALT | Modifiers::SHIFT` instead"] - pub const ALT_SHIFT: Self = Self { - alt: true, - ctrl: false, - shift: true, - mac_cmd: false, - command: false, - }; - /// The Mac ⌘ Command key pub const MAC_CMD: Self = Self { alt: false, diff --git a/crates/egui/src/data/output.rs b/crates/egui/src/data/output.rs index 11275e7b800..f9ee018c3e4 100644 --- a/crates/egui/src/data/output.rs +++ b/crates/egui/src/data/output.rs @@ -111,14 +111,6 @@ pub struct PlatformOutput { } impl PlatformOutput { - /// Open the given url in a web browser. - /// - /// If egui is running in a browser, the same tab will be reused. - #[deprecated = "Use Context::open_url instead"] - pub fn open_url(&mut self, url: impl ToString) { - self.open_url = Some(OpenUrl::same_tab(url)); - } - /// This can be used by a text-to-speech system to describe the events (if any). pub fn events_description(&self) -> String { // only describe last event: diff --git a/crates/egui/src/id.rs b/crates/egui/src/id.rs index e588271d9d8..fe42d20fbfc 100644 --- a/crates/egui/src/id.rs +++ b/crates/egui/src/id.rs @@ -37,11 +37,6 @@ impl Id { /// though obviously it will lead to a lot of collisions if you do use it! pub const NULL: Self = Self(0); - #[deprecated = "Use Id::NULL"] - pub fn null() -> Self { - Self(0) - } - pub(crate) const fn background() -> Self { Self(1) } diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs index fb15fdd3897..a96d8d973be 100644 --- a/crates/egui/src/memory.rs +++ b/crates/egui/src/memory.rs @@ -39,7 +39,7 @@ pub struct Memory { /// /// This will be saved between different program runs if you use the `persistence` feature. /// - /// To store a state common for all your widgets (a singleton), use [`Id::null`] as the key. + /// To store a state common for all your widgets (a singleton), use [`Id::NULL`] as the key. pub data: crate::util::IdTypeMap, // ------------------------------------------ @@ -666,21 +666,6 @@ impl Memory { } } - /// Set an event filter for a widget. - /// - /// You must first give focus to the widget before calling this. - #[deprecated = "Use set_focus_lock_filter instead"] - pub fn lock_focus(&mut self, id: Id, lock_focus: bool) { - self.set_focus_lock_filter( - id, - EventFilter { - tab: lock_focus, - arrows: lock_focus, - escape: false, - }, - ); - } - /// Give keyboard focus to a specific widget. /// See also [`crate::Response::request_focus`]. #[inline(always)] diff --git a/crates/egui/src/painter.rs b/crates/egui/src/painter.rs index a88862325a6..8376d16ed7b 100644 --- a/crates/egui/src/painter.rs +++ b/crates/egui/src/painter.rs @@ -83,16 +83,6 @@ impl Painter { pub(crate) fn set_invisible(&mut self) { self.fade_to_color = Some(Color32::TRANSPARENT); } - - #[deprecated = "Use Painter::with_clip_rect"] // Deprecated in 2022-04-18, before egui 0.18 - pub fn sub_region(&self, rect: Rect) -> Self { - Self { - ctx: self.ctx.clone(), - layer_id: self.layer_id, - clip_rect: rect.intersect(self.clip_rect), - fade_to_color: self.fade_to_color, - } - } } /// ## Accessors etc diff --git a/crates/egui/src/util/id_type_map.rs b/crates/egui/src/util/id_type_map.rs index 9e33849a991..d7af233ac25 100644 --- a/crates/egui/src/util/id_type_map.rs +++ b/crates/egui/src/util/id_type_map.rs @@ -318,7 +318,7 @@ use crate::Id; /// /// Values can either be "persisted" (serializable) or "temporary" (cleared when egui is shut down). /// -/// You can store state using the key [`Id::null`]. The state will then only be identified by its type. +/// You can store state using the key [`Id::NULL`]. The state will then only be identified by its type. /// /// ``` /// # use egui::{Id, util::IdTypeMap}; diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs index d96a8a216f7..0b4bb0b9d9f 100644 --- a/crates/egui/src/widgets/text_edit/builder.rs +++ b/crates/egui/src/widgets/text_edit/builder.rs @@ -193,11 +193,6 @@ impl<'t> TextEdit<'t> { self } - #[deprecated = "Use .font(…) instead"] - pub fn text_style(self, text_style: TextStyle) -> Self { - self.font(text_style) - } - #[inline] pub fn text_color(mut self, text_color: Color32) -> Self { self.text_color = Some(text_color); diff --git a/crates/egui_extras/src/image.rs b/crates/egui_extras/src/image.rs index 1ad3cea6c7e..72be580d2c9 100644 --- a/crates/egui_extras/src/image.rs +++ b/crates/egui_extras/src/image.rs @@ -1,6 +1,6 @@ #![allow(deprecated)] -use egui::{mutex::Mutex, TextureFilter, TextureOptions}; +use egui::{mutex::Mutex, TextureOptions}; #[cfg(feature = "svg")] pub use usvg::FitTo; @@ -123,14 +123,6 @@ impl RetainedImage { self } - #[deprecated = "Use with_options instead"] - pub fn with_texture_filter(self, filter: TextureFilter) -> Self { - self.with_options(TextureOptions { - magnification: filter, - minification: filter, - }) - } - /// The size of the image data (number of pixels wide/high). pub fn size(&self) -> [usize; 2] { self.size diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs index c456ba9645e..6659ed395ea 100644 --- a/crates/egui_extras/src/table.rs +++ b/crates/egui_extras/src/table.rs @@ -278,11 +278,6 @@ impl<'a> TableBuilder<'a> { self } - #[deprecated = "Renamed to vscroll"] - pub fn scroll(self, vscroll: bool) -> Self { - self.vscroll(vscroll) - } - /// Enables scrolling the table's contents using mouse drag (default: `true`). /// /// See [`ScrollArea::drag_to_scroll`] for more. diff --git a/crates/egui_glow/src/painter.rs b/crates/egui_glow/src/painter.rs index 2df12298c46..4f2d437f9aa 100644 --- a/crates/egui_glow/src/painter.rs +++ b/crates/egui_glow/src/painter.rs @@ -624,11 +624,6 @@ impl Painter { self.textures.get(&texture_id).copied() } - #[deprecated = "renamed 'texture'"] - pub fn get_texture(&self, texture_id: egui::TextureId) -> Option { - self.texture(texture_id) - } - #[allow(clippy::needless_pass_by_value)] // False positive pub fn register_native_texture(&mut self, native: glow::Texture) -> egui::TextureId { self.assert_not_destroyed(); diff --git a/crates/egui_plot/src/items/mod.rs b/crates/egui_plot/src/items/mod.rs index b49f6773cba..92d607570d8 100644 --- a/crates/egui_plot/src/items/mod.rs +++ b/crates/egui_plot/src/items/mod.rs @@ -574,20 +574,6 @@ impl Polygon { self } - #[deprecated = "Use `fill_color`."] - #[allow(unused, clippy::needless_pass_by_value)] - #[inline] - pub fn color(mut self, color: impl Into) -> Self { - self - } - - #[deprecated = "Use `fill_color`."] - #[allow(unused, clippy::needless_pass_by_value)] - #[inline] - pub fn fill_alpha(mut self, _alpha: impl Into) -> Self { - self - } - /// Fill color. Defaults to the stroke color with added transparency. #[inline] pub fn fill_color(mut self, color: impl Into) -> Self { diff --git a/crates/egui_plot/src/lib.rs b/crates/egui_plot/src/lib.rs index 61b902834e4..a10953311dc 100644 --- a/crates/egui_plot/src/lib.rs +++ b/crates/egui_plot/src/lib.rs @@ -1393,24 +1393,6 @@ impl PlotUi { &self.response } - /// Returns `true` if the plot area is currently hovered. - #[deprecated = "Use plot_ui.response().hovered()"] - pub fn plot_hovered(&self) -> bool { - self.response.hovered() - } - - /// Returns `true` if the plot was clicked by the primary button. - #[deprecated = "Use plot_ui.response().clicked()"] - pub fn plot_clicked(&self) -> bool { - self.response.clicked() - } - - /// Returns `true` if the plot was clicked by the secondary button. - #[deprecated = "Use plot_ui.response().secondary_clicked()"] - pub fn plot_secondary_clicked(&self) -> bool { - self.response.secondary_clicked() - } - /// The pointer position in plot coordinates. Independent of whether the pointer is in the plot area. pub fn pointer_coordinate(&self) -> Option { // We need to subtract the drag delta to keep in sync with the frame-delayed screen transform: diff --git a/crates/emath/src/rect.rs b/crates/emath/src/rect.rs index 69ff7d30384..e671135fce6 100644 --- a/crates/emath/src/rect.rs +++ b/crates/emath/src/rect.rs @@ -407,13 +407,6 @@ impl Rect { inside_dist + outside_dist } - /// Linearly interpolate so that `[0, 0]` is [`Self::min`] and - /// `[1, 1]` is [`Self::max`]. - #[deprecated = "Use `lerp_inside` instead"] - pub fn lerp(&self, t: Vec2) -> Pos2 { - self.lerp_inside(t) - } - /// Linearly interpolate so that `[0, 0]` is [`Self::min`] and /// `[1, 1]` is [`Self::max`]. pub fn lerp_inside(&self, t: Vec2) -> Pos2 { diff --git a/crates/epaint/src/shape.rs b/crates/epaint/src/shape.rs index 07e06cb3db6..8de1f0ffc1b 100644 --- a/crates/epaint/src/shape.rs +++ b/crates/epaint/src/shape.rs @@ -622,17 +622,6 @@ impl Rounding { } } - #[inline] - #[deprecated = "Use Rounding::ZERO"] - pub fn none() -> Self { - Self { - nw: 0.0, - ne: 0.0, - sw: 0.0, - se: 0.0, - } - } - /// Do all corners have the same rounding? #[inline] pub fn is_same(&self) -> bool { diff --git a/crates/epaint/src/stroke.rs b/crates/epaint/src/stroke.rs index 72f5a8cfddc..fca821b1ac0 100644 --- a/crates/epaint/src/stroke.rs +++ b/crates/epaint/src/stroke.rs @@ -4,7 +4,7 @@ use super::*; /// Describes the width and color of a line. /// -/// The default stroke is the same as [`Stroke::none`]. +/// The default stroke is the same as [`Stroke::NONE`]. #[derive(Clone, Copy, Debug, Default, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct Stroke { @@ -19,12 +19,6 @@ impl Stroke { color: Color32::TRANSPARENT, }; - #[deprecated = "Use Stroke::NONE instead"] - #[inline(always)] - pub fn none() -> Self { - Self::new(0.0, Color32::TRANSPARENT) - } - #[inline] pub fn new(width: impl Into, color: impl Into) -> Self { Self { From c8dd3dd01a7ea40b95925b8de11ecfa981eaa738 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 12 Dec 2023 12:59:40 +0100 Subject: [PATCH 4/4] Update dependencies (#3700) Also disable `regex` `env_logger` feature in examples to improve compile times. --- Cargo.lock | 139 ++++++++------------- Cargo.toml | 1 + crates/egui_demo_app/Cargo.toml | 5 +- crates/egui_demo_lib/Cargo.toml | 2 +- crates/epaint/Cargo.toml | 2 +- deny.toml | 1 + examples/confirm_exit/Cargo.toml | 5 +- examples/custom_3d_glow/Cargo.toml | 5 +- examples/custom_font/Cargo.toml | 5 +- examples/custom_font_style/Cargo.toml | 5 +- examples/custom_window_frame/Cargo.toml | 5 +- examples/file_dialog/Cargo.toml | 5 +- examples/hello_world/Cargo.toml | 5 +- examples/hello_world_par/Cargo.toml | 5 +- examples/hello_world_simple/Cargo.toml | 5 +- examples/images/Cargo.toml | 5 +- examples/keyboard_events/Cargo.toml | 5 +- examples/multiple_viewports/Cargo.toml | 5 +- examples/puffin_profiler/Cargo.toml | 5 +- examples/save_plot/Cargo.toml | 5 +- examples/screenshot/Cargo.toml | 5 +- examples/serial_windows/Cargo.toml | 5 +- examples/test_inline_glow_paint/Cargo.toml | 5 +- examples/test_viewports/Cargo.toml | 5 +- examples/user_attention/Cargo.toml | 5 +- 25 files changed, 139 insertions(+), 106 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 748b3265d14..ee39fbbaec7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,6 +181,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + [[package]] name = "anyhow" version = "1.0.75" @@ -437,17 +443,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -734,25 +729,29 @@ checksum = "7a0e87cdf78571d9fbeff16861c37a006cd718d2433dc6d5b80beaae367d899a" [[package]] name = "clap" -version = "3.2.25" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "textwrap", + "clap_builder", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ - "os_str_bytes", + "anstyle", + "clap_lex", ] +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + [[package]] name = "clipboard-win" version = "4.5.0" @@ -909,19 +908,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "regex", "serde", @@ -1021,9 +1020,12 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -1373,7 +1375,6 @@ dependencies = [ "humantime", "is-terminal", "log", - "regex", "termcolor", ] @@ -1884,7 +1885,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.4.0", "gpu-descriptor-types", - "hashbrown 0.14.0", + "hashbrown", ] [[package]] @@ -1922,15 +1923,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1982,15 +1977,6 @@ dependencies = [ "env_logger", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.3" @@ -2090,22 +2076,12 @@ checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951" [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown", ] [[package]] @@ -2126,7 +2102,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -2137,7 +2113,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix 0.38.14", "windows-sys 0.48.0", ] @@ -2441,15 +2417,15 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071" +checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ "bit-set", "bitflags 2.4.0", "codespan-reporting", "hexf-parse", - "indexmap 2.0.0", + "indexmap", "log", "num-traits", "rustc-hash", @@ -2706,12 +2682,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "owned_ttf_parser" version = "0.19.0" @@ -2811,12 +2781,12 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64 0.21.4", - "indexmap 1.9.3", + "indexmap", "line-wrap", "quick-xml", "serde", @@ -2868,6 +2838,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2945,9 +2921,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -3612,12 +3588,6 @@ dependencies = [ "env_logger", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.49" @@ -3640,12 +3610,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -3743,7 +3714,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index 7db8cec3594..134f3244180 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,7 @@ opt-level = 2 [workspace.dependencies] +criterion = { version = "0.5.1", default-features = false } puffin = "0.18" raw-window-handle = "0.5.0" thiserror = "1.0.37" diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index b7c8e24d244..2d8d449c988 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -73,7 +73,10 @@ serde = { version = "1", optional = true, features = ["derive"] } # native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } rfd = { version = "0.11", optional = true } # web: diff --git a/crates/egui_demo_lib/Cargo.toml b/crates/egui_demo_lib/Cargo.toml index cfe9fd4c724..14189bc6787 100644 --- a/crates/egui_demo_lib/Cargo.toml +++ b/crates/egui_demo_lib/Cargo.toml @@ -52,7 +52,7 @@ serde = { version = "1", optional = true, features = ["derive"] } [dev-dependencies] -criterion = { version = "0.4", default-features = false } +criterion.workspace = true [[bench]] diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml index 15f66fe5edb..e39b8f0193c 100644 --- a/crates/epaint/Cargo.toml +++ b/crates/epaint/Cargo.toml @@ -98,7 +98,7 @@ backtrace = { version = "0.3", optional = true } [dev-dependencies] -criterion = { version = "0.4", default-features = false } +criterion.workspace = true [[bench]] diff --git a/deny.toml b/deny.toml index 4536cd3f9f0..73f492c5d91 100644 --- a/deny.toml +++ b/deny.toml @@ -36,6 +36,7 @@ deny = [ skip = [ { name = "arrayvec" }, # old version via tiny-skiaz { name = "base64" }, # small crate, old version from usvg + { name = "bitflags" }, # old 1.0 version via glutin, png, spirv, … { name = "glow" }, # TODO(@wumpf): Old version use for glow backend right now, newer for wgpu. Updating this trickles out to updating winit. { name = "glutin_wgl_sys" }, # TODO(@wumpf): Old version use for glow backend right now, newer for wgpu. Updating this trickles out to updating winit. { name = "libloading" }, # wgpu-hal itself depends on 0.8 while some of its dependencies, like ash and d3d12, depend on 0.7 diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml index 1a7504775d3..2b0fae85dbd 100644 --- a/examples/confirm_exit/Cargo.toml +++ b/examples/confirm_exit/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml index 849faa5c463..0d268759c27 100644 --- a/examples/custom_3d_glow/Cargo.toml +++ b/examples/custom_3d_glow/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml index c87ad9dadab..0eec65cd4d5 100644 --- a/examples/custom_font/Cargo.toml +++ b/examples/custom_font/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml index 45ee60c352b..a429303bb07 100644 --- a/examples/custom_font_style/Cargo.toml +++ b/examples/custom_font_style/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml index d518f615fd2..6dc91e4e503 100644 --- a/examples/custom_window_frame/Cargo.toml +++ b/examples/custom_window_frame/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml index 3d5cc6d8af9..0ad331dff06 100644 --- a/examples/file_dialog/Cargo.toml +++ b/examples/file_dialog/Cargo.toml @@ -12,5 +12,8 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } rfd = "0.11" diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index 9e846a2362e..fb2ca48c920 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -16,4 +16,7 @@ eframe = { path = "../../crates/eframe", features = [ # For image support: egui_extras = { path = "../../crates/egui_extras", features = ["image"] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml index 65fb00646da..46d6aa741e9 100644 --- a/examples/hello_world_par/Cargo.toml +++ b/examples/hello_world_par/Cargo.toml @@ -14,4 +14,7 @@ eframe = { path = "../../crates/eframe", default-features = false, features = [ "default_fonts", "wgpu", ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml index b08fc3857c6..36efecdda60 100644 --- a/examples/hello_world_simple/Cargo.toml +++ b/examples/hello_world_simple/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml index d400e1087a6..bddc9afbfaa 100644 --- a/examples/images/Cargo.toml +++ b/examples/images/Cargo.toml @@ -13,7 +13,10 @@ eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } egui_extras = { path = "../../crates/egui_extras", features = ["all_loaders"] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } image = { version = "0.24", default-features = false, features = [ "jpeg", "png", diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml index e38260ec38c..4f12579e03d 100644 --- a/examples/keyboard_events/Cargo.toml +++ b/examples/keyboard_events/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml index 81e7c7b2d28..18898bdc0a8 100644 --- a/examples/multiple_viewports/Cargo.toml +++ b/examples/multiple_viewports/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index d6098685ea5..d1329f9f31b 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -17,6 +17,9 @@ eframe = { path = "../../crates/eframe", features = [ "puffin", "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } puffin = "0.18" puffin_http = "0.15" diff --git a/examples/save_plot/Cargo.toml b/examples/save_plot/Cargo.toml index 04e337020c7..49a46f58094 100644 --- a/examples/save_plot/Cargo.toml +++ b/examples/save_plot/Cargo.toml @@ -14,4 +14,7 @@ eframe = { path = "../../crates/eframe", features = [ egui_plot = { path = "../../crates/egui_plot" } image = { version = "0.24", default-features = false, features = ["png"] } rfd = "0.11.0" -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml index b2a521cac06..f7a65a8bf3f 100644 --- a/examples/screenshot/Cargo.toml +++ b/examples/screenshot/Cargo.toml @@ -16,5 +16,8 @@ eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "wgpu", ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } image = { version = "0.24", default-features = false, features = ["png"] } diff --git a/examples/serial_windows/Cargo.toml b/examples/serial_windows/Cargo.toml index f8b0388a666..e3ba3159a92 100644 --- a/examples/serial_windows/Cargo.toml +++ b/examples/serial_windows/Cargo.toml @@ -12,4 +12,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/test_inline_glow_paint/Cargo.toml b/examples/test_inline_glow_paint/Cargo.toml index 4fabb8be269..472935ed5bf 100644 --- a/examples/test_inline_glow_paint/Cargo.toml +++ b/examples/test_inline_glow_paint/Cargo.toml @@ -11,4 +11,7 @@ publish = false [dependencies] eframe = { path = "../../crates/eframe" } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/test_viewports/Cargo.toml b/examples/test_viewports/Cargo.toml index 132f98cc7d7..9ebebae205f 100644 --- a/examples/test_viewports/Cargo.toml +++ b/examples/test_viewports/Cargo.toml @@ -14,4 +14,7 @@ wgpu = ["eframe/wgpu"] eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] } diff --git a/examples/user_attention/Cargo.toml b/examples/user_attention/Cargo.toml index 01ebe116f43..91103635d20 100644 --- a/examples/user_attention/Cargo.toml +++ b/examples/user_attention/Cargo.toml @@ -11,4 +11,7 @@ publish = false eframe = { path = "../../crates/eframe", features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } -env_logger = "0.10" +env_logger = { version = "0.10", default-features = false, features = [ + "auto-color", + "humantime", +] }