Unrolled build for #148914

rust-timer · web-flow · commit e28a6cd25c40 · 2025-11-17T00:09:49.000+01:00
Rollup merge of #148914 - folkertdev:aarch64-openbsd-fix-import, r=Mark-Simulacrum fix incorrect import in `std_detect` on `aarch64-unknown-openbsd` fixes #148898 In #147024 the module structure of `std_detect` for `openbsd` was changed which invalidated this `super::` usage. I've now tested that `std_detect` builds (or well, checks, because I don't have the right linkers) with `aarch64-unknown-openbsd` and `powerpc64-unknown-openbsd`.
diff --git a/library/std_detect/src/detect/os/openbsd/aarch64.rs b/library/std_detect/src/detect/os/openbsd/aarch64.rs
@@ -31,7 +31,7 @@ pub(crate) fn detect_features() -> cache::Initializer {
     // the feature is available.
     let aa64pfr0 = sysctl64(&[libc::CTL_MACHDEP, CPU_ID_AA64PFR0]);
 
-    super::aarch64::parse_system_registers(aa64isar0, aa64isar1, aa64mmfr2, aa64pfr0)
+    crate::detect::aarch64::parse_system_registers(aa64isar0, aa64isar1, aa64mmfr2, aa64pfr0)
 }
 
 #[inline]

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ pub(crate) fn detect_features() -> cache::Initializer {`
`31`	`31`	`// the feature is available.`
`32`	`32`	`let aa64pfr0 = sysctl64(&[libc::CTL_MACHDEP, CPU_ID_AA64PFR0]);`
`33`	`33`
`34`		`- super::aarch64::parse_system_registers(aa64isar0, aa64isar1, aa64mmfr2, aa64pfr0)`
	`34`	`+ crate::detect::aarch64::parse_system_registers(aa64isar0, aa64isar1, aa64mmfr2, aa64pfr0)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#[inline]`