From c04539992071b3ab3134a4cf5e5e26688c48dc94 Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Thu, 11 Aug 2022 21:34:16 +0200
Subject: [PATCH] Update to rust 1.63

Signed-off-by: Alexis Sellier <self@cloudhead.io>
---
 .github/workflows/actions.yml     | 2 +-
 common/src/cobs/patch.rs          | 2 +-
 common/src/ethereum/governance.rs | 2 +-
 common/src/identity.rs            | 2 +-
 common/src/project.rs             | 2 +-
 reward/src/lib.rs                 | 2 +-
 rust-toolchain                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 196b9df8..f878f495 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           profile: minimal
           components: clippy, rustfmt
-          toolchain: stable
+          toolchain: 1.63
       - name: Run clippy
         uses: actions-rs/cargo@v1
         with:
diff --git a/common/src/cobs/patch.rs b/common/src/cobs/patch.rs
index 919e4a73..3a99d22f 100644
--- a/common/src/cobs/patch.rs
+++ b/common/src/cobs/patch.rs
@@ -247,7 +247,7 @@ impl<'a> PatchStore<'a> {
         );
         let history = events::create(&author, title, &revision, target, timestamp, labels)?;
 
-        cobs::create(history, project, &self.whoami, &*self.store)
+        cobs::create(history, project, &self.whoami, self.store)
     }
 
     pub fn comment(
diff --git a/common/src/ethereum/governance.rs b/common/src/ethereum/governance.rs
index cd6ae047..9fc851b8 100644
--- a/common/src/ethereum/governance.rs
+++ b/common/src/ethereum/governance.rs
@@ -38,7 +38,7 @@ pub enum Error<M: Middleware> {
 
 type Proposal = (Address, U256, U256, U256, U256, U256, bool, bool);
 
-#[derive(PartialEq, Debug)]
+#[derive(Eq, PartialEq, Debug)]
 pub enum ProposalState {
     Pending,
     Active,
diff --git a/common/src/identity.rs b/common/src/identity.rs
index d85570c6..56284ad8 100644
--- a/common/src/identity.rs
+++ b/common/src/identity.rs
@@ -39,7 +39,7 @@ impl FromStr for Origin {
         } else if let Ok(url) = Url::from_str(s) {
             Self::try_from(url)
         } else {
-            return Err(anyhow!("invalid origin '{}'", s));
+            Err(anyhow!("invalid origin '{}'", s))
         }
     }
 }
diff --git a/common/src/project.rs b/common/src/project.rs
index 1b1152fb..95c5894e 100644
--- a/common/src/project.rs
+++ b/common/src/project.rs
@@ -372,7 +372,7 @@ pub fn list_rad_remote_heads(
     let heads = remote.remote_heads(settings, repo)?;
 
     for (head, oid) in heads {
-        if let Some((peer, r)) = git::parse_remote(&head.to_string()) {
+        if let Some((peer, r)) = git::parse_remote(&head) {
             if let Some(branch) = r.strip_prefix("heads/") {
                 let value = (branch.to_owned(), oid);
                 remotes.entry(peer).or_insert_with(Vec::new).push(value);
diff --git a/reward/src/lib.rs b/reward/src/lib.rs
index 8054e06d..0bd6f691 100644
--- a/reward/src/lib.rs
+++ b/reward/src/lib.rs
@@ -59,7 +59,7 @@ Environment variables
 "#,
 };
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub enum Strategy {
     Equally,
     Weighted,
diff --git a/rust-toolchain b/rust-toolchain
index 2bf5ad04..58e4eb6b 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-stable
+1.63