From 17e4ac1233e34c58823d42ba837c680bab27d274 Mon Sep 17 00:00:00 2001
From: "Alex M. M." <acdenissk69@gmail.com>
Date: Fri, 1 Mar 2024 22:36:51 +0000
Subject: [PATCH] Fix compilation from rebase

---
 src/http/client.rs             | 1 -
 src/model/event.rs             | 1 -
 src/model/guild/guild_id.rs    | 2 --
 src/model/guild/integration.rs | 2 +-
 src/model/user.rs              | 1 -
 src/model/utils.rs             | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/http/client.rs b/src/http/client.rs
index ac4e5cd1c79..656ba94fcbb 100644
--- a/src/http/client.rs
+++ b/src/http/client.rs
@@ -32,7 +32,6 @@ use super::{
 use crate::builder::CreateAttachment;
 use crate::constants;
 use crate::internal::prelude::*;
-use crate::json::*;
 use crate::model::prelude::*;
 
 #[derive(Clone)]
diff --git a/src/model/event.rs b/src/model/event.rs
index d1c1500be98..bd01c738060 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -11,7 +11,6 @@ use serde::de::Error as DeError;
 use serde::Serialize;
 use tracing::{debug, warn};
 
-use crate::constants::Opcode;
 use crate::model::prelude::*;
 use crate::model::utils::{
     deserialize_val,
diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs
index 03671e95011..bd1b9284046 100644
--- a/src/model/guild/guild_id.rs
+++ b/src/model/guild/guild_id.rs
@@ -32,8 +32,6 @@ use crate::gateway::ShardMessenger;
 use crate::http::{CacheHttp, Http, UserPagination};
 #[cfg(feature = "model")]
 use crate::internal::prelude::*;
-#[cfg(feature = "model")]
-use crate::json::json;
 use crate::model::guild::SerializeIter;
 use crate::model::prelude::*;
 
diff --git a/src/model/guild/integration.rs b/src/model/guild/integration.rs
index 256854928a8..8c97f6176c3 100644
--- a/src/model/guild/integration.rs
+++ b/src/model/guild/integration.rs
@@ -1,6 +1,6 @@
 use crate::model::prelude::*;
 
-use nonmax::{NonMaxU32, NonMaxU64};
+use nonmax::NonMaxU32;
 
 use super::*;
 
diff --git a/src/model/user.rs b/src/model/user.rs
index ba8092713f0..b7c36ae135f 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -20,7 +20,6 @@ use crate::gateway::ShardMessenger;
 #[cfg(feature = "model")]
 use crate::http::{CacheHttp, Http};
 use crate::internal::prelude::*;
-use crate::model::mention::Mentionable;
 #[cfg(feature = "model")]
 use crate::model::utils::avatar_url;
 
diff --git a/src/model/utils.rs b/src/model/utils.rs
index c44ce75b296..b352a9f5493 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -6,7 +6,6 @@ use std::marker::PhantomData;
 
 use arrayvec::ArrayVec;
 use serde::ser::{Serialize, SerializeSeq, Serializer};
-use small_fixed_array::FixedString;
 
 use super::prelude::*;
 use crate::internal::prelude::*;