Move to Rust edition 2021

Also bump MSRV to 1.56 and use the same clippy lints in every crate

.github/workflows/check.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.54.0" # MSRV
+          toolchain: "1.56.0" # MSRV
           target: x86_64-unknown-linux-musl
           profile: minimal
           override: true
@@ -192,7 +192,7 @@ jobs:
       fail-fast: false # Continue other jobs if one fails to help filling the cache
       matrix:
         toolchain:
-          - "1.54.0" # MSRV
+          - "1.56.0" # MSRV
           - stable
           - beta
           - nightly

Cargo.toml

@@ -1,5 +1,3 @@
 [workspace]
 
 members = ["crates/*"]
-
-resolver = "2"

clippy.toml

@@ -1 +1 @@
-msrv = "1.54.0"
+msrv = "1.56.0"

crates/cli/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-cli"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]

crates/config/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-config"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]

crates/config/src/database.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{convert::TryInto, path::PathBuf, time::Duration};
+use std::{path::PathBuf, time::Duration};
 
 use anyhow::Context;
 use async_trait::async_trait;

crates/config/src/lib.rs

@@ -12,6 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![forbid(unsafe_code)]
+#![deny(clippy::all)]
+#![deny(rustdoc::broken_intra_doc_links)]
+#![warn(clippy::pedantic)]
+#![allow(clippy::module_name_repetitions)]
+#![allow(clippy::missing_panics_doc)]
+#![allow(clippy::missing_errors_doc)]
+
 use async_trait::async_trait;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

crates/config/src/oauth2.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::convert::TryFrom;
-
 use anyhow::Context;
 use async_trait::async_trait;
 use jwt_compact::{
@@ -67,6 +65,7 @@ pub struct Jwks {
 pub struct KeySet(Vec<Key>);
 
 impl KeySet {
+    #[must_use]
     pub fn to_public_jwks(&self) -> Jwks {
         let keys = self.0.iter().map(Key::to_public_jwk).collect();
         Jwks { keys }
@@ -345,6 +344,7 @@ pub struct OAuth2Config {
 }
 
 impl OAuth2Config {
+    #[must_use]
     pub fn discovery_url(&self) -> Url {
         self.issuer
             .join(".well-known/openid-configuration")

crates/config/src/telemetry.rs

@@ -107,10 +107,10 @@ impl ConfigurationSection<'_> for TelemetryConfig {
     }
 
     async fn generate() -> anyhow::Result<Self> {
-        Ok(Default::default())
+        Ok(Self::default())
     }
 
     fn test() -> Self {
-        Default::default()
+        Self::default()
     }
 }

crates/core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-core"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [features]

crates/core/src/handlers/oauth2/authorization.rs

@@ -12,10 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{
+use std::collections::{HashMap, HashSet};
-    collections::{HashMap, HashSet},
-    convert::TryFrom,
-};
 
 use chrono::Duration;
 use hyper::{

crates/core/src/handlers/views/login.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::convert::TryFrom;
-
 use hyper::http::uri::{Parts, PathAndQuery, Uri};
 use mas_config::{CookiesConfig, CsrfConfig};
 use mas_data_model::{errors::WrapFormError, BrowserSession, StorageBackend};

crates/core/src/handlers/views/reauth.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::convert::TryFrom;
-
 use hyper::http::uri::{Parts, PathAndQuery};
 use mas_config::{CookiesConfig, CsrfConfig};
 use mas_data_model::{BrowserSession, StorageBackend};

crates/core/src/handlers/views/register.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::convert::TryFrom;
-
 use argon2::Argon2;
 use hyper::http::uri::{Parts, PathAndQuery, Uri};
 use mas_config::{CookiesConfig, CsrfConfig};

crates/core/src/storage/oauth2/access_token.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::convert::TryFrom;
-
 use anyhow::Context;
 use chrono::{DateTime, Duration, Utc};
 use mas_data_model::{AccessToken, Authentication, BrowserSession, Client, Session, User};

crates/core/src/storage/oauth2/authorization_grant.rs

@@ -14,10 +14,7 @@
 
 #![allow(clippy::unused_async)]
 
-use std::{
+use std::num::NonZeroU32;
-    convert::{TryFrom, TryInto},
-    num::NonZeroU32,
-};
 
 use anyhow::Context;
 use chrono::{DateTime, Utc};

crates/core/src/storage/user.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{borrow::BorrowMut, convert::TryInto};
+use std::borrow::BorrowMut;
 
 use anyhow::Context;
 use argon2::Argon2;

crates/core/src/tokens.rs

@@ -37,8 +37,6 @@
 
 #![deny(missing_docs)]
 
-use std::convert::TryInto;
-
 use crc::{Crc, CRC_32_ISO_HDLC};
 use oauth2_types::requests::TokenTypeHint;
 use rand::{distributions::Alphanumeric, Rng};

crates/data-model/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-data-model"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]

crates/data-model/src/lib.rs

@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![forbid(unsafe_code)]
+#![deny(clippy::all)]
+#![deny(rustdoc::broken_intra_doc_links)]
+#![warn(clippy::pedantic)]
+#![allow(clippy::module_name_repetitions)]
+#![allow(clippy::missing_panics_doc)]
+#![allow(clippy::missing_errors_doc)]
+#![allow(clippy::trait_duplication_in_bounds)]
+
 pub mod errors;
 pub(crate) mod oauth2;
 pub(crate) mod tokens;

crates/data-model/src/oauth2/authorization_grant.rs

@@ -30,6 +30,7 @@ pub struct Pkce {
 }
 
 impl Pkce {
+    #[must_use]
     pub fn new(challenge_method: CodeChallengeMethod, challenge: String) -> Self {
         Pkce {
             challenge_method,
@@ -37,6 +38,7 @@ impl Pkce {
         }
     }
 
+    #[must_use]
     pub fn verify(&self, verifier: &str) -> bool {
         self.challenge_method.verify(&self.challenge, verifier)
     }
@@ -77,6 +79,7 @@ impl<T: StorageBackend> Default for AuthorizationGrantStage<T> {
 }
 
 impl<T: StorageBackend> AuthorizationGrantStage<T> {
+    #[must_use]
     pub fn new() -> Self {
         Self::Pending
     }
@@ -119,7 +122,7 @@ impl<T: StorageBackend> AuthorizationGrantStage<T> {
 
 impl<S: StorageBackendMarker> From<AuthorizationGrantStage<S>> for AuthorizationGrantStage<()> {
     fn from(s: AuthorizationGrantStage<S>) -> Self {
-        use AuthorizationGrantStage::*;
+        use AuthorizationGrantStage::{Cancelled, Exchanged, Fulfilled, Pending};
         match s {
             Pending => Pending,
             Fulfilled {

crates/data-model/src/users.rs

@@ -30,6 +30,7 @@ impl<T: StorageBackend> User<T>
 where
     T::UserData: Default,
 {
+    #[must_use]
     pub fn samples() -> Vec<Self> {
         vec![User {
             data: Default::default(),
@@ -92,6 +93,7 @@ where
     T::BrowserSessionData: Default,
     T::UserData: Default,
 {
+    #[must_use]
     pub fn samples() -> Vec<Self> {
         User::<T>::samples()
             .into_iter()

crates/oauth2-types/Cargo.toml

@@ -2,7 +2,7 @@
 name = "oauth2-types"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]

crates/static-files/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-static-files"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [features]

crates/static-files/src/lib.rs

@@ -27,7 +27,7 @@ use warp::{filters::BoxedFilter, Filter, Reply};
 
 #[cfg(not(feature = "dev"))]
 mod builtin {
-    use std::{convert::TryInto, fmt::Write, str::FromStr};
+    use std::{fmt::Write, str::FromStr};
 
     use headers::{ContentLength, ContentType, ETag, HeaderMapExt};
     use rust_embed::RustEmbed;

crates/templates/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mas-templates"
 version = "0.1.0"
 authors = ["Quentin Gliech <quenting@element.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [features]