From 518d0c9cf33b974bff4bf194f9258ab89532dd65 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 21 May 2024 20:36:04 -0700 Subject: [PATCH] update the rust toolchain, ignore new lints I will fix them in follow-up commits. Also apparently rustc doesn't warn you when you pass it lints that don't exist (yet) so that's annoying. --- Cargo.toml | 15 +++++++++++++-- flake.nix | 2 +- rust-toolchain.toml | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 71b49f31..3d2ae5ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,9 @@ unused_extern_crates = "warn" unused_import_braces = "warn" unused_lifetimes = "warn" unused_macro_rules = "warn" -unused_qualifications = "warn" + +dead_code = "allow" +unused_qualifications = "allow" [workspace.lints.clippy] # Groups. Keep alphabetically sorted @@ -72,6 +74,15 @@ wildcard_dependencies = "warn" missing_errors_doc = "allow" missing_panics_doc = "allow" +assigning_clones = "allow" +doc_markdown = "allow" +manual_is_variant_and = "allow" +mixed_attributes_style = "allow" +multiple_bound_locations = "allow" +option_as_ref_cloned = "allow" +thread_local_initializer_can_be_made_const = "allow" +unnecessary_to_owned = "allow" + [package] name = "grapevine" description = "A Matrix homeserver written in Rust" @@ -80,7 +91,7 @@ version = "0.1.0" edition = "2021" # See also `rust-toolchain.toml` -rust-version = "1.75.0" +rust-version = "1.78.0" [lints] workspace = true diff --git a/flake.nix b/flake.nix index 92ec8434..69e6194d 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ file = ./rust-toolchain.toml; # See also `rust-toolchain.toml` - sha256 = "sha256-SXRtAuO4IqNOQq+nLbrsDFbVk+3aVA8NNpSZsKlVH/8="; + sha256 = "sha256-opUgs6ckUQCyDxcB9Wy51pqhd0MPGHUVbwRKKPGiwZU="; }; }); in diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9dda51a6..19939854 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -9,7 +9,7 @@ # If you're having trouble making the relevant changes, bug a maintainer. [toolchain] -channel = "1.75.0" +channel = "1.78.0" components = [ # For rust-analyzer "rust-src",