lupine/telepathy-padfoot
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Pin to the same version of rust nightly as delta

Browse Source
This commit is contained in:
Nick Thomas
2020-05-19 00:16:01 +01:00
parent 825f5d90ed
commit aae7607c7f
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -670,8 +670,8 @@ dependencies = [
[[package]] [[package]]
name = "deltachat" name = "deltachat"
version = "1.31.0" version = "1.33.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 = [ dependencies = [
"anyhow", "anyhow",
"async-imap", "async-imap",
@@ -726,7 +726,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat_derive" name = "deltachat_derive"
version = "2.0.0" 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 = [ dependencies = [
"quote 1.0.5", "quote 1.0.5",
"syn 1.0.22", "syn 1.0.22",

2
Cargo.toml
View File

@@ -10,7 +10,7 @@ license = "MIT"
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
dbus = "0.8" 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" directories = "2.0"
rand = "0.7" rand = "0.7"

11
README.md
View File

@@ -55,8 +55,13 @@ learning exercise!
### Compiling ### Compiling
This project is written in Rust, so you'll need a rust compiler to build it. 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 [Rustup](https://github.com/rust-lang/rustup) comes highly recommended.
needs the `nightly` version, so follow the instructions for that.
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: Once you have a working rust compiler, just:
@@ -64,7 +69,7 @@ Once you have a working rust compiler, just:
$ cargo build --release $ 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 ### Cross-compiling amd64 -> i386

1
rust-toolchain Normal file
View File

@@ -0,0 +1 @@
nightly-2020-03-12

2
src/padfoot/connection/connection.rs
View File

@@ -174,7 +174,7 @@ impl telepathy::Connection for Connection {
fn get_self_handle(&self) -> Result<u32> { fn get_self_handle(&self) -> Result<u32> {
println!("Connection<{}>::get_self_handle()", self.id()); println!("Connection<{}>::get_self_handle()", self.id());
self.get_self_handle() self.self_handle()
} }
fn status(&self) -> Result<u32> { fn status(&self) -> Result<u32> {