Skip to content
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.

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

Unbreak non-x86 build on FreeBSD #850

Merged
merged 1 commit into from Apr 24, 2020
Merged

Unbreak non-x86 build on FreeBSD #850

merged 1 commit into from Apr 24, 2020

Conversation

ghost
Copy link

@ghost ghost commented Apr 24, 2020

error[E0432]: unresolved import `self::arm::check_for`
  --> src/libstd/../stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs:11:17
   |
11 |         pub use self::arm::check_for;
   |                 ^^^^^^^^^^^^^^^^^^^^ no `check_for` in `std_detect::detect::os::arm`

error[E0425]: cannot find value `detect_features` in module `self::os`
   --> src/libstd/../stdarch/crates/std_detect/src/detect/mod.rs:121:37
    |
121 |     cache::test(x as u32, self::os::detect_features)
    |                                     ^^^^^^^^^^^^^^^ not found in `self::os`
    |
help: possible candidate is found in another module, you can import it into scope
    |
20  | use crate::std_detect::detect::os::arm::detect_features;

Regressed by: 9fad964
Found during Rust 1.43.0 package update: https://reviews.freebsd.org/D24521
Submitted by: @MikaelUrankar

error[E0432]: unresolved import `self::arm::check_for`
  --> src/libstd/../stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs:11:17
   |
11 |         pub use self::arm::check_for;
   |                 ^^^^^^^^^^^^^^^^^^^^ no `check_for` in `std_detect::detect::os::arm`

error[E0425]: cannot find value `detect_features` in module `self::os`
   --> src/libstd/../stdarch/crates/std_detect/src/detect/mod.rs:121:37
    |
121 |     cache::test(x as u32, self::os::detect_features)
    |                                     ^^^^^^^^^^^^^^^ not found in `self::os`
    |
help: possible candidate is found in another module, you can import it into scope
    |
20  | use crate::std_detect::detect::os::arm::detect_features;
@rust-highfive
Copy link

r? @gnzlbg

(rust_highfive has picked a reviewer for you, use r? to override)

@Amanieu Amanieu merged commit d10eefc into rust-lang:master Apr 24, 2020
@Amanieu
Copy link
Member

Amanieu commented Apr 24, 2020

Does this need to be backported to stable?

@ghost
Copy link
Author

ghost commented Apr 24, 2020

Thanks. We patched it locally, but it would be nice if we could drop this patch again when Rust 1.44.0 (or 1.43.1 if there is one) is released.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2020
Update stdarch submodule

Includes :
- rust-lang/stdarch#849 which stabilizes the remaining x86 features for feature detection.
- rust-lang/stdarch#850 which fixes building stdarch on FreeBSD.

Fixes rust-lang#71473
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants