diff --git a/radicle-cob/src/test.rs b/radicle-cob/src/test.rs index 0e576506..2c1164d3 100644 --- a/radicle-cob/src/test.rs +++ b/radicle-cob/src/test.rs @@ -1,5 +1,5 @@ pub mod identity; -pub use identity::{Name, Person, Project, RemoteProject}; +pub use identity::{Person, Project, RemoteProject}; pub mod storage; pub use storage::Storage; diff --git a/radicle-fetch/src/git.rs b/radicle-fetch/src/git.rs index b84df9a7..eafe9330 100644 --- a/radicle-fetch/src/git.rs +++ b/radicle-fetch/src/git.rs @@ -17,6 +17,6 @@ pub(crate) mod oid { /// Convert from an [`Oid`] to an [`ObjectId`]. pub fn to_object_id(oid: Oid) -> ObjectId { - ObjectId::try_from(oid.as_bytes()).expect("invalid git-ext Oid") + ObjectId::from(oid.as_bytes()) } } diff --git a/radicle-fetch/src/refs.rs b/radicle-fetch/src/refs.rs index 0c8d84e8..f24ef3af 100644 --- a/radicle-fetch/src/refs.rs +++ b/radicle-fetch/src/refs.rs @@ -4,7 +4,6 @@ use radicle::crypto::PublicKey; use radicle::git::{self, Component, Namespaced, Oid, Qualified}; use thiserror::Error; -pub use radicle::git::refs::storage; pub use radicle::git::refs::storage::Special; use crate::git::refs::{Policy, Update}; diff --git a/radicle-node/src/test/environment.rs b/radicle-node/src/test/environment.rs index 9e7e17ed..c0716f25 100644 --- a/radicle-node/src/test/environment.rs +++ b/radicle-node/src/test/environment.rs @@ -373,7 +373,7 @@ impl NodeHandle { for line in io::BufReader::new(io::Cursor::new(&result.stdout)) .lines() - .flatten() + .map_while(Result::ok) { log::debug!(target: "test", "rad {cmd}: {line}"); } diff --git a/radicle-node/src/wire.rs b/radicle-node/src/wire.rs index 52db5727..de0d7512 100644 --- a/radicle-node/src/wire.rs +++ b/radicle-node/src/wire.rs @@ -280,8 +280,7 @@ impl Decode for PublicKey { fn decode(reader: &mut R) -> Result { let buf: [u8; 32] = Decode::decode(reader)?; - PublicKey::try_from(buf) - .map_err(|e| Error::Io(io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))) + Ok(PublicKey::from(buf)) } } diff --git a/radicle-term/src/editor.rs b/radicle-term/src/editor.rs index ae1b7bb1..df19d2b8 100644 --- a/radicle-term/src/editor.rs +++ b/radicle-term/src/editor.rs @@ -52,6 +52,7 @@ impl Editor { let mut file = fs::OpenOptions::new() .write(true) .create(true) + .truncate(true) .open(&self.path)?; if file.metadata()?.len() == 0 { diff --git a/radicle/src/cob/patch.rs b/radicle/src/cob/patch.rs index 30fec820..3e40d389 100644 --- a/radicle/src/cob/patch.rs +++ b/radicle/src/cob/patch.rs @@ -534,7 +534,7 @@ impl Patch { /// Get the merges. pub fn merges(&self) -> impl Iterator { - self.merges.iter().map(|(a, m)| (a, m)) + self.merges.iter() } /// Reference to the Git object containing the code on the latest revision. diff --git a/rust-toolchain b/rust-toolchain index bc8a6589..3245dca3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.74 +1.77