Skip to content

Replace x86_64-apple-darwin with aarch64-apple-darwin as default target #2927

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace x86_64-apple-darwin with aarch64-apple-darwin as default target #2927

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
8 changes: 4 additions & 4 deletions crates/metadata/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub const HOST_TARGET: &str = env!("DOCSRS_METADATA_HOST_TARGET");
pub const DEFAULT_TARGETS: &[&str] = &[
"i686-pc-windows-msvc",
"i686-unknown-linux-gnu",
"x86_64-apple-darwin",
"aarch64-apple-darwin",
"x86_64-pc-windows-msvc",
"x86_64-unknown-linux-gnu",
];
Expand Down Expand Up @@ -92,7 +92,7 @@ pub enum MetadataError {
/// all-features = true
/// no-default-features = true
/// default-target = "x86_64-unknown-linux-gnu"
/// targets = [ "x86_64-apple-darwin", "x86_64-pc-windows-msvc" ]
/// targets = [ "aarch64-apple-darwin", "x86_64-pc-windows-msvc" ]
/// rustc-args = [ "--example-rustc-arg" ]
/// rustdoc-args = [ "--example-rustdoc-arg" ]
/// ```
Expand Down Expand Up @@ -379,7 +379,7 @@ mod test_parsing {
all-features = true
no-default-features = true
default-target = "x86_64-unknown-linux-gnu"
targets = [ "x86_64-apple-darwin", "x86_64-pc-windows-msvc" ]
targets = [ "aarch64-apple-darwin", "x86_64-pc-windows-msvc" ]
rustc-args = [ "--example-rustc-arg" ]
rustdoc-args = [ "--example-rustdoc-arg" ]
cargo-args = [ "-Zbuild-std" ]
Expand All @@ -405,7 +405,7 @@ mod test_parsing {

let targets = metadata.targets.expect("should have explicit target");
assert_eq!(targets.len(), 2);
assert_eq!(targets[0], "x86_64-apple-darwin");
assert_eq!(targets[0], "aarch64-apple-darwin");
assert_eq!(targets[1], "x86_64-pc-windows-msvc");

let rustc_args = metadata.rustc_args;
Expand Down
4 changes: 2 additions & 2 deletions src/docbuilder/rustwide_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,9 +1471,9 @@ mod tests {
assert_eq!(
targets,
vec![
"aarch64-apple-darwin",
"i686-pc-windows-msvc",
"i686-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-pc-windows-msvc",
"x86_64-unknown-linux-gnu",
]
Expand Down Expand Up @@ -1675,7 +1675,7 @@ mod tests {
vec![
"i686-pc-windows-msvc".into(),
"i686-unknown-linux-gnu".into(),
"x86_64-apple-darwin".into(),
"aarch64-apple-darwin".into(),
"x86_64-pc-windows-msvc".into(),
"x86_64-unknown-linux-gnu".into(),
],
Expand Down
10 changes: 5 additions & 5 deletions src/web/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2247,7 +2247,7 @@ mod test {
async_wrapper(|env| async move {
let web = env.web_app().await;
assert_eq!(
web.get("/crate/fdsafdsafdsafdsa/0.1.0/target-redirect/x86_64-apple-darwin/")
web.get("/crate/fdsafdsafdsafdsa/0.1.0/target-redirect/aarch64-apple-darwin/")
.await?
.status(),
StatusCode::NOT_FOUND,
Expand Down Expand Up @@ -2320,7 +2320,7 @@ mod test {
.await?;
let web = env.web_app().await;
web.assert_redirect(
"/crate/dummy/0.1.0/target-redirect/x86_64-apple-darwin",
"/crate/dummy/0.1.0/target-redirect/aarch64-apple-darwin",
"/dummy/0.1.0/dummy/",
)
.await?;
Expand All @@ -2329,12 +2329,12 @@ mod test {
.name("dummy")
.version("0.2.0")
.archive_storage(archive_storage)
.add_platform("x86_64-apple-darwin")
.add_platform("aarch64-apple-darwin")
.create()
.await?;
web.assert_redirect(
"/crate/dummy/0.2.0/target-redirect/x86_64-apple-darwin",
"/dummy/0.2.0/x86_64-apple-darwin/dummy/",
"/crate/dummy/0.2.0/target-redirect/aarch64-apple-darwin",
"/dummy/0.2.0/aarch64-apple-darwin/dummy/",
)
.await?;
web.assert_redirect(
Expand Down
4 changes: 2 additions & 2 deletions templates/core/Cargo.toml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ default-target = "x86_64-unknown-linux-gnu"
#
# Default targets:
# - x86_64-unknown-linux-gnu
# - x86_64-apple-darwin
# - aarch64-apple-darwin
# - x86_64-pc-windows-msvc
# - i686-unknown-linux-gnu
# - i686-pc-windows-msvc
Expand All @@ -34,7 +34,7 @@ default-target = "x86_64-unknown-linux-gnu"
# Otherwise, these `targets` are built in addition to the default target.
# If both `default-target` and `targets` are unset,
# all tier-one targets will be built and `x86_64-unknown-linux-gnu` will be used as the default target.
targets = ["x86_64-apple-darwin", "x86_64-pc-windows-msvc"]
targets = ["aarch64-apple-darwin", "x86_64-pc-windows-msvc"]

# Additional `RUSTFLAGS` to set (default: [])
rustc-args = ["--example-rustc-arg"]
Expand Down
Loading