ref: Qualify enum variants

relay-server/src/endpoints/minidump.rs

@@ -21,8 +21,7 @@ use zstd::stream::Decoder as ZstdDecoder;
 
 use crate::constants::{ITEM_NAME_BREADCRUMBS1, ITEM_NAME_BREADCRUMBS2, ITEM_NAME_EVENT};
 use crate::endpoints::common::{self, BadStoreRequest, TextResponse, upload_to_objectstore};
-use crate::envelope::ContentType::Minidump;
-use crate::envelope::{AttachmentType, Envelope, Item, ItemType};
+use crate::envelope::{AttachmentType, ContentType, Envelope, Item, ItemType};
 use crate::extractors::{RawContentType, RequestMeta};
 use crate::managed::{Managed, ManagedResult};
 use crate::middlewares;
@@ -299,7 +298,7 @@ async fn multipart_to_envelope(
 
         items.try_modify(|items, records| -> Result<(), BadStoreRequest> {
             let minidump_item = &mut items[minidump_idx];
-            minidump_item.set_payload(Minidump, payload);
+            minidump_item.set_payload(ContentType::Minidump, payload);
             records.lenient(DataCategory::Attachment); // decoding the minidump changes its size
             if let Some(minidump_filename) = minidump_item.filename() {
                 minidump_item.set_filename(remove_container_extension(minidump_filename).to_owned())
@@ -418,7 +417,7 @@ async fn raw_minidump_to_envelope(
         let minidump_data = request.extract().await?;
         item.try_modify(|inner, records| -> Result<(), BadStoreRequest> {
             let payload = decode_minidump(minidump_data, state.config().max_attachment_size())?;
-            inner.set_payload(Minidump, payload);
+            inner.set_payload(ContentType::Minidump, payload);
             records.lenient(DataCategory::Attachment); // decoding the minidump changes its size
             validate_minidump(&inner.payload())?;
             Ok(())

relay-server/src/endpoints/playstation.rs

@@ -14,8 +14,7 @@ use serde::Serialize;
 use tower_http::limit::RequestBodyLimitLayer;
 
 use crate::endpoints::common::{self, BadStoreRequest, TextResponse};
-use crate::envelope::ContentType::OctetStream;
-use crate::envelope::{AttachmentType, Envelope, Item};
+use crate::envelope::{AttachmentType, ContentType, Envelope, Item};
 use crate::extractors::{RawContentType, RequestMeta};
 use crate::managed::Managed;
 use crate::middlewares;
@@ -196,7 +195,7 @@ async fn multipart_to_envelope(
             .ok_or(BadStoreRequest::MissingProsperodump)?;
         let payload = prosperodump.payload();
         validate_prosperodump(&payload)?;
-        prosperodump.set_payload(OctetStream, payload);
+        prosperodump.set_payload(ContentType::OctetStream, payload);
         Ok(())
     })?;
 

relay-server/src/processing/mod.rs

@@ -6,7 +6,7 @@
 //!
 //! The processor service, will then do its actual work using the processing logic defined here.
 
-use relay_config::Config;
+use relay_config::{Config, RelayMode};
 use relay_dynamic_config::GlobalConfig;
 use relay_quotas::RateLimits;
 use relay_sampling::evaluation::ReservoirCounters;
@@ -108,11 +108,9 @@ impl<'a> Context<'a> {
     /// when there is no full project config available. This is the case in stat and proxy
     /// Relays.
     pub fn should_filter(&self, feature: relay_dynamic_config::Feature) -> bool {
-        use relay_config::RelayMode::*;
-
         match self.config.relay_mode() {
-            Proxy => false,
-            Managed => !self.project_info.has_feature(feature),
+            RelayMode::Proxy => false,
+            RelayMode::Managed => !self.project_info.has_feature(feature),
         }
     }