Skip to content

xtask: Fully drop support for build-std #585

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 1 commit into from
Feb 23, 2023
Merged

xtask: Fully drop support for build-std #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/msrv_toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
# Oldest nightly that currently works with `cargo xtask build`.
channel = "nightly-2022-08-25"
components = ["rust-src"]
channel = "nightly-2022-11-22"
targets = ["aarch64-unknown-uefi", "i686-unknown-uefi", "x86_64-unknown-uefi"]
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ prerequisites for running the tests.
For instructions on how to create your own UEFI apps, see the [BUILDING.md](BUILDING.md) file.

The uefi-rs crates currently require some [unstable features].
The nightly MSRV is currently 2022-08-25.
The nightly MSRV is currently 2022-11-22.

[unstable features]: https://github.com/rust-osdev/uefi-rs/issues/452

Expand Down
2 changes: 1 addition & 1 deletion uefi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ For additional information, refer to the [UEFI specification][spec].
For instructions on how to create your own UEFI apps, see the [tutorial].

The uefi-rs crates currently require some [unstable features].
The nightly MSRV is currently 2022-08-25.
The nightly MSRV is currently 2022-11-22.

[unstable features]: https://github.com/rust-osdev/uefi-rs/issues/452
[tutorial]: https://rust-osdev.github.io/uefi-rs/HEAD/tutorial/introduction.html
Expand Down
20 changes: 0 additions & 20 deletions xtask/src/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,19 +212,6 @@ pub fn fix_nested_cargo_env(cmd: &mut Command) {
cmd.env("PATH", sanitized_path(orig_path));
}

/// Check if the three UEFI targets are installed via rustup (only
/// supported since nightly-2022-11-10).
fn is_target_installed(target: &str) -> Result<bool> {
let output = Command::new("rustup")
.args(["target", "list", "--installed"])
.output()?;
if !output.status.success() {
bail!("failed to get installed targets");
}
let stdout = String::from_utf8(output.stdout)?;
Ok(stdout.lines().any(|x| x == target))
}

#[derive(Debug)]
pub struct Cargo {
pub action: CargoAction,
Expand Down Expand Up @@ -290,13 +277,6 @@ impl Cargo {

if let Some(target) = self.target {
cmd.args(["--target", target.as_triple()]);

// If the target is not installed, use build-std. Keep this
// around until our minimum-supported nightly version is at
// least 2022-11-10.
if !is_target_installed(target.as_triple())? {
cmd.args(["-Zbuild-std=core,alloc"]);
}
}

if self.packages.is_empty() {
Expand Down