Skip to content

Commit b282f6b

Browse files
daborossdaboross
committed
Reformat project.
1 parent 6c75d59 commit b282f6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+637
-434
lines changed

Diff for: ‎examples/me.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ fn env(var: &str) -> String {
2121
fn opt_env(var: &str, default: &'static str) -> Cow<'static, str> {
2222
dotenv::dotenv().ok();
2323
match ::std::env::var(var) {
24-
Ok(value) => if !value.is_empty() {
25-
value.into()
26-
} else {
27-
default.into()
28-
},
24+
Ok(value) => {
25+
if !value.is_empty() {
26+
value.into()
27+
} else {
28+
default.into()
29+
}
30+
}
2931
Err(_) => default.into(),
3032
}
3133
}

Diff for: ‎examples/register.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@ extern crate screeps_api;
1111
// json pretty printing
1212
extern crate serde_json;
1313

14-
use std::io::{self, Write};
1514
use std::borrow::Cow;
15+
use std::io::{self, Write};
1616

1717
fn opt_env(var: &str, default: &'static str) -> Cow<'static, str> {
1818
dotenv::dotenv().ok();
1919
match ::std::env::var(var) {
20-
Ok(value) => if !value.is_empty() {
21-
value.into()
22-
} else {
23-
default.into()
24-
},
20+
Ok(value) => {
21+
if !value.is_empty() {
22+
value.into()
23+
} else {
24+
default.into()
25+
}
26+
}
2527
Err(_) => default.into(),
2628
}
2729
}

Diff for: ‎examples/top10.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ extern crate screeps_api;
88

99
use std::borrow::Cow;
1010

11-
use screeps_api::LeaderboardType::*;
1211
use screeps_api::endpoints::leaderboard::page::LeaderboardPage;
12+
use screeps_api::LeaderboardType::*;
1313

1414
/// Set up dotenv and retrieve a specific variable, informatively panicking if it does not exist.
1515
fn env(var: &str) -> String {
@@ -23,11 +23,13 @@ fn env(var: &str) -> String {
2323
fn opt_env(var: &str, default: &'static str) -> Cow<'static, str> {
2424
dotenv::dotenv().ok();
2525
match ::std::env::var(var) {
26-
Ok(value) => if !value.is_empty() {
27-
value.into()
28-
} else {
29-
default.into()
30-
},
26+
Ok(value) => {
27+
if !value.is_empty() {
28+
value.into()
29+
} else {
30+
default.into()
31+
}
32+
}
3133
Err(_) => default.into(),
3234
}
3335
}

Diff for: ‎examples/ws-console.rs

+30-18
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ use futures::{future, stream, Future, Sink, Stream};
2727

2828
use websocket::OwnedMessage;
2929

30+
use screeps_api::websocket::{
31+
Channel, ChannelUpdate, ScreepsMessage, SockjsMessage, UserConsoleUpdate,
32+
};
3033
use screeps_api::TokenStorage;
31-
use screeps_api::websocket::{Channel, ChannelUpdate, ScreepsMessage, SockjsMessage, UserConsoleUpdate};
3234

3335
static CONSOLE_LOG_TARGET: &'static str = "log:console";
3436
static CONSOLE_RAW_OUTPUT_TARGET: &'static str = "log:console-raw";
@@ -45,11 +47,13 @@ fn env(var: &str) -> String {
4547
fn opt_env(var: &str, default: &'static str) -> Cow<'static, str> {
4648
dotenv::dotenv().ok();
4749
match ::std::env::var(var) {
48-
Ok(value) => if !value.is_empty() {
49-
value.into()
50-
} else {
51-
default.into()
52-
},
50+
Ok(value) => {
51+
if !value.is_empty() {
52+
value.into()
53+
} else {
54+
default.into()
55+
}
56+
}
5357
Err(_) => default.into(),
5458
}
5559
}
@@ -118,7 +122,8 @@ fn main() {
118122

119123
info!("connecting - {}", my_info.username);
120124

121-
let mut core = tokio_core::reactor::Core::new().expect("expected IO core to start up without issue.");
125+
let mut core =
126+
tokio_core::reactor::Core::new().expect("expected IO core to start up without issue.");
122127

123128
let handle = core.handle();
124129

@@ -134,7 +139,8 @@ fn main() {
134139

135140
sink.send(OwnedMessage::Text(screeps_api::websocket::authenticate(
136141
&token_storage.take_token().unwrap(),
137-
))).and_then(|sink| {
142+
)))
143+
.and_then(|sink| {
138144
let handler = Handler::new(token_storage, my_info);
139145

140146
sink.send_all(
@@ -149,7 +155,8 @@ fn main() {
149155
.flatten(),
150156
)
151157
})
152-
})).expect("websocket connection exited with failure");
158+
}))
159+
.expect("websocket connection exited with failure");
153160
}
154161

155162
struct Handler<T>
@@ -171,7 +178,10 @@ where
171178
}
172179
}
173180

174-
fn handle_data(&self, data: OwnedMessage) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
181+
fn handle_data(
182+
&self,
183+
data: OwnedMessage,
184+
) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
175185
match data {
176186
OwnedMessage::Text(string) => {
177187
let data = SockjsMessage::parse(&string).expect("expected a SockJS message");
@@ -189,7 +199,9 @@ where
189199
.map(|message| self.handle_parsed_message(message))
190200
.collect::<Vec<_>>();
191201

192-
return Box::new(stream::iter_ok::<_, websocket::WebSocketError>(results).flatten());
202+
return Box::new(
203+
stream::iter_ok::<_, websocket::WebSocketError>(results).flatten(),
204+
);
193205
}
194206
}
195207
}
@@ -215,14 +227,14 @@ where
215227

216228
return Box::new(
217229
subscribe_with(&self.info.user_id).chain(
218-
stream::futures_unordered(vec![
219-
future::lazy(|| {
220-
info!("subscribed");
221-
future::ok::<_, websocket::WebSocketError>(stream::empty())
222-
}),
223-
]).flatten(),
230+
stream::futures_unordered(vec![future::lazy(|| {
231+
info!("subscribed");
232+
future::ok::<_, websocket::WebSocketError>(stream::empty())
233+
})])
234+
.flatten(),
224235
),
225-
) as Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>>;
236+
)
237+
as Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>>;
226238
}
227239
ScreepsMessage::ChannelUpdate { update } => {
228240
self.handle_update(update);

Diff for: ‎examples/ws-debug.rs

+49-25
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use futures::{future, stream, Future, Sink, Stream};
3030

3131
use websocket::OwnedMessage;
3232

33-
use screeps_api::{RoomName, TokenStorage};
3433
use screeps_api::websocket::{Channel, ChannelUpdate, ScreepsMessage, SockjsMessage};
34+
use screeps_api::{RoomName, TokenStorage};
3535

3636
/// Set up dotenv and retrieve a specific variable, informatively panicking if it does not exist.
3737
fn env(var: &str) -> String {
@@ -80,7 +80,9 @@ struct Config {
8080
}
8181

8282
impl Config {
83-
fn new<'a>(args: &'a clap::ArgMatches) -> Result<Self, screeps_api::data::room_name::RoomNameParseError<'a>> {
83+
fn new<'a>(
84+
args: &'a clap::ArgMatches,
85+
) -> Result<Self, screeps_api::data::room_name::RoomNameParseError<'a>> {
8486
#[allow(unused_imports)] // becomes unnecessary for rust 1.23+
8587
use std::ascii::AsciiExt;
8688

@@ -89,7 +91,8 @@ impl Config {
8991
messages: args.is_present("messages"),
9092
credits: args.is_present("credits"),
9193
console: args.is_present("console"),
92-
shard: args.value_of("shard")
94+
shard: args
95+
.value_of("shard")
9396
.map(|v| {
9497
if "none".eq_ignore_ascii_case(v) {
9598
None
@@ -98,24 +101,34 @@ impl Config {
98101
}
99102
})
100103
.unwrap_or_else(|| Some("shard0".into())),
101-
rooms: args.values_of("room")
104+
rooms: args
105+
.values_of("room")
102106
.map(|it| it.map(|v| RoomName::new(v)).collect::<Result<_, _>>())
103107
.unwrap_or_else(|| Ok(Vec::new()))?,
104-
map_view: args.values_of("map-view")
108+
map_view: args
109+
.values_of("map-view")
105110
.map(|it| it.map(|v| RoomName::new(v)).collect::<Result<_, _>>())
106111
.unwrap_or_else(|| Ok(Vec::new()))?,
107-
url: args.value_of("url")
112+
url: args
113+
.value_of("url")
108114
.map(|v| v.to_owned().into())
109115
.unwrap_or_else(|| screeps_api::DEFAULT_OFFICIAL_API_URL.into()),
110116
})
111117
}
112118

113-
fn subscribe_with(&self, id: &str) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
119+
fn subscribe_with(
120+
&self,
121+
id: &str,
122+
) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
114123
use screeps_api::websocket::subscribe;
115124

116125
let mut messages = Vec::with_capacity(
117-
1 + self.cpu as usize + self.messages as usize + self.credits as usize + self.console as usize
118-
+ self.rooms.len() + self.map_view.len(),
126+
1 + self.cpu as usize
127+
+ self.messages as usize
128+
+ self.credits as usize
129+
+ self.console as usize
130+
+ self.rooms.len()
131+
+ self.map_view.len(),
119132
);
120133

121134
messages.push(subscribe(&Channel::ServerMessages));
@@ -237,7 +250,8 @@ fn setup() -> Config {
237250
message: e.to_string(),
238251
kind: clap::ErrorKind::InvalidValue,
239252
info: None,
240-
}.exit(),
253+
}
254+
.exit(),
241255
}
242256
}
243257

@@ -265,7 +279,8 @@ fn main() {
265279
my_info.username
266280
);
267281

268-
let mut core = tokio_core::reactor::Core::new().expect("expected IO core to start up without issue.");
282+
let mut core =
283+
tokio_core::reactor::Core::new().expect("expected IO core to start up without issue.");
269284

270285
let handle = core.handle();
271286

@@ -281,7 +296,8 @@ fn main() {
281296

282297
sink.send(OwnedMessage::Text(screeps_api::websocket::authenticate(
283298
&token_storage.take_token().unwrap(),
284-
))).and_then(|sink| {
299+
)))
300+
.and_then(|sink| {
285301
let handler = Handler::new(token_storage, my_info, config);
286302

287303
sink.send_all(
@@ -296,7 +312,8 @@ fn main() {
296312
.flatten(),
297313
)
298314
})
299-
})).expect("expected websocket connection to complete successfully, but an error occurred");
315+
}))
316+
.expect("expected websocket connection to complete successfully, but an error occurred");
300317
}
301318

302319
struct Handler<T>
@@ -320,11 +337,14 @@ where
320337
}
321338
}
322339

323-
fn handle_data(&self, data: OwnedMessage) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
340+
fn handle_data(
341+
&self,
342+
data: OwnedMessage,
343+
) -> Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>> {
324344
match data {
325345
OwnedMessage::Text(string) => {
326-
let data =
327-
SockjsMessage::parse(&string).expect("expected a correct SockJS message, found a parse error.");
346+
let data = SockjsMessage::parse(&string)
347+
.expect("expected a correct SockJS message, found a parse error.");
328348

329349
match data {
330350
SockjsMessage::Open => debug!("SockJS connection opened"),
@@ -339,7 +359,10 @@ where
339359
.map(|message| Ok(self.handle_parsed_message(message)))
340360
.collect::<Vec<_>>();
341361

342-
return Box::new(stream::iter_result::<_, _, websocket::WebSocketError>(results).flatten());
362+
return Box::new(
363+
stream::iter_result::<_, _, websocket::WebSocketError>(results)
364+
.flatten(),
365+
);
343366
}
344367
}
345368
}
@@ -371,14 +394,14 @@ where
371394

372395
return Box::new(
373396
self.config.subscribe_with(&self.info.user_id).chain(
374-
stream::futures_unordered(vec![
375-
future::lazy(|| {
376-
warn!("subscribed!");
377-
future::ok::<_, websocket::WebSocketError>(stream::empty())
378-
}),
379-
]).flatten(),
397+
stream::futures_unordered(vec![future::lazy(|| {
398+
warn!("subscribed!");
399+
future::ok::<_, websocket::WebSocketError>(stream::empty())
400+
})])
401+
.flatten(),
380402
),
381-
) as Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>>;
403+
)
404+
as Box<Stream<Item = OwnedMessage, Error = websocket::WebSocketError>>;
382405
}
383406
ScreepsMessage::ChannelUpdate { update } => {
384407
self.handle_update(update);
@@ -432,7 +455,8 @@ where
432455
room_name,
433456
serde_json::to_string_pretty(&serde_json::Value::Object(
434457
update.objects.iter().cloned().collect()
435-
)).expect("expected to_string to succeed on plain map.")
458+
))
459+
.expect("expected to_string to succeed on plain map.")
436460
);
437461
}
438462
ChannelUpdate::NoRoomDetail {

Diff for: ‎rustfmt.toml

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
max_width = 120
2-
comment_width = 120
31
report_fixme = "unnumbered"
42
use_try_shorthand = true
5-
write_mode = "overwrite"
63
condense_wildcard_suffixes = true
74
format_strings = false

0 commit comments

Comments
 (0)