Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cargo_machete.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86
toolchain: 1.88
- name: Machete install
## The official cargo-machete action
uses: bnjbvr/cargo-machete@v0.9.1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deploy_web_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
# release:
# types: ["published"]


permissions:
contents: write # for committing to gh-pages branch

Expand Down Expand Up @@ -39,7 +38,7 @@ jobs:
with:
profile: minimal
target: wasm32-unknown-unknown
toolchain: 1.86.0
toolchain: 1.88.0
override: true

- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0
targets: wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v2
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0

- name: Install packages (Linux)
if: runner.os == 'Linux'
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0
targets: wasm32-unknown-unknown

- run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v2
with:
rust-version: "1.86.0"
rust-version: "1.88.0"
log-level: error
command: check
arguments: --target ${{ matrix.target }}
Expand All @@ -175,7 +175,7 @@ jobs:

- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0
targets: aarch64-linux-android

- name: Set up cargo cache
Expand All @@ -197,7 +197,7 @@ jobs:

- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0
targets: aarch64-apple-ios

- name: Set up cargo cache
Expand All @@ -217,7 +217,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
Expand All @@ -241,7 +241,7 @@ jobs:
lfs: true
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.86.0
toolchain: 1.88.0

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
Expand Down
17 changes: 7 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ members = [
[workspace.package]
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.86"
rust-version = "1.88"
version = "0.32.3"


Expand Down Expand Up @@ -163,8 +163,10 @@ disallowed_methods = "warn" # See clippy.toml
disallowed_names = "warn" # See clippy.toml
disallowed_script_idents = "warn" # See clippy.toml
disallowed_types = "warn" # See clippy.toml
doc_comment_double_space_linebreaks = "warn"
doc_link_with_quotes = "warn"
doc_markdown = "warn"
elidable_lifetime_names = "warn"
empty_enum = "warn"
empty_enum_variants_with_brackets = "warn"
empty_line_after_outer_attr = "warn"
Expand All @@ -184,6 +186,7 @@ fn_to_numeric_cast_any = "warn"
from_iter_instead_of_collect = "warn"
get_unwrap = "warn"
if_let_mutex = "warn"
ignore_without_reason = "warn"
implicit_clone = "warn"
implied_bounds_in_impls = "warn"
imprecise_flops = "warn"
Expand Down Expand Up @@ -216,12 +219,12 @@ manual_instant_elapsed = "warn"
manual_is_power_of_two = "warn"
manual_is_variant_and = "warn"
manual_let_else = "warn"
manual_midpoint = "warn" # NOTE `midpoint` is often a lot slower for floats, so we have our own `emath::fast_midpoint` function.
manual_ok_or = "warn"
manual_string_new = "warn"
map_err_ignore = "warn"
map_flatten = "warn"
match_bool = "warn"
match_on_vec_items = "warn"
match_same_arms = "warn"
match_wild_err_arm = "warn"
match_wildcard_for_single_variants = "warn"
Expand Down Expand Up @@ -267,6 +270,7 @@ semicolon_if_nothing_returned = "warn"
set_contains_or_insert = "warn"
single_char_pattern = "warn"
single_match_else = "warn"
single_option_map = "warn"
str_split_at_newline = "warn"
str_to_string = "warn"
string_add = "warn"
Expand All @@ -288,6 +292,7 @@ unimplemented = "warn"
uninhabited_references = "warn"
uninlined_format_args = "warn"
unnecessary_box_returns = "warn"
unnecessary_debug_formatting = "warn"
unnecessary_literal_bound = "warn"
unnecessary_safety_comment = "warn"
unnecessary_safety_doc = "warn"
Expand All @@ -307,14 +312,6 @@ verbose_file_reads = "warn"
wildcard_dependencies = "warn"
zero_sized_map_values = "warn"

# Enable these when we update MSRV:
# doc_comment_double_space_linebreaks = "warn"
# elidable_lifetime_names = "warn"
# ignore_without_reason = "warn"
# manual_midpoint = "warn" # NOTE `midpoint` is often a lot slower for floats, so we have our own `emath::fast_midpoint` function.
# single_option_map = "warn"
# unnecessary_debug_formatting = "warn"


# TODO(emilk): maybe enable more of these lints?
comparison_chain = "allow"
Expand Down
6 changes: 2 additions & 4 deletions clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# -----------------------------------------------------------------------------
# Section identical to scripts/clippy_wasm/clippy.toml:

msrv = "1.86"
msrv = "1.88"

allow-unwrap-in-tests = true

Expand All @@ -23,7 +23,7 @@ type-complexity-threshold = 350

# https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_macros
disallowed-macros = [
'dbg',
'std::dbg',
'std::unimplemented',

# TODO(emilk): consider forbidding these to encourage the use of proper log stream, and then explicitly allow legitimate uses
Expand Down Expand Up @@ -59,8 +59,6 @@ disallowed-types = [
"std::sync::Condvar",
# "std::sync::Once", # enabled for now as the `log_once` macro uses it internally

"ring::digest::SHA1_FOR_LEGACY_USE_ONLY", # SHA1 is cryptographically broken

"winit::dpi::LogicalSize", # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
"winit::dpi::LogicalPosition", # We do our own pixels<->point conversion, taking `egui_ctx.zoom_factor` into account
]
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! Try the live web demo: <https://www.egui.rs/#demo>. Read more about egui at <https://github.com/emilk/egui>.
//!
//! `egui` is in heavy development, with each new version having breaking changes.
//! You need to have rust 1.86.0 or later to use `egui`.
//! You need to have rust 1.88.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).
Expand Down
2 changes: 1 addition & 1 deletion crates/emath/src/smart_aim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fn simplest_digit_closed_range(min: i32, max: i32) -> i32 {
if min <= 5 && 5 <= max {
5
} else {
(min + max) / 2
min.midpoint(max)
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/confirm_exit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_3d_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_font/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_font_style/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["tami5 <kkharji@proton.me>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_keypad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Varphone Wong <varphone@qq.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_style/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "custom_style"
version = "0.1.0"
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_window_frame/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/external_eventloop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Will Brown <opensource@rebeagle.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/external_eventloop_async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Will Brown <opensource@rebeagle.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/file_dialog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_android/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

# `unsafe_code` is required for `#[no_mangle]`, disable workspace lints to workaround lint error.
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world_par/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Maxim Osipenko <maxim1999max@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world_simple/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/images/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Jan Procházka <github.com/jprochazk>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/keyboard_events/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Jose Palazon <jose@palako.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple_viewports/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
4 changes: 2 additions & 2 deletions examples/puffin_profiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[package.metadata.cargo-machete]
Expand All @@ -30,4 +30,4 @@ env_logger = { version = "0.10", default-features = false, features = [
log = { workspace = true }
puffin = "0.19"
puffin_http = "0.16"
profiling = {workspace = true, features = ["profile-with-puffin"] }
profiling = { workspace = true, features = ["profile-with-puffin"] }
2 changes: 1 addition & 1 deletion examples/screenshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = [
]
license = "MIT OR Apache-2.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
publish = false

[lints]
Expand Down
Loading