It compiles with stable rust now, yay

exul · May 3, 2019 · e793f17 · e793f17
1 parent a91bc52
commit e793f17
Show file tree

Hide file tree

Showing 19 changed files with 617 additions and 483 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,8 +27,8 @@ regex = "1.0.0"
 reqwest = "0.9"
 router = "0.6"
 ruma-client-api = { git= "https://github.com/exul/ruma-client-api.git" }
-ruma-events = { version = "0.11" }
-ruma-identifiers = { version = "0.11", features = ["diesel"] }
+ruma-events = { version = "0.12" }
+ruma-identifiers = { version = "0.12", features = ["diesel"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/README.md b/README.md
@@ -15,18 +15,13 @@ There will be breaking changes!**
 
 ## Compiling from Source
 
-To compile the application service you need Rust nightly (I know that's bad,
-sorry).
-
-This will change, once [ruma-identifiers](https://github.com/ruma/ruma-identifiers)
-is working on stable rust.
+To compile the application service you need Rust >= 1.34.
 
 It's highly recommended that you use [rustup](https://www.rustup.rs).
 
 ```
 git clone https://github.com/exul/matrix-rocketchat.git
 cd matrix-rocketchat
-rustup override set nightly
 cargo build --release
 ./target/release/matrix-rocketchat
 ```

diff --git a/src/matrix-rocketchat/lib.rs b/src/matrix-rocketchat/lib.rs
@@ -1,6 +1,5 @@
 //! Application service to bridge Matrix <-> Rocket.Chat.
 
-#![feature(try_from, nll)]
 #![deny(missing_docs)]
 #![recursion_limit = "256"]
 

diff --git a/tests/admin_commands_bridge.rs b/tests/admin_commands_bridge.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/admin_commands_connect.rs b/tests/admin_commands_connect.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/admin_commands_help.rs b/tests/admin_commands_help.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/admin_commands_list.rs b/tests/admin_commands_list.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/admin_commands_login.rs b/tests/admin_commands_login.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate http;
 extern crate iron;
 extern crate matrix_rocketchat;

diff --git a/tests/admin_commands_unbridge.rs b/tests/admin_commands_unbridge.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/admin_commands_unkown.rs b/tests/admin_commands_unkown.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate matrix_rocketchat_test;
 extern crate router;
 extern crate ruma_client_api;

diff --git a/tests/admin_room.rs b/tests/admin_room.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate diesel;
 extern crate iron;
 extern crate matrix_rocketchat;

diff --git a/tests/errors.rs b/tests/errors.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/forward_matrix_direct_message_to_rocketchat.rs b/tests/forward_matrix_direct_message_to_rocketchat.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/forward_matrix_to_rocketchat.rs b/tests/forward_matrix_to_rocketchat.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/forward_rocketchat_channel_to_matrix.rs b/tests/forward_rocketchat_channel_to_matrix.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate http;
 extern crate iron;
 extern crate matrix_rocketchat;

diff --git a/tests/forward_rocketchat_direct_message_to_matrix.rs b/tests/forward_rocketchat_direct_message_to_matrix.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate iron;
 extern crate matrix_rocketchat;
 extern crate matrix_rocketchat_test;

diff --git a/tests/matrix-rocketchat-test/Cargo.toml b/tests/matrix-rocketchat-test/Cargo.toml
@@ -20,8 +20,8 @@ rand = "0.4"
 reqwest = "0.9"
 router = "0.6"
 ruma-client-api = { git = "https://github.com/exul/ruma-client-api.git" }
-ruma-events = { version = "0.11" }
-ruma-identifiers = { version = "0.11", features = ["diesel"] }
+ruma-events = { version = "0.12" }
+ruma-identifiers = { version = "0.12", features = ["diesel"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/tests/matrix-rocketchat-test/lib.rs b/tests/matrix-rocketchat-test/lib.rs
@@ -1,5 +1,3 @@
-#![feature(try_from)]
-
 extern crate diesel;
 extern crate http;
 extern crate iron;