Skip to content

Commit 510ed79

Browse files
committed
Update MSRV to 1.92
1 parent b756411 commit 510ed79

3 files changed

Lines changed: 61 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: 31 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,21 +70,24 @@ 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"
@@ -92,17 +96,21 @@ branches_sharing_code = "warn"
9296
char_lit_as_u8 = "warn"
9397
checked_conversions = "warn"
9498
clear_with_drain = "warn"
99+
clone_on_ref_ptr = "warn"
95100
cloned_instead_of_copied = "warn"
101+
coerce_container_to_any = "warn"
96102
dbg_macro = "warn"
97103
debug_assert_with_mut_call = "warn"
98104
default_union_representation = "warn"
99105
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
106+
disallowed_macros = "warn" # See clippy.toml
107+
disallowed_methods = "warn" # See clippy.toml
108+
disallowed_names = "warn" # See clippy.toml
109+
disallowed_script_idents = "warn" # See clippy.toml
110+
disallowed_types = "warn" # See clippy.toml
111+
doc_broken_link = "warn"
105112
doc_comment_double_space_linebreaks = "warn"
113+
doc_include_without_cfg = "warn"
106114
doc_link_with_quotes = "warn"
107115
doc_markdown = "warn"
108116
elidable_lifetime_names = "warn"
@@ -131,11 +139,11 @@ implied_bounds_in_impls = "warn"
131139
imprecise_flops = "warn"
132140
inconsistent_struct_constructor = "warn"
133141
index_refutable_slice = "warn"
134-
indexing_slicing = "warn"
135142
inefficient_to_string = "warn"
136143
infinite_loop = "warn"
137144
into_iter_without_iter = "warn"
138145
invalid_upcast_comparisons = "warn"
146+
ip_constant = "warn"
139147
iter_filter_is_ok = "warn"
140148
iter_filter_is_some = "warn"
141149
iter_not_returning_iterator = "warn"
@@ -144,6 +152,7 @@ iter_on_single_items = "warn"
144152
iter_over_hash_type = "warn"
145153
iter_without_into_iter = "warn"
146154
large_digit_groups = "warn"
155+
large_futures = "warn"
147156
large_include_file = "warn"
148157
large_stack_arrays = "warn"
149158
large_stack_frames = "warn"
@@ -190,6 +199,7 @@ non_zero_suggestions = "warn"
190199
nonstandard_macro_braces = "warn"
191200
option_as_ref_cloned = "warn"
192201
option_option = "warn"
202+
or_fun_call = "warn"
193203
path_buf_push_overwrite = "warn"
194204
pathbuf_init_then_push = "warn"
195205
precedence_bits = "warn"
@@ -208,6 +218,7 @@ ref_patterns = "warn"
208218
rest_pat_in_fully_bound_structs = "warn"
209219
return_and_then = "warn"
210220
same_functions_in_if_condition = "warn"
221+
self_only_used_in_recursion = "warn"
211222
semicolon_if_nothing_returned = "warn"
212223
set_contains_or_insert = "warn"
213224
should_panic_without_expect = "warn"
@@ -220,7 +231,6 @@ string_add = "warn"
220231
string_add_assign = "warn"
221232
string_lit_as_bytes = "warn"
222233
string_lit_chars_any = "warn"
223-
string_to_string = "warn"
224234
suspicious_command_arg_space = "warn"
225235
suspicious_xor_used_as_pow = "warn"
226236
todo = "warn"
@@ -230,7 +240,7 @@ trailing_empty_array = "warn"
230240
trait_duplication_in_bounds = "warn"
231241
transmute_ptr_to_ptr = "warn"
232242
tuple_array_conversions = "warn"
233-
unchecked_duration_subtraction = "warn"
243+
unchecked_time_subtraction = "warn"
234244
undocumented_unsafe_blocks = "warn"
235245
unimplemented = "warn"
236246
uninhabited_references = "warn"
@@ -245,6 +255,7 @@ unnecessary_semicolon = "warn"
245255
unnecessary_struct_initialization = "warn"
246256
unnecessary_wraps = "warn"
247257
unnested_or_patterns = "warn"
258+
unused_async = "warn"
248259
unused_peekable = "warn"
249260
unused_rounding = "warn"
250261
unused_self = "warn"
@@ -257,6 +268,12 @@ verbose_file_reads = "warn"
257268
wildcard_dependencies = "warn"
258269
wildcard_imports = "warn"
259270
zero_sized_map_values = "warn"
271+
cast_possible_wrap = "warn"
272+
comparison_chain = "warn"
260273

261-
manual_range_contains = "allow" # this is better on 'allow'
262-
map_unwrap_or = "allow" # this is better on 'allow'
274+
# These are meh:
275+
assigning_clones = "allow" # No please
276+
manual_range_contains = "allow" # this one is just worse imho
277+
map_unwrap_or = "allow" # so is this one
278+
self_named_module_files = "allow" # Disabled waiting on https://github.com/rust-lang/rust-clippy/issues/9602
279+
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)