From 2fa86862e9d70add246d52fa75719be0f6a47df2 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 3 Oct 2024 11:22:41 +0200 Subject: [PATCH] Update to Rust 1.79 --- .github/workflows/rust.yml | 6 +++--- Cargo.toml | 11 ++++++++++- clippy.toml | 2 +- rust-toolchain | 2 +- scripts/clippy_wasm/clippy.toml | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 88bbf3e..8136cdc 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,7 +22,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: default - toolchain: 1.76.0 + toolchain: 1.79.0 override: true - name: Install packages (Linux) @@ -107,7 +107,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.76.0 + toolchain: 1.79.0 target: wasm32-unknown-unknown override: true components: clippy @@ -135,6 +135,6 @@ jobs: - uses: actions/checkout@v3 - uses: EmbarkStudios/cargo-deny-action@v1 with: - rust-version: "1.76.0" + rust-version: "1.79.0" log-level: warn command: check diff --git a/Cargo.toml b/Cargo.toml index b8a7f9b..7d679af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ name = "new_project_name" publish = false # TODO: set to `true` if you plan on publishing the crate readme = "README.md" repository = "https://github.com/rerun-io/new_repo_name" -rust-version = "1.76" +rust-version = "1.79" version = "0.1.0" [package.metadata.docs.rs] @@ -78,6 +78,7 @@ disallowed_types = "warn" # See clippy.toml doc_link_with_quotes = "warn" doc_markdown = "warn" empty_enum = "warn" +empty_enum_variants_with_brackets = "warn" enum_glob_use = "warn" equatable_if_let = "warn" exit = "warn" @@ -101,6 +102,8 @@ inefficient_to_string = "warn" infinite_loop = "warn" into_iter_without_iter = "warn" invalid_upcast_comparisons = "warn" +iter_filter_is_ok = "warn" +iter_filter_is_some = "warn" iter_not_returning_iterator = "warn" iter_on_empty_collections = "warn" iter_on_single_items = "warn" @@ -120,6 +123,7 @@ macro_use_imports = "warn" manual_assert = "warn" manual_clamp = "warn" manual_instant_elapsed = "warn" +manual_is_variant_and = "warn" manual_let_else = "warn" manual_ok_or = "warn" manual_string_new = "warn" @@ -138,6 +142,7 @@ missing_assert_message = "warn" missing_enforced_import_renames = "warn" missing_errors_doc = "warn" missing_safety_doc = "warn" +mixed_attributes_style = "warn" mut_mut = "warn" mutex_integer = "warn" needless_borrow = "warn" @@ -147,14 +152,17 @@ needless_pass_by_ref_mut = "warn" needless_pass_by_value = "warn" negative_feature_names = "warn" nonstandard_macro_braces = "warn" +option_as_ref_cloned = "warn" option_option = "warn" path_buf_push_overwrite = "warn" ptr_as_ptr = "warn" ptr_cast_constness = "warn" +pub_underscore_fields = "warn" pub_without_shorthand = "warn" rc_mutex = "warn" readonly_write_lock = "warn" redundant_type_annotations = "warn" +ref_as_ptr = "warn" ref_option_ref = "warn" rest_pat_in_fully_bound_structs = "warn" same_functions_in_if_condition = "warn" @@ -162,6 +170,7 @@ semicolon_if_nothing_returned = "warn" should_panic_without_expect = "warn" significant_drop_tightening = "warn" single_match_else = "warn" +str_split_at_newline = "warn" str_to_string = "warn" string_add = "warn" string_add_assign = "warn" diff --git a/clippy.toml b/clippy.toml index 9673121..7eefb49 100644 --- a/clippy.toml +++ b/clippy.toml @@ -5,7 +5,7 @@ # ----------------------------------------------------------------------------- # Section identical to scripts/clippy_wasm/clippy.toml: -msrv = "1.76" +msrv = "1.79" allow-unwrap-in-tests = true diff --git a/rust-toolchain b/rust-toolchain index ae5c85c..abcf8e6 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.76" # Avoid specifying a patch version here; see https://github.com/emilk/eframe_template/issues/145 +channel = "1.79" # Avoid specifying a patch version here; see https://github.com/emilk/eframe_template/issues/145 components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml index 5b7bf9d..bf9db45 100644 --- a/scripts/clippy_wasm/clippy.toml +++ b/scripts/clippy_wasm/clippy.toml @@ -8,7 +8,7 @@ # ----------------------------------------------------------------------------- # Section identical to the main clippy.toml: -msrv = "1.76" +msrv = "1.79" allow-unwrap-in-tests = true