66421f7 Update to Rust 1.70 — radicle-tui

Radicle terminal user interface

Update to Rust 1.70

Alexis Sellier committed 2 years ago

commit 66421f708899c4e1304b1c1bd31b8ad9152df65d
parent d6812310018ed60146287771d05b05b90bead207

3 files changed +7 -18

modified radicle-tui/src/app/page.rs

@@ -121,10 +121,7 @@ impl ViewPage for HomeView {

     fn subscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.subscribe(
             &Cid::Home(HomeCid::Navigation),
             Sub::new(
                 subscription::navigation_clause::<Cid, _>(),
                 SubClause::Always,
             ),
             Sub::new(subscription::navigation_clause(), SubClause::Always),
         )?;
         Ok(())

@@ -133,7 +130,7 @@ impl ViewPage for HomeView {

     fn unsubscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.unsubscribe(
             &Cid::Home(HomeCid::Navigation),
             subscription::navigation_clause::<Cid, _>(),
             subscription::navigation_clause(),
         )?;
         Ok(())

@@ -199,10 +196,7 @@ impl ViewPage for IssuePage {

     fn subscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.subscribe(
             &Cid::Home(HomeCid::Navigation),
             Sub::new(
                 subscription::navigation_clause::<Cid, _>(),
                 SubClause::Always,
             ),
             Sub::new(subscription::navigation_clause(), SubClause::Always),
         )?;
         Ok(())

@@ -211,7 +205,7 @@ impl ViewPage for IssuePage {

     fn unsubscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.unsubscribe(
             &Cid::Home(HomeCid::Navigation),
             subscription::navigation_clause::<Cid, _>(),
             subscription::navigation_clause(),
         )?;
         Ok(())

@@ -287,10 +281,7 @@ impl ViewPage for PatchView {

     fn subscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.subscribe(
             &Cid::Patch(PatchCid::Navigation),
             Sub::new(
                 subscription::navigation_clause::<Cid, _>(),
                 SubClause::Always,
             ),
             Sub::new(subscription::navigation_clause(), SubClause::Always),
         )?;
         Ok(())

@@ -299,7 +290,7 @@ impl ViewPage for PatchView {

     fn unsubscribe(&self, app: &mut Application<Cid, Message, NoUserEvent>) -> Result<()> {
         app.unsubscribe(
             &Cid::Patch(PatchCid::Navigation),
             subscription::navigation_clause::<Cid, _>(),
             subscription::navigation_clause(),
         )?;
         Ok(())

modified 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<Id, UserEvent>() -> SubEventClause<UserEvent>
 pub fn navigation_clause<UserEvent>() -> SubEventClause<UserEvent>
 where
     Id: Clone + Hash + Eq + PartialEq,
     UserEvent: Clone + Eq + PartialEq + PartialOrd,
 {
     SubEventClause::Keyboard(KeyEvent {

modified 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<Vec<(PatchId, Patch)>> {
     let proposed = Patches::open(repository)?
         .proposed()?
         .into_iter()
         .map(|(id, patch, _)| (id, patch))
         .collect();