Skip to content

Update to Rust v1.88 #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 29, 2025
Merged

Update to Rust v1.88 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af57620
Update Rust toolchain version to v1.88
kylewlacy Jun 29, 2025
ae28067
Update `brioche.lock`
kylewlacy Jun 29, 2025
a673cf2
Fix new "unused mut" warning
kylewlacy Jun 29, 2025
b1b9c5c
Update `project.bri` to replace custom `sqlx-cli` build with package
kylewlacy Jun 29, 2025
12044fd
Update `project.bri` to run validation steps in parallel
kylewlacy Jun 29, 2025
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace.package]
edition = "2024"
rust-version = "1.87" # To align with the rust-toolchain.toml
rust-version = "1.88" # To align with the rust-toolchain.toml

[workspace]
members = [
Expand Down
18 changes: 6 additions & 12 deletions brioche.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/brioche-core/src/download.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub async fn download(
}
});

let mut download_stream = response
let download_stream = response
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

download_stream gets wrapped with std::pin::pin!(). In Rust v1.88, this started triggering an unused_mut warning.

I couldn't find anything in the release notes that would explain why this is now a warning, but I'm guessing it's probably a result of this change: rust-lang/rust#139114

.bytes_stream()
.map_err(futures::io::Error::other)
.into_async_read()
Expand Down
22 changes: 2 additions & 20 deletions project.bri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import rust, { cargoBuild, vendorCrate } from "rust";
import curl from "curl";
import caCertificates from "ca_certificates";
import nodejs, { npmInstall } from "nodejs";
import { gitCheckout } from "git";
import openssl from "openssl";
import sqlxCli from "sqlx_cli";

/**
* Returns a recipe to build Brioche itself. This results in a packed build,
Expand Down Expand Up @@ -34,8 +33,7 @@ export default function (): std.Recipe<std.Directory> {
// Makefiles for miscellaneous tasks
"**/Makefile",
);
source = validateRuntime(source);
source = validateSqlxMetadata(source);
source = std.merge(validateRuntime(source), validateSqlxMetadata(source));

return cargoBuild({
source,
Expand Down Expand Up @@ -133,22 +131,6 @@ export function runtime(): std.Recipe<std.Directory> {
.toDirectory();
}

export function sqlxCli() {
const source = gitCheckout(
Brioche.gitRef({
repository: "https://github.com/launchbadge/sqlx.git",
ref: "v0.7.4",
}),
);

return cargoBuild({
source,
path: "sqlx-cli",
dependencies: [openssl()],
runnable: "bin/sqlx",
});
}

interface ValidateOptions {
recipe: std.Recipe<std.Directory>;
validation: std.Recipe<std.Directory>;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.87"
channel = "1.88"
profile = "default"
targets = ["x86_64-unknown-linux-musl"]