Skip to content

Commit

Permalink
Replace instances of super::super with absolute imports (#1010)
Browse files Browse the repository at this point in the history
  • Loading branch information
nickelc committed Oct 8, 2020
1 parent 2386690 commit 47e2f34
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/client/bridge/gateway/shard_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{
};
use futures::channel::mpsc::{self, UnboundedSender as Sender, UnboundedReceiver as Receiver};
use futures::StreamExt;
use super::super::super::{EventHandler, RawEventHandler};
use crate::client::{EventHandler, RawEventHandler};
use super::{
GatewayIntents,
ShardId,
Expand Down
2 changes: 1 addition & 1 deletion src/client/bridge/gateway/shard_manager_monitor.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use tokio::sync::Mutex;
use std::sync::Arc;
use super::{ShardManager, ShardManagerMessage};
use super::super::gateway::ShardId;
use crate::client::bridge::gateway::ShardId;
use tracing::{debug, warn, instrument};
use futures::{
StreamExt,
Expand Down
2 changes: 1 addition & 1 deletion src/client/bridge/gateway/shard_queuer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use futures::{
channel::mpsc::{UnboundedSender as Sender, UnboundedReceiver as Receiver},
};
use tokio::time::{delay_for, timeout, Duration, Instant};
use super::super::super::{EventHandler, RawEventHandler};
use crate::client::{EventHandler, RawEventHandler};
use super::{
GatewayIntents,
ShardId,
Expand Down
6 changes: 3 additions & 3 deletions src/client/bridge/gateway/shard_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use std::{
};
use futures::channel::mpsc::{self, UnboundedReceiver as Receiver, UnboundedSender as Sender};
use futures::{SinkExt, StreamExt};
use super::super::super::dispatch::{DispatchEvent, dispatch};
use super::super::super::{EventHandler, RawEventHandler};
use crate::client::dispatch::{DispatchEvent, dispatch};
use crate::client::{EventHandler, RawEventHandler};
use super::event::{ClientEvent, ShardStageUpdateEvent};
use super::{ShardClientMessage, ShardId, ShardManagerMessage, ShardRunnerMessage};
use async_tungstenite::tungstenite::{
Expand All @@ -25,7 +25,7 @@ use typemap_rev::TypeMap;
#[cfg(feature = "framework")]
use crate::framework::Framework;
#[cfg(feature = "voice")]
use super::super::voice::ClientVoiceManager;
use crate::client::bridge::voice::ClientVoiceManager;
#[cfg(feature = "voice")]
use tokio::sync::Mutex;
#[cfg(feature = "collector")]
Expand Down
2 changes: 1 addition & 1 deletion src/framework/standard/parse/map.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::sync::Arc;

use super::super::*;
use crate::framework::standard::*;

#[derive(Debug)]
pub enum Map {
Expand Down
2 changes: 1 addition & 1 deletion src/model/channel/attachment.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::super::id::AttachmentId;
use crate::model::id::AttachmentId;

#[cfg(feature = "model")]
use reqwest::Client as ReqwestClient;
Expand Down
2 changes: 1 addition & 1 deletion src/model/channel/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use serde::{
ser::{Serialize, Serializer},
};
#[cfg(feature = "model")]
use super::super::utils::U64Visitor;
use crate::model::utils::U64Visitor;
#[cfg(feature = "model")]
use std::{
result::Result as StdResult,
Expand Down
2 changes: 1 addition & 1 deletion src/model/guild/audit_log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde::de::{
Visitor
};
use serde::ser::Serializer;
use super::super::prelude::*;
use crate::model::prelude::*;
use std::{
collections::HashMap,
mem::transmute,
Expand Down
6 changes: 3 additions & 3 deletions src/model/guild/emoji.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ use std::fmt::{
Result as FmtResult,
Write as FmtWrite
};
use super::super::id::{EmojiId, RoleId};
use crate::model::id::{EmojiId, RoleId};

#[cfg(all(feature = "cache", feature = "model"))]
use serde_json::json;
#[cfg(all(feature = "cache", feature = "model"))]
use crate::internal::prelude::*;
#[cfg(all(feature = "cache", feature = "model"))]
use super::super::ModelError;
use crate::model::ModelError;
#[cfg(all(feature = "cache", feature = "model"))]
use super::super::id::GuildId;
use crate::model::id::GuildId;
#[cfg(all(feature = "cache", feature = "model"))]
use crate::cache::Cache;
#[cfg(all(feature = "cache", feature = "model"))]
Expand Down
2 changes: 1 addition & 1 deletion src/model/guild/partial_guild.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use serde::de::Error as DeError;

use crate::model::prelude::*;
use super::super::utils::{deserialize_emojis, deserialize_roles};
use crate::model::utils::{deserialize_emojis, deserialize_roles};

#[cfg(feature = "model")]
use crate::builder::{CreateChannel, EditGuild, EditMember, EditRole};
Expand Down

0 comments on commit 47e2f34

Please sign in to comment.