diff --git a/.travis.yml b/.travis.yml index 4579af1e..47bfc526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: "rust" cache: "cargo" rust: - - 1.36.0 + - 1.39.0 - stable - beta - nightly @@ -12,10 +12,7 @@ jobs: before_script: - rustup component add rustfmt - - | - if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ]; then - rustup component add clippy || true - fi + - rustup component add clippy || true - | if [ "$TRAVIS_RUST_VERSION" == "stable" ]; then cargo install --force cargo-audit @@ -28,7 +25,7 @@ script: fi - cargo fmt --all -- --check - | - if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ] && ( rustup component list | grep -q clippy ); then + if ( rustup component list | grep -q clippy ); then cargo clippy --all --all-targets --all-features -- -D warnings fi - cargo build --all --verbose diff --git a/README.md b/README.md index 9496681a..a99907dc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ These types can be shared by client and server code for all Matrix APIs. ## Minimum Rust version -ruma-api requires Rust 1.36.0 or later. +ruma-api requires Rust 1.39.0 or later. ## Documentation diff --git a/ruma-api-macros/src/lib.rs b/ruma-api-macros/src/lib.rs index 868abb84..e580e286 100644 --- a/ruma-api-macros/src/lib.rs +++ b/ruma-api-macros/src/lib.rs @@ -7,8 +7,6 @@ #![deny(missing_copy_implementations, missing_debug_implementations)] #![allow(clippy::cognitive_complexity)] -// Since we support Rust 1.36.0, we can't apply this suggestion yet -#![allow(clippy::use_self)] #![recursion_limit = "256"] extern crate proc_macro; diff --git a/src/lib.rs b/src/lib.rs index 0bc3559a..a669e55c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,8 +12,6 @@ #![warn(rust_2018_idioms)] #![deny(missing_copy_implementations, missing_debug_implementations, missing_docs)] -// Since we support Rust 1.36.0, we can't apply this suggestion yet -#![allow(clippy::use_self)] use std::{ convert::{TryFrom, TryInto},