From aae7607c7f0b58772fc27b32ba62005f7c941f6c Mon Sep 17 00:00:00 2001
From: Nick Thomas <me@ur.gs>
Date: Tue, 19 May 2020 00:16:01 +0100
Subject: [PATCH] Pin to the same version of rust nightly as delta

---
 Cargo.lock                           |  6 +++---
 Cargo.toml                           |  2 +-
 README.md                            | 11 ++++++++---
 rust-toolchain                       |  1 +
 src/padfoot/connection/connection.rs |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 rust-toolchain

diff --git a/Cargo.lock b/Cargo.lock
index e331357..c2b1211 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -670,8 +670,8 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.31.0"
-source = "git+https://github.com/deltachat/deltachat-core-rust?tag=1.31.0#fcf3786fc5e74c0cf348a5864014300d0993db92"
+version = "1.33.0"
+source = "git+https://github.com/deltachat/deltachat-core-rust?tag=1.33.0#7dc58bb3305e58a73db499ec8c7009a05c654e28"
 dependencies = [
  "anyhow",
  "async-imap",
@@ -726,7 +726,7 @@ dependencies = [
 [[package]]
 name = "deltachat_derive"
 version = "2.0.0"
-source = "git+https://github.com/deltachat/deltachat-core-rust?tag=1.31.0#fcf3786fc5e74c0cf348a5864014300d0993db92"
+source = "git+https://github.com/deltachat/deltachat-core-rust?tag=1.33.0#7dc58bb3305e58a73db499ec8c7009a05c654e28"
 dependencies = [
  "quote 1.0.5",
  "syn 1.0.22",
diff --git a/Cargo.toml b/Cargo.toml
index 457165c..6c1fa4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 [dependencies]
 anyhow = "1.0"
 dbus = "0.8"
-deltachat = { git = "https://github.com/deltachat/deltachat-core-rust", tag="1.31.0" }
+deltachat = { git = "https://github.com/deltachat/deltachat-core-rust", tag="1.33.0" }
 directories = "2.0"
 rand = "0.7"
 
diff --git a/README.md b/README.md
index 2d3ae9b..14edbf6 100644
--- a/README.md
+++ b/README.md
@@ -55,8 +55,13 @@ learning exercise!
 ### Compiling
 
 This project is written in Rust, so you'll need a rust compiler to build it.
-[Rustup]() comes highly recommended. Deltachat is also written in Rust and it
-needs the `nightly` version, so follow the instructions for that.
+[Rustup](https://github.com/rust-lang/rustup) comes highly recommended.
+
+There is a [`rust-toolchain`](rust-toolchain) file that I try to keep synced
+with the version of rust that
+[`deltachat-core-rust`](https://github.com/deltachat/deltachat-core-rust)
+uses.
+
 
 Once you have a working rust compiler, just:
 
@@ -64,7 +69,7 @@ Once you have a working rust compiler, just:
 $ cargo build --release
 ```
 
-to get a `telepathy-padfoot binary.
+to get a `telepathy-padfoot binary. Drop the release flag to make it build fast.
 
 
 ### Cross-compiling amd64 -> i386
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 0000000..7b70b33
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+nightly-2020-03-12
diff --git a/src/padfoot/connection/connection.rs b/src/padfoot/connection/connection.rs
index fab8357..86f1b16 100644
--- a/src/padfoot/connection/connection.rs
+++ b/src/padfoot/connection/connection.rs
@@ -174,7 +174,7 @@ impl telepathy::Connection for Connection {
     fn get_self_handle(&self) -> Result<u32> {
         println!("Connection<{}>::get_self_handle()", self.id());
 
-        self.get_self_handle()
+        self.self_handle()
     }
 
     fn status(&self) -> Result<u32> {