diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml index eb60d14fa..1cd56c950 100644 --- a/.github/workflows/deploy_web_demo.yml +++ b/.github/workflows/deploy_web_demo.yml @@ -38,7 +38,7 @@ jobs: with: profile: minimal target: wasm32-unknown-unknown - toolchain: 1.92.0 + toolchain: 1.95.0 override: true - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/preview_build.yml b/.github/workflows/preview_build.yml index 22ea08cba..9316b7e67 100644 --- a/.github/workflows/preview_build.yml +++ b/.github/workflows/preview_build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 targets: wasm32-unknown-unknown - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 18052710b..5821e5784 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -5,7 +5,7 @@ name: Rust env: RUSTFLAGS: -D warnings RUSTDOCFLAGS: -D warnings - NIGHTLY_VERSION: nightly-2025-09-16 + NIGHTLY_VERSION: nightly-2026-04-02 jobs: fmt-crank-check-test: @@ -19,7 +19,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Install packages (Linux) if: runner.os == 'Linux' @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 targets: wasm32-unknown-unknown - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev @@ -148,7 +148,7 @@ jobs: - uses: actions/checkout@v4 - uses: EmbarkStudios/cargo-deny-action@v2 with: - rust-version: "1.92.0" + rust-version: "1.95.0" log-level: error command: check arguments: --target ${{ matrix.target }} @@ -164,7 +164,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 targets: aarch64-linux-android - name: Set up cargo cache @@ -186,7 +186,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 targets: aarch64-apple-ios - name: Set up cargo cache @@ -206,7 +206,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Set up cargo cache uses: Swatinem/rust-cache@v2 @@ -228,7 +228,7 @@ jobs: lfs: true - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Set up cargo cache uses: Swatinem/rust-cache@v2 diff --git a/Cargo.toml b/Cargo.toml index 78606c8d8..6c8566cf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ members = [ [workspace.package] edition = "2024" license = "MIT OR Apache-2.0" -rust-version = "1.92" +rust-version = "1.95" version = "0.35.0" @@ -205,6 +205,7 @@ cloned_instead_of_copied = "warn" coerce_container_to_any = "warn" dbg_macro = "warn" debug_assert_with_mut_call = "warn" +decimal_bitwise_operands = "warn" default_union_representation = "warn" derive_partial_eq_without_eq = "warn" disallowed_macros = "warn" # See clippy.toml @@ -217,9 +218,10 @@ doc_comment_double_space_linebreaks = "warn" doc_include_without_cfg = "warn" doc_link_with_quotes = "warn" doc_markdown = "warn" +duration_suboptimal_units = "warn" elidable_lifetime_names = "warn" -empty_enum = "warn" empty_enum_variants_with_brackets = "warn" +empty_enums = "warn" empty_line_after_outer_attr = "warn" enum_glob_use = "warn" equatable_if_let = "warn" @@ -270,6 +272,7 @@ lossy_float_literal = "warn" macro_use_imports = "warn" manual_assert = "warn" manual_clamp = "warn" +manual_ilog2 = "warn" manual_instant_elapsed = "warn" manual_is_power_of_two = "warn" manual_is_variant_and = "warn" @@ -299,10 +302,12 @@ needless_for_each = "warn" needless_pass_by_ref_mut = "warn" needless_pass_by_value = "warn" needless_raw_string_hashes = "warn" +needless_type_cast = "warn" negative_feature_names = "warn" non_std_lazy_statics = "warn" non_zero_suggestions = "warn" nonstandard_macro_braces = "warn" +only_used_in_recursion = "warn" option_as_ref_cloned = "warn" option_option = "warn" or_fun_call = "warn" @@ -325,6 +330,7 @@ ref_patterns = "warn" rest_pat_in_fully_bound_structs = "warn" return_and_then = "warn" same_functions_in_if_condition = "warn" +same_length_and_capacity = "warn" self_only_used_in_recursion = "warn" semicolon_if_nothing_returned = "warn" set_contains_or_insert = "warn" @@ -341,6 +347,7 @@ suspicious_command_arg_space = "warn" suspicious_xor_used_as_pow = "warn" todo = "warn" too_long_first_doc_paragraph = "warn" +too_many_arguments = "warn" trailing_empty_array = "warn" trait_duplication_in_bounds = "warn" transmute_ptr_to_ptr = "warn" @@ -358,6 +365,7 @@ unnecessary_safety_doc = "warn" unnecessary_self_imports = "warn" unnecessary_semicolon = "warn" unnecessary_struct_initialization = "warn" +unnecessary_trailing_comma = "warn" unnecessary_wraps = "warn" unnested_or_patterns = "warn" unused_async = "warn" @@ -382,6 +390,7 @@ too_many_lines = "allow" # These are meh: assigning_clones = "allow" # No please +cast_possible_truncation = "allow" # too many hits let_underscore_must_use = "allow" let_underscore_untyped = "allow" manual_range_contains = "allow" # this one is just worse imho diff --git a/clippy.toml b/clippy.toml index a57ed66fe..7c4b55f43 100644 --- a/clippy.toml +++ b/clippy.toml @@ -3,7 +3,7 @@ # ----------------------------------------------------------------------------- # Section identical to scripts/clippy_wasm/clippy.toml: -msrv = "1.92" +msrv = "1.95" allow-unwrap-in-tests = true diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index b89212aa2..345cc3e2c 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -122,13 +122,13 @@ impl WinitAppWrapper { event_result } EventResult::RepaintNow(window_id) => { - log::trace!("RepaintNow of {window_id:?}",); + log::trace!("RepaintNow of {window_id:?}"); self.windows_next_repaint_times .insert(window_id, Instant::now()); event_result } EventResult::RepaintNext(window_id) => { - log::trace!("RepaintNext of {window_id:?}",); + log::trace!("RepaintNext of {window_id:?}"); self.windows_next_repaint_times .insert(window_id, Instant::now()); event_result diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index 1ad4a8fb1..bfd6410bd 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -3506,7 +3506,7 @@ impl Context { if !is_visible { continue; } - let text = format!("{} - {:?}", layer_id.short_debug_format(), area.rect(),); + let text = format!("{} - {:?}", layer_id.short_debug_format(), area.rect()); // TODO(emilk): `Sense::hover_highlight()` let response = ui.add(Label::new(RichText::new(text).monospace()).sense(Sense::click())); diff --git a/crates/egui/src/hit_test.rs b/crates/egui/src/hit_test.rs index 077baa183..f48c409b0 100644 --- a/crates/egui/src/hit_test.rs +++ b/crates/egui/src/hit_test.rs @@ -201,8 +201,6 @@ fn contains_circle(interact_rect: emath::Rect, pos: Pos2, radius: f32) -> bool { } fn hit_test_on_close(close: &[WidgetRect], pos: Pos2) -> WidgetHits { - #![expect(clippy::collapsible_else_if)] - // First find the best direct hits: let hit_click = find_closest_within( close.iter().copied().filter(|w| w.sense.senses_click()), diff --git a/crates/egui/src/lib.rs b/crates/egui/src/lib.rs index 3dc85a28d..f0d4698e3 100644 --- a/crates/egui/src/lib.rs +++ b/crates/egui/src/lib.rs @@ -3,7 +3,7 @@ //! Try the live web demo: . Read more about egui at . //! //! `egui` is in heavy development, with each new version having breaking changes. -//! You need to have rust 1.92.0 or later to use `egui`. +//! You need to have rust 1.95.0 or later to use `egui`. //! //! To quickly get started with egui, you can take a look at [`eframe_template`](https://github.com/emilk/eframe_template) //! which uses [`eframe`](https://docs.rs/eframe). diff --git a/crates/egui/src/memory/mod.rs b/crates/egui/src/memory/mod.rs index 43694453c..1f22b3dd4 100644 --- a/crates/egui/src/memory/mod.rs +++ b/crates/egui/src/memory/mod.rs @@ -1460,9 +1460,9 @@ fn order_map_total_ordering() { // Assert that `areas.compare_order()` forms a total ordering let mut equivalence_classes = vec![0]; let mut i = 0; - for l in layers.windows(2) { - assert!(l[0].order <= l[1].order, "does not follow LayerId.order"); - if areas.compare_order(l[0], l[1]) != std::cmp::Ordering::Equal { + for &[a, b] in layers.array_windows() { + assert!(a.order <= b.order, "does not follow LayerId.order"); + if areas.compare_order(a, b) != std::cmp::Ordering::Equal { i += 1; } equivalence_classes.push(i); diff --git a/crates/egui/src/util/undoer.rs b/crates/egui/src/util/undoer.rs index 65ad576ec..a2eec6599 100644 --- a/crates/egui/src/util/undoer.rs +++ b/crates/egui/src/util/undoer.rs @@ -134,9 +134,8 @@ where if self.has_undo(current_state) { self.flux = None; - if self.undos.back() == Some(current_state) { - #[expect(clippy::unwrap_used)] // we just checked that undos is not empty - self.redos.push(self.undos.pop_back().unwrap()); + if let Some(state) = self.undos.pop_back_if(|state| &*state == current_state) { + self.redos.push(state); } else { self.redos.push(current_state.clone()); } diff --git a/crates/emath/src/history.rs b/crates/emath/src/history.rs index c25b94147..4a49defa2 100644 --- a/crates/emath/src/history.rs +++ b/crates/emath/src/history.rs @@ -160,16 +160,14 @@ where while self.values.len() > self.max_len { self.values.pop_front(); } - while self.values.len() > self.min_len { - if let Some((front_time, _)) = self.values.front() { - if *front_time < now - (self.max_age as f64) { - self.values.pop_front(); - } else { - break; - } - } else { - break; - } + let oldest_allowed_time = now - self.max_age as f64; + while self.min_len < self.values.len() + && self + .values + .pop_front_if(|&mut (front_time, _)| front_time < oldest_allowed_time) + .is_some() + { + // Keep popping while the oldest sample is too old. } } } diff --git a/crates/epaint/src/shapes/shape.rs b/crates/epaint/src/shapes/shape.rs index 5155fe0f5..ff15708f1 100644 --- a/crates/epaint/src/shapes/shape.rs +++ b/crates/epaint/src/shapes/shape.rs @@ -512,8 +512,7 @@ fn points_from_line( shapes: &mut Vec, ) { let mut position_on_segment = 0.0; - for window in path.windows(2) { - let (start, end) = (window[0], window[1]); + for &[start, end] in path.array_windows() { let vector = end - start; let segment_length = vector.length(); while position_on_segment < segment_length { @@ -545,8 +544,7 @@ fn dashes_from_line( let mut drawing_dash = false; let mut step = 0; let steps = dash_lengths.len(); - for window in path.windows(2) { - let (start, end) = (window[0], window[1]); + for &[start, end] in path.array_windows() { let vector = end - start; let segment_length = vector.length(); diff --git a/crates/epaint/src/text/font.rs b/crates/epaint/src/text/font.rs index c04c619f8..fad657e6e 100644 --- a/crates/epaint/src/text/font.rs +++ b/crates/epaint/src/text/font.rs @@ -117,7 +117,6 @@ impl SubpixelBin { let trunc = pos as i32; let fract = pos - trunc as f32; - #[expect(clippy::collapsible_else_if)] if pos.is_sign_negative() { if fract > -0.125 { (trunc, Self::Zero) diff --git a/crates/epaint/src/text/text_layout.rs b/crates/epaint/src/text/text_layout.rs index 34ef60111..ffe187e6c 100644 --- a/crates/epaint/src/text/text_layout.rs +++ b/crates/epaint/src/text/text_layout.rs @@ -471,8 +471,7 @@ fn layout_section( // Process each paragraph segment (split on newlines — the shaper can't handle them). for (seg_idx, segment) in SplitOrWhole::new(section_text, job.break_on_newline).enumerate() { if 0 < seg_idx { - out_paragraphs.push(Paragraph::from_section_index(section_index)); - paragraph = out_paragraphs.last_mut().unwrap(); + paragraph = out_paragraphs.push_mut(Paragraph::from_section_index(section_index)); paragraph.empty_paragraph_height = line_height; ctx.is_first_glyph_in_section = true; } @@ -1864,7 +1863,7 @@ mod tests { // Verify that Row::text() reconstructs the input text. let row_text: String = galley.rows.iter().map(|r| r.text()).collect(); - assert_eq!(row_text, text, "Row::text() mismatch for {text:?}",); + assert_eq!(row_text, text, "Row::text() mismatch for {text:?}"); // Verify cursor round-trip: end cursor index == char count. assert_eq!( diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml index 755d9dd46..165689d35 100644 --- a/examples/confirm_exit/Cargo.toml +++ b/examples/confirm_exit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml index ed1d15516..8204fb225 100644 --- a/examples/custom_3d_glow/Cargo.toml +++ b/examples/custom_3d_glow/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml index d2dcf350e..5307b3a7c 100644 --- a/examples/custom_font/Cargo.toml +++ b/examples/custom_font/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml index e31911c1a..1dd592cb9 100644 --- a/examples/custom_font_style/Cargo.toml +++ b/examples/custom_font_style/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["tami5 "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_keypad/Cargo.toml b/examples/custom_keypad/Cargo.toml index 024196e7d..aeebbe014 100644 --- a/examples/custom_keypad/Cargo.toml +++ b/examples/custom_keypad/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Varphone Wong "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_style/Cargo.toml b/examples/custom_style/Cargo.toml index 3352aa474..bf565c612 100644 --- a/examples/custom_style/Cargo.toml +++ b/examples/custom_style/Cargo.toml @@ -3,7 +3,7 @@ name = "custom_style" version = "0.1.0" license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml index 049ee9a1a..e0acc551a 100644 --- a/examples/custom_window_frame/Cargo.toml +++ b/examples/custom_window_frame/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/external_eventloop/Cargo.toml b/examples/external_eventloop/Cargo.toml index 3341f1c65..f71d126af 100644 --- a/examples/external_eventloop/Cargo.toml +++ b/examples/external_eventloop/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Will Brown "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/external_eventloop_async/Cargo.toml b/examples/external_eventloop_async/Cargo.toml index 73c08210b..38c5167eb 100644 --- a/examples/external_eventloop_async/Cargo.toml +++ b/examples/external_eventloop_async/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Will Brown "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml index f0512e329..77d0c8f35 100644 --- a/examples/file_dialog/Cargo.toml +++ b/examples/file_dialog/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/font_variations/Cargo.toml b/examples/font_variations/Cargo.toml index 789625f06..440dea986 100644 --- a/examples/font_variations/Cargo.toml +++ b/examples/font_variations/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/hello_android/Cargo.toml b/examples/hello_android/Cargo.toml index ae484783c..ca8eabd5e 100644 --- a/examples/hello_android/Cargo.toml +++ b/examples/hello_android/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false # `unsafe_code` is required for `#[no_mangle]`, disable workspace lints to workaround lint error. diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index 1f94588ae..89b354741 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml index 04a3c0e25..752a5efa8 100644 --- a/examples/hello_world_par/Cargo.toml +++ b/examples/hello_world_par/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Maxim Osipenko "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml index 572b98f71..015c86aee 100644 --- a/examples/hello_world_simple/Cargo.toml +++ b/examples/hello_world_simple/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml index adac2a540..1e9a33f3e 100644 --- a/examples/images/Cargo.toml +++ b/examples/images/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Jan Procházka "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml index 23265be36..64d03e5be 100644 --- a/examples/keyboard_events/Cargo.toml +++ b/examples/keyboard_events/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Jose Palazon "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml index 07e68831a..f9bd07dc7 100644 --- a/examples/multiple_viewports/Cargo.toml +++ b/examples/multiple_viewports/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index ed8ce3aa0..0ffff5063 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [package.metadata.cargo-shear] diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml index 40a8c1c4f..6a5957ba1 100644 --- a/examples/screenshot/Cargo.toml +++ b/examples/screenshot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["René Rössler ", "Andreas Faber "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/examples/user_attention/Cargo.toml b/examples/user_attention/Cargo.toml index 084a53b59..14a97f097 100644 --- a/examples/user_attention/Cargo.toml +++ b/examples/user_attention/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["TicClick "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/rust-toolchain b/rust-toolchain index ce5b50987..7fb2669f3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -5,6 +5,6 @@ # to the user in the error, instead of "error: invalid channel name '[toolchain]'". [toolchain] -channel = "1.92.0" +channel = "1.95.0" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] diff --git a/scripts/check.sh b/scripts/check.sh index ce0b3b8d5..12d6da822 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -9,7 +9,7 @@ set -x # Checks all tests, lints etc. # Basically does what the CI does. -# cargo +1.92.0 install --quiet typos-cli +# cargo +1.95.0 install --quiet typos-cli export RUSTFLAGS="-D warnings" export RUSTDOCFLAGS="-D warnings" # https://github.com/emilk/egui/pull/1454 diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml index ba2d71c8f..630a2ef43 100644 --- a/scripts/clippy_wasm/clippy.toml +++ b/scripts/clippy_wasm/clippy.toml @@ -6,7 +6,7 @@ # ----------------------------------------------------------------------------- # Section identical to the root clippy.toml: -msrv = "1.92" +msrv = "1.95" allow-unwrap-in-tests = true diff --git a/tests/test_background_logic/Cargo.toml b/tests/test_background_logic/Cargo.toml index 92985d5ee..58f4ca396 100644 --- a/tests/test_background_logic/Cargo.toml +++ b/tests/test_background_logic/Cargo.toml @@ -3,7 +3,7 @@ name = "test_background_logic" version = "0.1.0" license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/tests/test_egui_extras_compilation/Cargo.toml b/tests/test_egui_extras_compilation/Cargo.toml index 3e1d166f7..211cbeef3 100644 --- a/tests/test_egui_extras_compilation/Cargo.toml +++ b/tests/test_egui_extras_compilation/Cargo.toml @@ -3,7 +3,7 @@ name = "test_egui_extras_compilation" version = "0.1.0" license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/tests/test_inline_glow_paint/Cargo.toml b/tests/test_inline_glow_paint/Cargo.toml index 6aa9428e4..530d74b53 100644 --- a/tests/test_inline_glow_paint/Cargo.toml +++ b/tests/test_inline_glow_paint/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/tests/test_size_pass/Cargo.toml b/tests/test_size_pass/Cargo.toml index 56e2c7f47..d103cb013 100644 --- a/tests/test_size_pass/Cargo.toml +++ b/tests/test_size_pass/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/tests/test_ui_stack/Cargo.toml b/tests/test_ui_stack/Cargo.toml index ec1b17689..bf6e942de 100644 --- a/tests/test_ui_stack/Cargo.toml +++ b/tests/test_ui_stack/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Antoine Beyeler "] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/tests/test_viewports/Cargo.toml b/tests/test_viewports/Cargo.toml index 0c73b6d11..8ac547345 100644 --- a/tests/test_viewports/Cargo.toml +++ b/tests/test_viewports/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["konkitoman"] license = "MIT OR Apache-2.0" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" publish = false [lints] diff --git a/xtask/src/utils.rs b/xtask/src/utils.rs index f6bf09828..3eff50927 100644 --- a/xtask/src/utils.rs +++ b/xtask/src/utils.rs @@ -27,7 +27,7 @@ pub fn ask_to_run(mut cmd: Command, ask: bool, reason: &str) -> Result<(), DynEr let is_ci = env::var_os("CI").is_some() || env::var_os("TF_BUILD").is_some(); if ask && !is_ci { let mut buf = String::new(); - print!("The script is going to run: \n\n`{cmd:?}`\n\n To {reason}.\nProceed? [Y/n] ",); + print!("The script is going to run: \n\n`{cmd:?}`\n\n To {reason}.\nProceed? [Y/n] "); io::stdout().flush().unwrap(); io::stdin().read_line(&mut buf).unwrap(); match buf.trim().to_lowercase().as_ref() {