chore(toolchain): Migrate to 2021 edition

relay-auth/Cargo.toml

@@ -5,7 +5,7 @@ description = "Authentication and crypto for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 build = "build.rs"

relay-aws-extension/Cargo.toml

@@ -5,7 +5,7 @@ description = "AWS extension implementation for Sentry's AWS Lambda layer"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-cabi/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sentry <[email protected]>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 description = "Exposes some internals of the relay to C."
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-common/Cargo.toml

@@ -5,7 +5,7 @@ description = "Common utilities and crate re-exports for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-common/src/macros.rs

@@ -130,7 +130,7 @@ macro_rules! clone {
         $( let $n = $n.clone(); )+
         move || $body
     }};
-    ($($n:ident ,)+ |$($p:pat),+| $body:expr) => {{
+    ($($n:ident ,)+ |$($p:pat_param),+| $body:expr) => {{
         $( let $n = $n.clone(); )+
         move |$($p),+| $body
     }};

relay-config/Cargo.toml

@@ -5,7 +5,7 @@ description = "Configuration for the Relay CLI and server"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-crash/Cargo.toml

@@ -5,7 +5,7 @@ description = "Native crash reporting for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license-file = "../LICENSE"
 publish = false

relay-ffi-macros/Cargo.toml

@@ -5,7 +5,7 @@ description = "Macros for error handling in FFI bindings"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-ffi/Cargo.toml

@@ -5,7 +5,7 @@ description = "Utilities for error handling in FFI bindings"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-filter/Cargo.toml

@@ -5,7 +5,7 @@ description = "Inbound data filters for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-general/Cargo.toml

@@ -4,7 +4,7 @@ version = "22.9.0"
 authors = ["Sentry <[email protected]>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-general/derive/Cargo.toml

@@ -4,7 +4,7 @@ version = "22.9.0"
 authors = ["Sentry <[email protected]>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

relay-log/Cargo.toml

@@ -5,7 +5,7 @@ description = "Error reporting and logging for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 build = "build.rs"

relay-metrics/Cargo.toml

@@ -5,7 +5,7 @@ description = "Metrics protocol and processing"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-profiling/Cargo.toml

@@ -5,7 +5,7 @@ description = "Profiling processing for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-quotas/Cargo.toml

@@ -5,7 +5,7 @@ description = "Sentry quotas and rate limiting"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-redis/Cargo.toml

@@ -5,7 +5,7 @@ description = "Pooled Redis and Redis cluster abstraction for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-replays/Cargo.toml

@@ -5,7 +5,7 @@ description = "Replays functionality for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-sampling/Cargo.toml

@@ -5,7 +5,7 @@ description = "Dynamic sampling functionality for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-server/Cargo.toml

@@ -5,7 +5,7 @@ description = "Endpoints and services for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license-file = "../LICENSE"
 publish = false

relay-server/src/extractors/forwarded_for.rs

@@ -1,4 +1,4 @@
-use actix_web::http::header;
+use actix_web::http::header::{self, IntoHeaderValue};
 use actix_web::{Error, FromRequest, HttpMessage, HttpRequest};
 
 #[derive(Debug)]
@@ -49,15 +49,15 @@ impl<'a> header::IntoHeaderValue for &'a ForwardedFor {
     type Error = header::InvalidHeaderValue;
 
     fn try_into(self) -> Result<header::HeaderValue, Self::Error> {
-        (self.0.as_str()).try_into()
+        IntoHeaderValue::try_into(self.0.as_str())
     }
 }
 
 impl header::IntoHeaderValue for ForwardedFor {
     type Error = header::InvalidHeaderValueBytes;
 
     fn try_into(self) -> Result<header::HeaderValue, Self::Error> {
-        self.0.try_into()
+        IntoHeaderValue::try_into(self.0)
     }
 }
 

relay-statsd/Cargo.toml

@@ -5,7 +5,7 @@ description = "High-level StatsD metric client for internal measurements"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-system/Cargo.toml

@@ -5,7 +5,7 @@ description = "Foundational system components for Relay's services"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay-test/Cargo.toml

@@ -5,7 +5,7 @@ description = "Test utilities for Relay"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 license-file = "../LICENSE"
 publish = false
 

relay/Cargo.toml

@@ -5,7 +5,7 @@ description = "The Relay binary, a proxy server for Sentry"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "22.9.0"
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license-file = "../LICENSE"
 publish = false

tools/document-metrics/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sentry <[email protected]>"]
 description = "Generates documentation for metrics"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

tools/generate-schema/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sentry <[email protected]>"]
 description = "Generates an event payload schema file"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

tools/process-event/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sentry <[email protected]>"]
 description = "Process a Sentry event payload"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
-edition = "2018"
+edition = "2021"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/scrub-minidump/Cargo.toml

@@ -5,7 +5,7 @@ description = "Scrubs PII from a Minidump file"
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"
 version = "20.8.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]