From d13f47b2a47383f92cf9817478d256355646a9f3 Mon Sep 17 00:00:00 2001 From: cloudhead Date: Wed, 9 Aug 2023 18:49:13 +0200 Subject: [PATCH] Update toolchain to Rust 1.71 --- radicle-term/src/element.rs | 6 +++--- radicle/src/canonical/formatter.rs | 4 ++-- radicle/src/storage/git/transport/remote/mock.rs | 2 +- rust-toolchain | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/radicle-term/src/element.rs b/radicle-term/src/element.rs index 6fee187e..cc233bb6 100644 --- a/radicle-term/src/element.rs +++ b/radicle-term/src/element.rs @@ -59,15 +59,15 @@ impl<'a> Element for Box { impl Element for &T { fn size(&self) -> Size { - self.deref().size() + (*self).size() } fn render(&self) -> Vec { - self.deref().render() + (*self).render() } fn print(&self) { - self.deref().print() + (*self).print() } } diff --git a/radicle/src/canonical/formatter.rs b/radicle/src/canonical/formatter.rs index f9429d81..1c3e014b 100644 --- a/radicle/src/canonical/formatter.rs +++ b/radicle/src/canonical/formatter.rs @@ -217,13 +217,13 @@ impl Formatter for CanonicalFormatter { } fn begin_object_key(&mut self, _writer: &mut W, _first: bool) -> Result<()> { - let mut object = self.obj_mut()?; + let object = self.obj_mut()?; object.key_done = false; Ok(()) } fn end_object_key(&mut self, _writer: &mut W) -> Result<()> { - let mut object = self.obj_mut()?; + let object = self.obj_mut()?; object.key_done = true; Ok(()) } diff --git a/radicle/src/storage/git/transport/remote/mock.rs b/radicle/src/storage/git/transport/remote/mock.rs index a7bbb12e..aef3b006 100644 --- a/radicle/src/storage/git/transport/remote/mock.rs +++ b/radicle/src/storage/git/transport/remote/mock.rs @@ -85,7 +85,7 @@ pub fn register(node: &RemoteId, path: &Path) { REGISTER.call_once(|| unsafe { git2::transport::register(Url::SCHEME, move |remote| { - git2::transport::Transport::smart(remote, false, MockTransport::default()) + git2::transport::Transport::smart(remote, false, MockTransport) }) .expect("transport registration is successful"); }); diff --git a/rust-toolchain b/rust-toolchain index bfe79d0b..12816e62 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.70 +1.71