Skip to content

Commit 8b06996

Browse files
authored
Update MSRV to 1.92 (#219)
In preparation for egui 0.34
1 parent b756411 commit 8b06996

3 files changed

Lines changed: 60 additions & 44 deletions

File tree

.github/workflows/rust.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- uses: actions-rs/toolchain@v1
9595
with:
9696
profile: minimal
97-
toolchain: 1.88.0
97+
toolchain: 1.92.0
9898
target: wasm32-unknown-unknown
9999
override: true
100100
- name: Download and install Trunk binary
@@ -108,38 +108,38 @@ jobs:
108108
fail-fast: false
109109
matrix:
110110
include:
111-
- os: macos-latest
112-
TARGET: aarch64-apple-darwin
111+
- os: macos-latest
112+
TARGET: aarch64-apple-darwin
113113

114-
- os: macos-latest
115-
TARGET: x86_64-apple-darwin
114+
- os: macos-latest
115+
TARGET: x86_64-apple-darwin
116116

117-
- os: ubuntu-latest
118-
TARGET: arm-unknown-linux-musleabihf
117+
- os: ubuntu-latest
118+
TARGET: arm-unknown-linux-musleabihf
119119

120-
- os: ubuntu-latest
121-
TARGET: armv7-unknown-linux-musleabihf
120+
- os: ubuntu-latest
121+
TARGET: armv7-unknown-linux-musleabihf
122122

123-
- os: ubuntu-latest
124-
TARGET: x86_64-unknown-linux-musl
123+
- os: ubuntu-latest
124+
TARGET: x86_64-unknown-linux-musl
125125

126-
- os: windows-latest
127-
TARGET: x86_64-pc-windows-msvc
128-
EXTENSION: .exe
126+
- os: windows-latest
127+
TARGET: x86_64-pc-windows-msvc
128+
EXTENSION: .exe
129129

130130
steps:
131-
- name: Building ${{ matrix.TARGET }}
132-
run: echo "${{ matrix.TARGET }}"
133-
134-
- uses: actions/checkout@master
135-
- uses: actions-rs/toolchain@v1.0.1
136-
with:
137-
toolchain: stable
138-
target: ${{ matrix.TARGET }}
139-
override: true
140-
141-
- uses: actions-rs/cargo@v1
142-
with:
143-
use-cross: true
144-
command: build
145-
args: --verbose --release --target=${{ matrix.TARGET }}
131+
- name: Building ${{ matrix.TARGET }}
132+
run: echo "${{ matrix.TARGET }}"
133+
134+
- uses: actions/checkout@master
135+
- uses: actions-rs/toolchain@v1.0.1
136+
with:
137+
toolchain: stable
138+
target: ${{ matrix.TARGET }}
139+
override: true
140+
141+
- uses: actions-rs/cargo@v1
142+
with:
143+
use-cross: true
144+
command: build
145+
args: --verbose --release --target=${{ matrix.TARGET }}

Cargo.toml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name = "eframe_template"
33
version = "0.1.0"
44
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
55
edition = "2024"
6+
license = "MIT OR Apache-2.0"
67
include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
7-
rust-version = "1.88"
8+
rust-version = "1.92"
89

910
[package.metadata.docs.rs]
1011
all-features = true
@@ -69,40 +70,49 @@ rust_2018_idioms = { level = "warn", priority = -1 }
6970
rust_2021_prelude_collisions = "warn"
7071
semicolon_in_expressions_from_macros = "warn"
7172
trivial_numeric_casts = "warn"
72-
unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
73+
unexpected_cfgs = "warn"
74+
unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
7375
unused_extern_crates = "warn"
7476
unused_import_braces = "warn"
7577
unused_lifetimes = "warn"
7678

7779
trivial_casts = "allow"
7880
unused_qualifications = "allow"
7981

80-
8182
[workspace.lints.rustdoc]
8283
all = "warn"
84+
broken_intra_doc_links = "warn"
8385
missing_crate_level_docs = "warn"
8486

85-
87+
# See also clippy.toml
8688
[workspace.lints.clippy]
89+
all = { level = "warn", priority = -1 }
90+
8791
allow_attributes = "warn"
8892
as_ptr_cast_mut = "warn"
8993
await_holding_lock = "warn"
9094
bool_to_int_with_if = "warn"
9195
branches_sharing_code = "warn"
96+
cast_possible_wrap = "warn"
9297
char_lit_as_u8 = "warn"
9398
checked_conversions = "warn"
9499
clear_with_drain = "warn"
100+
clone_on_ref_ptr = "warn"
95101
cloned_instead_of_copied = "warn"
102+
coerce_container_to_any = "warn"
103+
comparison_chain = "warn"
96104
dbg_macro = "warn"
97105
debug_assert_with_mut_call = "warn"
98106
default_union_representation = "warn"
99107
derive_partial_eq_without_eq = "warn"
100-
disallowed_macros = "warn" # See clippy.toml
101-
disallowed_methods = "warn" # See clippy.toml
102-
disallowed_names = "warn" # See clippy.toml
103-
disallowed_script_idents = "warn" # See clippy.toml
104-
disallowed_types = "warn" # See clippy.toml
108+
disallowed_macros = "warn" # See clippy.toml
109+
disallowed_methods = "warn" # See clippy.toml
110+
disallowed_names = "warn" # See clippy.toml
111+
disallowed_script_idents = "warn" # See clippy.toml
112+
disallowed_types = "warn" # See clippy.toml
113+
doc_broken_link = "warn"
105114
doc_comment_double_space_linebreaks = "warn"
115+
doc_include_without_cfg = "warn"
106116
doc_link_with_quotes = "warn"
107117
doc_markdown = "warn"
108118
elidable_lifetime_names = "warn"
@@ -131,11 +141,11 @@ implied_bounds_in_impls = "warn"
131141
imprecise_flops = "warn"
132142
inconsistent_struct_constructor = "warn"
133143
index_refutable_slice = "warn"
134-
indexing_slicing = "warn"
135144
inefficient_to_string = "warn"
136145
infinite_loop = "warn"
137146
into_iter_without_iter = "warn"
138147
invalid_upcast_comparisons = "warn"
148+
ip_constant = "warn"
139149
iter_filter_is_ok = "warn"
140150
iter_filter_is_some = "warn"
141151
iter_not_returning_iterator = "warn"
@@ -144,6 +154,7 @@ iter_on_single_items = "warn"
144154
iter_over_hash_type = "warn"
145155
iter_without_into_iter = "warn"
146156
large_digit_groups = "warn"
157+
large_futures = "warn"
147158
large_include_file = "warn"
148159
large_stack_arrays = "warn"
149160
large_stack_frames = "warn"
@@ -190,6 +201,7 @@ non_zero_suggestions = "warn"
190201
nonstandard_macro_braces = "warn"
191202
option_as_ref_cloned = "warn"
192203
option_option = "warn"
204+
or_fun_call = "warn"
193205
path_buf_push_overwrite = "warn"
194206
pathbuf_init_then_push = "warn"
195207
precedence_bits = "warn"
@@ -208,6 +220,7 @@ ref_patterns = "warn"
208220
rest_pat_in_fully_bound_structs = "warn"
209221
return_and_then = "warn"
210222
same_functions_in_if_condition = "warn"
223+
self_only_used_in_recursion = "warn"
211224
semicolon_if_nothing_returned = "warn"
212225
set_contains_or_insert = "warn"
213226
should_panic_without_expect = "warn"
@@ -220,7 +233,6 @@ string_add = "warn"
220233
string_add_assign = "warn"
221234
string_lit_as_bytes = "warn"
222235
string_lit_chars_any = "warn"
223-
string_to_string = "warn"
224236
suspicious_command_arg_space = "warn"
225237
suspicious_xor_used_as_pow = "warn"
226238
todo = "warn"
@@ -230,7 +242,7 @@ trailing_empty_array = "warn"
230242
trait_duplication_in_bounds = "warn"
231243
transmute_ptr_to_ptr = "warn"
232244
tuple_array_conversions = "warn"
233-
unchecked_duration_subtraction = "warn"
245+
unchecked_time_subtraction = "warn"
234246
undocumented_unsafe_blocks = "warn"
235247
unimplemented = "warn"
236248
uninhabited_references = "warn"
@@ -245,6 +257,7 @@ unnecessary_semicolon = "warn"
245257
unnecessary_struct_initialization = "warn"
246258
unnecessary_wraps = "warn"
247259
unnested_or_patterns = "warn"
260+
unused_async = "warn"
248261
unused_peekable = "warn"
249262
unused_rounding = "warn"
250263
unused_self = "warn"
@@ -258,5 +271,8 @@ wildcard_dependencies = "warn"
258271
wildcard_imports = "warn"
259272
zero_sized_map_values = "warn"
260273

261-
manual_range_contains = "allow" # this is better on 'allow'
262-
map_unwrap_or = "allow" # this is better on 'allow'
274+
assigning_clones = "allow" # No please
275+
manual_range_contains = "allow" # this one is just worse imho
276+
map_unwrap_or = "allow" # so is this one
277+
self_named_module_files = "allow" # Disabled waiting on https://github.com/rust-lang/rust-clippy/issues/9602
278+
significant_drop_tightening = "allow" # Too many false positives

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
66

77
[toolchain]
8-
channel = "1.88" # Avoid specifying a patch version here; see https://github.com/emilk/eframe_template/issues/145
8+
channel = "1.92.0"
99
components = [ "rustfmt", "clippy" ]
1010
targets = [ "wasm32-unknown-unknown" ]

0 commit comments

Comments
 (0)