Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Cache build artifacts
uses: swatinem/rust-cache@v2.7.8
with:
prefix-key: cargo-1.87.0
prefix-key: cargo-1.88.0

- name: Cache compilation artifacts
uses: mozilla-actions/sccache-action@v0.0.9
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Cache build artifacts
uses: swatinem/rust-cache@v2.7.8
with:
prefix-key: cargo-1.87.0
prefix-key: cargo-1.88.0

- name: Cache compilation artifacts
uses: mozilla-actions/sccache-action@v0.0.9
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.87.0"
channel = "1.88.0"
components = ["clippy", "rustfmt"]
2 changes: 1 addition & 1 deletion src/crates/crates_4891/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl Crates4891 {

impl Display for Crates4891 {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/crates/crates_6164/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Crates6164 {

impl Display for Crates6164 {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/crates/db_dump/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl DbDump {

impl Display for DbDump {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/crates/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/// let url = crate_url(base_url, krate, version);
/// ```
pub fn crate_url(base_url: &str, krate: &str, version: &str) -> String {
format!("{}/crates/{}/{}-{}.crate", base_url, krate, krate, version)
format!("{base_url}/crates/{krate}/{krate}-{version}.crate")
}

#[cfg(test)]
Expand Down
2 changes: 1 addition & 1 deletion src/releases/doc_router/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl DocRouter {

impl Display for DocRouter {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/releases/doc_router/redirect_minor_versions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl RedirectMinorVersions {

impl Display for RedirectMinorVersions {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down Expand Up @@ -77,8 +77,7 @@ impl Test for RedirectMinorVersions {

return test_result
.message(Some(format!(
"Expected a redirect to {}, got {}",
expected_location, location
"Expected a redirect to {expected_location}, got {location}"
)))
.build();
}
Expand Down
5 changes: 2 additions & 3 deletions src/releases/doc_router/redirect_root.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl RedirectRoot {

impl Display for RedirectRoot {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down Expand Up @@ -69,8 +69,7 @@ impl Test for RedirectRoot {

return test_result
.message(Some(format!(
"Expected a redirect to {}, got {}",
expected_location, location
"Expected a redirect to {expected_location}, got {location}"
)))
.build();
}
Expand Down
4 changes: 2 additions & 2 deletions src/releases/list_files/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl ListFiles {

impl Display for ListFiles {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down Expand Up @@ -83,7 +83,7 @@ async fn request_index_and_expect_loading_files(
) -> TestResult {
let test_result = TestResult::builder().name(name).success(false);

let response = match reqwest::get(format!("{}/dist/{}/index.html", base_url, release)).await {
let response = match reqwest::get(format!("{base_url}/dist/{release}/index.html")).await {
Ok(response) => response,
Err(error) => {
return test_result.message(Some(error.to_string())).build();
Expand Down
4 changes: 2 additions & 2 deletions src/releases/rustup_sh/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl RustupSh {

impl Display for RustupSh {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down Expand Up @@ -85,7 +85,7 @@ async fn request_rustup_and_expect_redirect(name: &'static str, base_url: &str)
.redirect(Policy::none())
.build()
.expect("failed to build reqwest client")
.get(format!("{}/rustup.sh", base_url))
.get(format!("{base_url}/rustup.sh"))
.send()
.await
{
Expand Down
2 changes: 1 addition & 1 deletion src/rustup/win_rustup_rs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl WinRustupRs {

impl Display for WinRustupRs {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", NAME)
write!(f, "{NAME}")
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/test_group_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ impl Display for TestGroupResult {
let emoji = if self.success() { "✅" } else { "❌" };
let display = format!("{} {}", emoji, self.name());

writeln!(f, "{}", display)?;
writeln!(f, "{display}")?;

let mut sorted_results = self.results.clone();
sorted_results.sort();

for result in sorted_results {
writeln!(f, " {}", result)?;
writeln!(f, " {result}")?;
}

Ok(())
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl Display for TestResult {
display.push_str(message);
}

write!(f, "{}", display)
write!(f, "{display}")
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/test_suite_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ impl Display for TestSuiteResult {
let emoji = if self.success() { "✅" } else { "❌" };
let display = format!("{} {}", emoji, self.name());

writeln!(f, "{}", display)?;
writeln!(f, "{display}")?;

let mut sorted_results = self.results.clone();
sorted_results.sort();

for result in sorted_results {
let indented_result = indent_all_by(2, result.to_string());
write!(f, "{}", indented_result)?;
write!(f, "{indented_result}")?;
}

Ok(())
Expand Down
Loading