aboutsummaryrefslogtreecommitdiff
path: root/src/client/bridge
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-12-16 13:24:09 -0800
committerZeyla Hellyer <[email protected]>2017-12-16 13:24:09 -0800
commit9b53582f5e5e9650abda4106124e7f9f4e78a90c (patch)
tree88bd56a75b1d110ea049abbaea88bb6e8a83dac3 /src/client/bridge
parentFix compilation of examples (diff)
downloadserenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.tar.xz
serenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.zip
Fix most clippy lints, take more refeernces
Fix clippy lints and subsequently accept references for more function parameters.
Diffstat (limited to 'src/client/bridge')
-rw-r--r--src/client/bridge/gateway/shard_manager.rs20
-rw-r--r--src/client/bridge/gateway/shard_runner.rs6
2 files changed, 13 insertions, 13 deletions
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
index 99cdec7..56bda7a 100644
--- a/src/client/bridge/gateway/shard_manager.rs
+++ b/src/client/bridge/gateway/shard_manager.rs
@@ -117,11 +117,11 @@ impl ShardManager {
shard_index: u64,
shard_init: u64,
shard_total: u64,
- ws_url: Arc<Mutex<String>>,
- token: Arc<Mutex<String>>,
- data: Arc<Mutex<ShareMap>>,
- event_handler: Arc<H>,
- framework: Arc<Mutex<Option<Box<Framework + Send>>>>,
+ ws_url: &Arc<Mutex<String>>,
+ token: &Arc<Mutex<String>>,
+ data: &Arc<Mutex<ShareMap>>,
+ event_handler: &Arc<H>,
+ framework: &Arc<Mutex<Option<Box<Framework + Send>>>>,
threadpool: ThreadPool,
) -> (Arc<Mutex<Self>>, ShardManagerMonitor) where H: EventHandler + Send + Sync + 'static {
let (thread_tx, thread_rx) = mpsc::channel();
@@ -130,16 +130,16 @@ impl ShardManager {
let runners = Arc::new(Mutex::new(HashMap::new()));
let mut shard_queuer = ShardQueuer {
- data: Arc::clone(&data),
- event_handler: Arc::clone(&event_handler),
- framework: Arc::clone(&framework),
+ data: Arc::clone(data),
+ event_handler: Arc::clone(event_handler),
+ framework: Arc::clone(framework),
last_start: None,
manager_tx: thread_tx.clone(),
queue: VecDeque::new(),
runners: Arc::clone(&runners),
rx: shard_queue_rx,
- token: Arc::clone(&token),
- ws_url: Arc::clone(&ws_url),
+ token: Arc::clone(token),
+ ws_url: Arc::clone(ws_url),
threadpool,
};
diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
index 6ca73eb..a682693 100644
--- a/src/client/bridge/gateway/shard_runner.rs
+++ b/src/client/bridge/gateway/shard_runner.rs
@@ -143,7 +143,7 @@ impl<H: EventHandler + Send + Sync + 'static> ShardRunner<H> {
let (event, action, successful) = self.recv_event();
- if let Some(action) = action {
+ if let Some(ref action) = action {
let _ = self.action(action);
}
@@ -171,8 +171,8 @@ impl<H: EventHandler + Send + Sync + 'static> ShardRunner<H> {
/// # Errors
///
/// Returns
- fn action(&mut self, action: ShardAction) -> Result<()> {
- match action {
+ fn action(&mut self, action: &ShardAction) -> Result<()> {
+ match *action {
ShardAction::Autoreconnect => self.shard.autoreconnect(),
ShardAction::Heartbeat => self.shard.heartbeat(),
ShardAction::Identify => self.shard.identify(),