Fintan Halpenny: 1 nix: rust-1.62 update 2 files changed, 11 insertions(+), 11 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~radicle-link/dev/patches/33458/mbox | git am -3Learn more about email & git
Rust 1.62 has been announced[0]. Update the niv sources to run the latest stable, fixing the new clippy suggestions for using `write!`/`writeln!`. [0]: https://blog.rust-lang.org/2022/06/30/Rust-1.62.0.html Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com> --- Published-as: https://github.com/FintanH/radicle-link/tree/patches/nix%2Frust-1.62%2Fv1 cli/gitd-lib/src/hooks/progress.rs | 10 +++++----- nix/sources.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cli/gitd-lib/src/hooks/progress.rs b/cli/gitd-lib/src/hooks/progress.rs index 93e645c9..37b2e3ed 100644 --- a/cli/gitd-lib/src/hooks/progress.rs +++ b/cli/gitd-lib/src/hooks/progress.rs @@ -3,7 +3,7 @@ // This file is part of radicle-link, distributed under the GPLv3 with Radicle // Linking Exception. For full terms see the included LICENSE file. -use std::fmt; +use std::fmt::{self, Write as _}; use git_ref_format::{name, Component, RefString}; use librad::{ @@ -76,7 +76,7 @@ impl<'a> From<Namespaced<'a, request_pull::Success>> for Progress { for updated in &ns.payload.refs { let name = updated.name.strip_prefix(&prefix).unwrap_or(&updated.name); let target = updated.oid; - progress.push_str(&format!("+{name}->{target}\n")) + let _ = writeln!(progress, "+{name}->{target}"); } } @@ -85,7 +85,7 @@ impl<'a> From<Namespaced<'a, request_pull::Success>> for Progress { progress.push_str("pruned references:\n"); for pruned in &ns.payload.pruned { let name = pruned.strip_prefix(&prefix).unwrap_or(pruned); - progress.push_str(&format!("-{name}\n")); + let _ = writeln!(progress, "-{name}"); } } @@ -168,7 +168,7 @@ impl<'a> From<Namespaced<'a, replication::Success>> for Progress { progress.push('\n'); progress.push_str("storage validation errors:\n"); for error in errors { - progress.push_str(&format!("{}\n", error)); + let _ = writeln!(progress, "{}", error); } } @@ -177,7 +177,7 @@ impl<'a> From<Namespaced<'a, replication::Success>> for Progress { progress.push('\n'); progress.push_str("new identities discovered:\n"); for urn in urns { - progress.push_str(&format!("{}\n", *urn)); + let _ = writeln!(progress, "{}", *urn); } } diff --git a/nix/sources.json b/nix/sources.json index 6502459c..3004b521 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab19261c41b8fbf830d2dba5453ea50cddbb98a2", - "sha256": "01mildfm5nmnvkz9yb0pqfc29az9r3cl88qwgxv4vivz8jwjk5ib", + "rev": "399c514226ac48d7855838d0777f47f2fa59730a", + "sha256": "0c1nka1sxfprf457wapk5pydbfxbspjblys44d2kxfkczad246v5", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/ab19261c41b8fbf830d2dba5453ea50cddbb98a2.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/399c514226ac48d7855838d0777f47f2fa59730a.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "rust-overlay": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6ae180c1af192475b29e269f10d9da2d5abec4f0", - "sha256": "03s2bz2fcw2v0a26kmr5vqi3b9wmrl79vhaccpbyp3d3ygj68d79", + "rev": "8b4c5bef319198920fd03a916dd5f6600147358b", + "sha256": "1mvaqkjrxqgvpqja8qa33r8vb59q8hwyh1y3sg3nqxh1lvsw63n6", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/6ae180c1af192475b29e269f10d9da2d5abec4f0.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/8b4c5bef319198920fd03a916dd5f6600147358b.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } -- 2.31.1
Alex Good <alex@memoryandthought.me>LGTM
builds.sr.ht <builds@sr.ht>radicle-link/patches/nixos-latest.yml: FAILED in 28m7s [nix: rust-1.62 update][0] from [Fintan Halpenny][1] [0]: https://lists.sr.ht/~radicle-link/dev/patches/33458 [1]: mailto:fintan.halpenny@gmail.com ✗ #792157 FAILED radicle-link/patches/nixos-latest.yml https://builds.sr.ht/~radicle-link/job/792157