From bc06ee0773efc0522483488c9cfef6cde86dbd94 Mon Sep 17 00:00:00 2001 From: Fintan Halpenny Date: Fri, 25 Aug 2023 09:02:27 +0100 Subject: [PATCH] nix: update to rust-1.72.0 Update the toolchain to rust-1.72.0. This brought with it a new clippy check for needless '#'s for string literals. However, this is a false positive and is being tracked here[[0]]. [0]: https://github.com/rust-lang/rust-clippy/issues/11402 Signed-off-by: Fintan Halpenny X-Clacks-Overhead: GNU Terry Pratchett --- nix/sources.json | 6 +++--- radicle-surf/t/src/diff.rs | 4 ++++ shell.nix | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 56dce4a..4de2a5a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "48f3d76f512c7267d82d84c5d3d156ad2b9a8d12", - "sha256": "1xivbqbixnk96pacb6ihcbhsmcm0cly7xbgpq2g8kwqf4sgxk2hi", + "rev": "673e2d3d2a3951adc6f5e3351c9fce6ad130baed", + "sha256": "1vgjkaikv8lwm3kmb4jbc96kxhdy38nmf1v4s7nmx6j4bd8pmlyd", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/48f3d76f512c7267d82d84c5d3d156ad2b9a8d12.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/673e2d3d2a3951adc6f5e3351c9fce6ad130baed.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/radicle-surf/t/src/diff.rs b/radicle-surf/t/src/diff.rs index ee95009..ffd6357 100644 --- a/radicle-surf/t/src/diff.rs +++ b/radicle-surf/t/src/diff.rs @@ -358,6 +358,10 @@ fn test_diff_serde() -> Result<(), Error> { Ok(()) } +// A possible false positive is being hit here for this clippy +// warning. Tracking issue: +// https://github.com/rust-lang/rust-clippy/issues/11402 +#[allow(clippy::needless_raw_string_hashes)] #[test] fn test_both_missing_eof_newline() { let buf = r#" diff --git a/shell.nix b/shell.nix index 86676e9..71ae45a 100644 --- a/shell.nix +++ b/shell.nix @@ -18,5 +18,6 @@ in lld ripgrep + rust-analyzer ]; }