Skip to content

Commit e9588a0

Browse files
committed
apply formatting changes of edition 2024
1 parent 63ef491 commit e9588a0

File tree

6 files changed

+37
-33
lines changed

6 files changed

+37
-33
lines changed

Diff for: src/cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use std::future::Future;
33
use std::sync::Arc;
44
use std::time::Instant;
55

6+
use rocket::State;
67
use rocket::tokio::sync::RwLock;
78
use rocket::tokio::task;
8-
use rocket::State;
99

1010
const CACHE_TTL_SECS: u64 = 120;
1111

Diff for: src/caching.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rocket::fs::NamedFile;
2-
use rocket::http::{hyper, Header};
2+
use rocket::http::{Header, hyper};
33
use rocket::response::Responder;
44

55
#[derive(Responder)]

Diff for: src/i18n.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use serde::Serialize;
77
use std::{collections::HashSet, sync::LazyLock};
88

99
use handlebars_fluent::{
10-
fluent_bundle::{concurrent::FluentBundle, FluentResource, FluentValue},
10+
fluent_bundle::{FluentResource, FluentValue, concurrent::FluentBundle},
1111
loader::SimpleLoader,
1212
simple_loader,
1313
};

Diff for: src/main.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use rocket::tokio::sync::RwLock;
1515
use rust_version::RustReleasePost;
1616
use rust_version::RustVersion;
1717
use serde::Serialize;
18-
use teams::encode_zulip_stream;
1918
use teams::RustTeams;
19+
use teams::encode_zulip_stream;
2020

2121
use std::collections::hash_map::DefaultHasher;
2222
use std::env;
@@ -30,17 +30,17 @@ use rocket::{
3030
fs::NamedFile,
3131
http::Status,
3232
request::{FromParam, Request},
33-
response::{content, Redirect},
33+
response::{Redirect, content},
3434
};
3535
use rocket_dyn_templates::Template;
3636

37-
use sass_rs::{compile_file, Options};
37+
use sass_rs::{Options, compile_file};
3838

3939
use category::Category;
4040

4141
use caching::CachedNamedFile;
42-
use handlebars_fluent::{loader::Loader, FluentHelper};
43-
use i18n::{create_loader, LocaleInfo, SupportedLocale, TeamHelper, EXPLICIT_LOCALE_INFO};
42+
use handlebars_fluent::{FluentHelper, loader::Loader};
43+
use i18n::{EXPLICIT_LOCALE_INFO, LocaleInfo, SupportedLocale, TeamHelper, create_loader};
4444

4545
const ZULIP_DOMAIN: &str = "https://rust-lang.zulipchat.com";
4646

Diff for: src/teams.rs

+28-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
1+
use percent_encoding::{AsciiSet, NON_ALPHANUMERIC, utf8_percent_encode};
22
use rocket_dyn_templates::handlebars::{
33
Context, Handlebars, Helper, HelperResult, Output, RenderContext, RenderErrorReason,
44
};
5-
use rust_team_data::v1::{Team, TeamKind, Teams, BASE_URL};
5+
use rust_team_data::v1::{BASE_URL, Team, TeamKind, Teams};
66
use serde::Serialize;
77
use std::cmp::Reverse;
88
use std::collections::HashMap;
@@ -416,23 +416,26 @@ mod tests {
416416
bar.kind = TeamKind::WorkingGroup;
417417
let data = Data::dummy(vec![foo, bar]);
418418

419-
assert!(data
420-
.clone()
421-
.page_data("teams", "unknown")
422-
.err()
423-
.unwrap()
424-
.is::<TeamNotFound>());
425-
assert!(data
426-
.clone()
427-
.page_data("wgs", "foo")
428-
.err()
429-
.unwrap()
430-
.is::<TeamNotFound>());
431-
assert!(data
432-
.page_data("teams", "bar")
433-
.err()
434-
.unwrap()
435-
.is::<TeamNotFound>());
419+
assert!(
420+
data.clone()
421+
.page_data("teams", "unknown")
422+
.err()
423+
.unwrap()
424+
.is::<TeamNotFound>()
425+
);
426+
assert!(
427+
data.clone()
428+
.page_data("wgs", "foo")
429+
.err()
430+
.unwrap()
431+
.is::<TeamNotFound>()
432+
);
433+
assert!(
434+
data.page_data("teams", "bar")
435+
.err()
436+
.unwrap()
437+
.is::<TeamNotFound>()
438+
);
436439
}
437440

438441
#[test]
@@ -441,10 +444,11 @@ mod tests {
441444
foo.subteam_of = Some("bar".into());
442445
let data = Data::dummy(vec![foo, dummy_team("bar")]);
443446

444-
assert!(data
445-
.page_data("teams", "foo")
446-
.err()
447-
.unwrap()
448-
.is::<TeamNotFound>());
447+
assert!(
448+
data.page_data("teams", "foo")
449+
.err()
450+
.unwrap()
451+
.is::<TeamNotFound>()
452+
);
449453
}
450454
}

Diff for: tests/well_known_security.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use time::{format_description::well_known::Rfc3339, OffsetDateTime};
1+
use time::{OffsetDateTime, format_description::well_known::Rfc3339};
22

33
static TEXT: &str = include_str!("../static/text/well_known_security.txt");
44

0 commit comments

Comments
 (0)