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
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: rust-docs, clippy, rustfmt
toolchain: 1.90.0
toolchain: 1.92.0
override: true

- name: Install packages (Linux)
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.90.0
toolchain: 1.92.0
override: true
target: wasm32-unknown-unknown
components: clippy,rustfmt
Expand All @@ -102,6 +102,6 @@ jobs:
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@v2
with:
rust-version: "1.90.0"
rust-version: "1.92.0"
log-level: warn
command: check
7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
keywords = [] # TODO: fill in if you plan on publishing the crate
license = "MIT OR Apache-2.0"
repository = "https://github.com/rerun-io/new_repo_name"
rust-version = "1.90.0"
rust-version = "1.92.0"


[workspace.dependencies]
Expand Down Expand Up @@ -65,6 +65,7 @@ clear_with_drain = "warn"
clone_on_ref_ptr = "warn"
cloned_instead_of_copied = "warn"
coerce_container_to_any = "warn"
comparison_chain = "warn"
dbg_macro = "warn"
debug_assert_with_mut_call = "warn"
default_union_representation = "warn"
Expand All @@ -74,6 +75,7 @@ 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_broken_link = "warn"
doc_comment_double_space_linebreaks = "warn"
doc_include_without_cfg = "warn"
doc_link_with_quotes = "warn"
Expand Down Expand Up @@ -184,6 +186,7 @@ ref_patterns = "warn"
rest_pat_in_fully_bound_structs = "warn"
return_and_then = "warn"
same_functions_in_if_condition = "warn"
self_only_used_in_recursion = "warn"
semicolon_if_nothing_returned = "warn"
set_contains_or_insert = "warn"
should_panic_without_expect = "warn"
Expand All @@ -205,7 +208,7 @@ trailing_empty_array = "warn"
trait_duplication_in_bounds = "warn"
transmute_ptr_to_ptr = "warn"
tuple_array_conversions = "warn"
unchecked_duration_subtraction = "warn"
unchecked_time_subtraction = "warn"
undocumented_unsafe_blocks = "warn"
unimplemented = "warn"
uninhabited_references = "warn"
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# -----------------------------------------------------------------------------
# Section identical to scripts/clippy_wasm/clippy.toml:

msrv = "1.90.0"
msrv = "1.92.0"

allow-unwrap-in-tests = true

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".

[toolchain]
channel = "1.90.0" # Avoid specifying a patch version here; see https://github.com/emilk/eframe_template/issues/145
channel = "1.92.0" # Avoid specifying a patch version here; see https://github.com/emilk/eframe_template/issues/145
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]
2 changes: 1 addition & 1 deletion scripts/clippy_wasm/clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# -----------------------------------------------------------------------------
# Section identical to the main clippy.toml:

msrv = "1.90.0"
msrv = "1.92.0"

allow-unwrap-in-tests = true

Expand Down Expand Up @@ -37,12 +37,12 @@
{ path = "poll_promise::Promise::block_until_ready_mut", reason = "Cannot block on Web" },
{ path = "poll_promise::Promise::block_until_ready", reason = "Cannot block on Web" },
{ path = "rayon::spawn", reason = "Cannot spawn threads on wasm" },
{ path = "std::sync::mpsc::Receiver::into_iter", reason = "Cannot block on Web" },

Check warning on line 40 in scripts/clippy_wasm/clippy.toml

View workflow job for this annotation

GitHub Actions / Check wasm32

`std::sync::mpsc::Receiver::into_iter` does not refer to a reachable function
{ path = "std::sync::mpsc::Receiver::iter", reason = "Cannot block on Web" },
{ path = "std::sync::mpsc::Receiver::recv_timeout", reason = "Cannot block on Web" },
{ path = "std::sync::mpsc::Receiver::recv", reason = "Cannot block on Web" },
{ path = "std::thread::spawn", reason = "Cannot spawn threads on wasm" },
{ path = "std::time::Duration::elapsed", reason = "use `web-time` crate instead for wasm/web compatibility" },

Check warning on line 45 in scripts/clippy_wasm/clippy.toml

View workflow job for this annotation

GitHub Actions / Check wasm32

`std::time::Duration::elapsed` does not refer to a reachable function
{ path = "std::time::Instant::now", reason = "use `web-time` crate instead for wasm/web compatibility" },
{ path = "std::time::SystemTime::now", reason = "use `web-time` or `time` crates instead for wasm/web compatibility" },
]
Expand Down
Loading