Move GatewayIntents to model (#1642)

serenity-rs · Mar 15, 2022 · f46bbc8 · f46bbc8
1 parent ad9e987
commit f46bbc8
Show file tree

Hide file tree

Showing 14 changed files with 348 additions and 354 deletions.
diff --git a/examples/e05_command_framework/src/main.rs b/examples/e05_command_framework/src/main.rs
@@ -18,7 +18,7 @@ use std::{
 use serenity::prelude::*;
 use serenity::{
     async_trait,
-    client::bridge::gateway::{GatewayIntents, ShardId, ShardManager},
+    client::bridge::gateway::{ShardId, ShardManager},
     framework::standard::{
         buckets::{LimitedFor, RevertBucket},
         help_commands,
@@ -35,7 +35,7 @@ use serenity::{
     http::Http,
     model::{
         channel::{Channel, Message},
-        gateway::Ready,
+        gateway::{GatewayIntents, Ready},
         id::UserId,
         permissions::Permissions,
     },

diff --git a/examples/e11_gateway_intents/src/main.rs b/examples/e11_gateway_intents/src/main.rs
@@ -2,10 +2,9 @@ use std::env;
 
 use serenity::{
     async_trait,
-    client::bridge::gateway::GatewayIntents,
     model::{
         channel::Message,
-        gateway::{Presence, Ready},
+        gateway::{GatewayIntents, Presence, Ready},
     },
     prelude::*,
 };

diff --git a/src/client/bridge/gateway/intents.rs b/src/client/bridge/gateway/intents.rs
diff --git a/src/client/bridge/gateway/mod.rs b/src/client/bridge/gateway/mod.rs
@@ -44,7 +44,6 @@
 
 pub mod event;
 
-mod intents;
 mod shard_manager;
 mod shard_manager_monitor;
 mod shard_messenger;
@@ -57,7 +56,6 @@ use std::{
     time::Duration as StdDuration,
 };
 
-pub use self::intents::GatewayIntents;
 pub use self::shard_manager::{ShardManager, ShardManagerOptions};
 pub use self::shard_manager_monitor::{ShardManagerError, ShardManagerMonitor};
 pub use self::shard_messenger::ShardMessenger;