Switch to rust edition 2021

Cargo.toml

@@ -4,8 +4,8 @@ version = "1.7.0"
 description = "Federated micro-blogging platform and content subscription service"
 license = "AGPL-3.0"
 
-edition = "2018"
-rust-version = "1.54"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 default-run = "mitra"
 
@@ -97,6 +97,7 @@ uuid = { version = "1.1.2", features = ["serde", "v4"] }
 web3 = { version = "0.18.0", default-features = false, features = ["http", "http-tls", "signing"] }
 
 [dev-dependencies]
+rand = { version = "*", features = ["small_rng"] }
 serial_test = "0.5.1"
 
 [features]

README.md

@@ -36,7 +36,7 @@ Ethereum contracts: https://codeberg.org/silverpill/mitra-contracts
 
 ## Requirements
 
-- Rust 1.54+ (when building from source)
+- Rust 1.56+ (when building from source)
 - PostgreSQL 12+
 - IPFS node (optional, see [guide](./docs/ipfs.md))
 - Ethereum node (optional)

src/ethereum/nft.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::convert::TryInto;
 
 use chrono::{DateTime, Utc};
 use uuid::Uuid;

src/identity/did_pkh.rs

@@ -1,5 +1,4 @@
 /// https://github.com/w3c-ccg/did-pkh/blob/main/did-pkh-method-draft.md
-use std::convert::TryInto;
 use std::fmt;
 use std::str::FromStr;
 

src/identity/minisign.rs

@@ -1,6 +1,4 @@
 /// https://jedisct1.github.io/minisign/
-use std::convert::TryInto;
-
 use blake2::{Blake2b512, Digest};
 use ed25519_dalek::{
     PublicKey,

src/mastodon_api/pagination.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use actix_web::HttpResponse;
 use serde::{Deserialize, Serialize};
 

src/mastodon_api/statuses/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

src/mastodon_api/statuses/views.rs

@@ -1,6 +1,4 @@
 /// https://docs.joinmastodon.org/methods/statuses/
-use std::convert::TryFrom;
-
 use actix_web::{delete, get, post, web, HttpResponse, Scope};
 use actix_web_httpauth::extractors::bearer::BearerAuth;
 use uuid::Uuid;

src/models/background_jobs/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use serde_json::Value;
 use postgres_types::FromSql;

src/models/invoices/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use postgres_types::FromSql;
 use uuid::Uuid;

src/models/markers/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use postgres_types::FromSql;
 use uuid::Uuid;

src/models/notifications/queries.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use tokio_postgres::GenericClient;
 use uuid::Uuid;
 

src/models/notifications/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use postgres_types::FromSql;
 use tokio_postgres::Row;

src/models/posts/queries.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use tokio_postgres::GenericClient;
 use uuid::Uuid;

src/models/posts/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use postgres_types::FromSql;
 use tokio_postgres::Row;

src/models/profiles/types.rs

@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fmt;
 use std::str::FromStr;
 

src/models/relationships/queries.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use tokio_postgres::GenericClient;
 use uuid::Uuid;
 

src/models/relationships/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use postgres_types::FromSql;
 use tokio_postgres::Row;
 use uuid::Uuid;

src/models/subscriptions/queries.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use tokio_postgres::GenericClient;
 use uuid::Uuid;

src/models/subscriptions/types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{DateTime, Utc};
 use postgres_types::FromSql;
 use tokio_postgres::Row;

src/monero/subscriptions.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::str::FromStr;
 
 use chrono::{Duration, Utc};

src/utils/currencies.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use regex::Regex;
 
 use crate::errors::{ConversionError, ValidationError};