diff --git a/crates/metadata/lib.rs b/crates/metadata/lib.rs index 4f8f746c8..1b3fbfe5b 100644 --- a/crates/metadata/lib.rs +++ b/crates/metadata/lib.rs @@ -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", ]; @@ -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" ] /// ``` @@ -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" ] @@ -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; diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs index 0b215ee34..031ca59df 100644 --- a/src/docbuilder/rustwide_builder.rs +++ b/src/docbuilder/rustwide_builder.rs @@ -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", ] @@ -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(), ], diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs index 9959b1210..fd40e1b27 100644 --- a/src/web/rustdoc.rs +++ b/src/web/rustdoc.rs @@ -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, @@ -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?; @@ -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( diff --git a/templates/core/Cargo.toml.example b/templates/core/Cargo.toml.example index 187b9ce45..90a709717 100644 --- a/templates/core/Cargo.toml.example +++ b/templates/core/Cargo.toml.example @@ -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 @@ -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"]