From 4652f309b41c6a70b44b1fed0657e925940eb660 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Fri, 2 Jun 2023 14:40:44 +0200 Subject: [PATCH] Update to Rust 1.70 --- Cargo.lock | 1 - radicle-cli/src/commands/id.rs | 2 +- radicle-cli/src/terminal.rs | 2 +- radicle-cli/src/terminal/args.rs | 2 +- radicle-cli/src/terminal/patch.rs | 3 ++- radicle-node/src/address/store.rs | 2 +- radicle-term/Cargo.toml | 1 - radicle-term/src/ansi/paint.rs | 2 +- radicle-term/src/lib.rs | 10 ++-------- radicle-tui/src/app/page.rs | 21 ++++++--------------- radicle-tui/src/app/subscription.rs | 3 +-- radicle-tui/src/cob/patch.rs | 1 - radicle/src/cob/patch.rs | 1 - radicle/src/rad.rs | 2 -- rust-toolchain | 2 +- 15 files changed, 17 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c539452..6dd43d05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2164,7 +2164,6 @@ dependencies = [ "anstyle-query", "anyhow", "inquire", - "is-terminal", "libc", "once_cell", "pretty_assertions", diff --git a/radicle-cli/src/commands/id.rs b/radicle-cli/src/commands/id.rs index adc6060a..52329bb1 100644 --- a/radicle-cli/src/commands/id.rs +++ b/radicle-cli/src/commands/id.rs @@ -48,7 +48,7 @@ impl Metadata { let yaml = serde_yaml::to_string(&self)?; match term::Editor::new().edit(yaml)? { Some(meta) => Ok(serde_yaml::from_str(&meta).context("failed to parse proposal meta")?), - None => return Err(anyhow!("Operation aborted!")), + None => Err(anyhow!("Operation aborted!")), } } } diff --git a/radicle-cli/src/terminal.rs b/radicle-cli/src/terminal.rs index 1e3b4399..ae02ef93 100644 --- a/radicle-cli/src/terminal.rs +++ b/radicle-cli/src/terminal.rs @@ -55,7 +55,7 @@ where A: Args, C: Command anyhow::Result>, { - let args = std::env::args_os().into_iter().skip(1).collect(); + let args = std::env::args_os().skip(1).collect(); run_command_args(help, action, cmd, args) } diff --git a/radicle-cli/src/terminal/args.rs b/radicle-cli/src/terminal/args.rs index 2ab37b55..926eb604 100644 --- a/radicle-cli/src/terminal/args.rs +++ b/radicle-cli/src/terminal/args.rs @@ -33,7 +33,7 @@ pub struct Help { pub trait Args: Sized { fn from_env() -> anyhow::Result { - let args: Vec<_> = std::env::args_os().into_iter().skip(1).collect(); + let args: Vec<_> = std::env::args_os().skip(1).collect(); match Self::from_args(args) { Ok((opts, unparsed)) => { diff --git a/radicle-cli/src/terminal/patch.rs b/radicle-cli/src/terminal/patch.rs index fde98e07..03a3741a 100644 --- a/radicle-cli/src/terminal/patch.rs +++ b/radicle-cli/src/terminal/patch.rs @@ -1,4 +1,5 @@ use std::io; +use std::io::IsTerminal as _; use radicle::git; @@ -21,7 +22,7 @@ impl Message { pub fn get(self, help: &str) -> std::io::Result { let comment = match self { Message::Edit => { - if term::is_terminal(&io::stderr()) { + if io::stderr().is_terminal() { term::Editor::new().extension("markdown").edit(help)? } else { Some(help.to_owned()) diff --git a/radicle-node/src/address/store.rs b/radicle-node/src/address/store.rs index 96de4ac2..be7c904f 100644 --- a/radicle-node/src/address/store.rs +++ b/radicle-node/src/address/store.rs @@ -533,7 +533,7 @@ mod test { .unwrap(); } - let mut actual = cache.entries().unwrap().into_iter().collect::>(); + let mut actual = cache.entries().unwrap().collect::>(); actual.sort_by_key(|(i, _)| *i); expected.sort_by_key(|(i, _)| *i); diff --git a/radicle-term/Cargo.toml b/radicle-term/Cargo.toml index 9bf6f519..5c93e980 100644 --- a/radicle-term/Cargo.toml +++ b/radicle-term/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] anyhow = { version = "1" } anstyle-query = { version = "1.0.0" } -is-terminal = { version = "0.4.4" } inquire = { version = "0.6", default-features = false, features = ["termion", "editor"] } libc = { version = "0.2" } once_cell = { version = "1.13" } diff --git a/radicle-term/src/ansi/paint.rs b/radicle-term/src/ansi/paint.rs index 832baba2..e6fd86b5 100644 --- a/radicle-term/src/ansi/paint.rs +++ b/radicle-term/src/ansi/paint.rs @@ -1,8 +1,8 @@ +use std::io::IsTerminal as _; use std::sync; use std::sync::atomic::AtomicBool; use std::{fmt, io}; -use is_terminal::IsTerminal; use unicode_width::UnicodeWidthStr; use super::color::Color; diff --git a/radicle-term/src/lib.rs b/radicle-term/src/lib.rs index c1798597..950fac3a 100644 --- a/radicle-term/src/lib.rs +++ b/radicle-term/src/lib.rs @@ -20,25 +20,19 @@ pub use element::{Element, Line, Max, Size}; pub use hstack::HStack; pub use inquire::ui::Styled; pub use io::*; -pub use is_terminal::is_terminal; pub use label::{label, Label}; pub use spinner::{spinner, spinner_to, Spinner}; pub use table::Table; pub use textarea::{textarea, TextArea}; pub use vstack::{VStack, VStackOptions}; -#[derive(Debug, PartialEq, Eq, Copy, Clone)] +#[derive(Debug, PartialEq, Eq, Copy, Clone, Default)] pub enum Interactive { Yes, + #[default] No, } -impl Default for Interactive { - fn default() -> Self { - Interactive::No - } -} - impl Interactive { pub fn yes(&self) -> bool { (*self).into() diff --git a/radicle-tui/src/app/page.rs b/radicle-tui/src/app/page.rs index b32bccb8..9615dfbb 100644 --- a/radicle-tui/src/app/page.rs +++ b/radicle-tui/src/app/page.rs @@ -121,10 +121,7 @@ impl ViewPage for HomeView { fn subscribe(&self, app: &mut Application) -> Result<()> { app.subscribe( &Cid::Home(HomeCid::Navigation), - Sub::new( - subscription::navigation_clause::(), - SubClause::Always, - ), + Sub::new(subscription::navigation_clause(), SubClause::Always), )?; Ok(()) @@ -133,7 +130,7 @@ impl ViewPage for HomeView { fn unsubscribe(&self, app: &mut Application) -> Result<()> { app.unsubscribe( &Cid::Home(HomeCid::Navigation), - subscription::navigation_clause::(), + subscription::navigation_clause(), )?; Ok(()) @@ -199,10 +196,7 @@ impl ViewPage for IssuePage { fn subscribe(&self, app: &mut Application) -> Result<()> { app.subscribe( &Cid::Home(HomeCid::Navigation), - Sub::new( - subscription::navigation_clause::(), - SubClause::Always, - ), + Sub::new(subscription::navigation_clause(), SubClause::Always), )?; Ok(()) @@ -211,7 +205,7 @@ impl ViewPage for IssuePage { fn unsubscribe(&self, app: &mut Application) -> Result<()> { app.unsubscribe( &Cid::Home(HomeCid::Navigation), - subscription::navigation_clause::(), + subscription::navigation_clause(), )?; Ok(()) @@ -287,10 +281,7 @@ impl ViewPage for PatchView { fn subscribe(&self, app: &mut Application) -> Result<()> { app.subscribe( &Cid::Patch(PatchCid::Navigation), - Sub::new( - subscription::navigation_clause::(), - SubClause::Always, - ), + Sub::new(subscription::navigation_clause(), SubClause::Always), )?; Ok(()) @@ -299,7 +290,7 @@ impl ViewPage for PatchView { fn unsubscribe(&self, app: &mut Application) -> Result<()> { app.unsubscribe( &Cid::Patch(PatchCid::Navigation), - subscription::navigation_clause::(), + subscription::navigation_clause(), )?; Ok(()) diff --git a/radicle-tui/src/app/subscription.rs b/radicle-tui/src/app/subscription.rs index 2442873b..32a0153c 100644 --- a/radicle-tui/src/app/subscription.rs +++ b/radicle-tui/src/app/subscription.rs @@ -3,9 +3,8 @@ use std::hash::Hash; use tuirealm::event::{Key, KeyEvent, KeyModifiers}; use tuirealm::{Sub, SubClause, SubEventClause}; -pub fn navigation_clause() -> SubEventClause +pub fn navigation_clause() -> SubEventClause where - Id: Clone + Hash + Eq + PartialEq, UserEvent: Clone + Eq + PartialEq + PartialOrd, { SubEventClause::Keyboard(KeyEvent { diff --git a/radicle-tui/src/cob/patch.rs b/radicle-tui/src/cob/patch.rs index dab7ae11..f29992a0 100644 --- a/radicle-tui/src/cob/patch.rs +++ b/radicle-tui/src/cob/patch.rs @@ -18,7 +18,6 @@ pub fn load_all(profile: &Profile, id: Id) -> Vec<(PatchId, Patch)> { pub fn load_proposed(repository: &Repository) -> Result> { let proposed = Patches::open(repository)? .proposed()? - .into_iter() .map(|(id, patch, _)| (id, patch)) .collect(); diff --git a/radicle/src/cob/patch.rs b/radicle/src/cob/patch.rs index 090fd62b..ccf2ecbf 100644 --- a/radicle/src/cob/patch.rs +++ b/radicle/src/cob/patch.rs @@ -1231,7 +1231,6 @@ impl<'a> Patches<'a> { let result = self .all()? - .into_iter() .filter_map(|result| result.ok()) .find_map(|(p_id, p, _)| p.revision(id).map(|r| (p_id, p.clone(), r.clone()))); Ok(result) diff --git a/radicle/src/rad.rs b/radicle/src/rad.rs index adf0d829..dfa4ed42 100644 --- a/radicle/src/rad.rs +++ b/radicle/src/rad.rs @@ -474,14 +474,12 @@ mod tests { copy.find_remote(&REMOTE_NAME) .unwrap() .refspecs() - .into_iter() .map(|r| r.bytes().to_vec()) .collect::>(), original .find_remote(&REMOTE_NAME) .unwrap() .refspecs() - .into_iter() .map(|r| r.bytes().to_vec()) .collect::>(), ); diff --git a/rust-toolchain b/rust-toolchain index 9ebd7af3..bfe79d0b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.67 +1.70