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.

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

remove stdsimd feature flag #548

Merged
merged 6 commits into from
Feb 12, 2024
+2 −1
Merged

remove stdsimd feature flag #548

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad11164
remove stdsimd feature flag
jonaspleyer Feb 6, 2024
06891ae
include suggestion from @jayvdb for including aarch64 flags
jonaspleyer Feb 12, 2024
71041c8
Merge branch 'main' into patch-1
s3bk Feb 12, 2024
75ea8df
change nightly feature flag to pf_rustc_nightly
jonaspleyer Feb 12, 2024
4142c2b
Merge remote-tracking branch 'refs/remotes/jonaspleyer@github/patch-1…
jonaspleyer Feb 12, 2024
e1884d0
Merge branch 'main' into patch-1
s3bk Feb 12, 2024
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
3 changes: 2 additions & 1 deletion simd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// except according to those terms.

#![cfg_attr(pf_rustc_nightly, feature(link_llvm_intrinsics, platform_intrinsics))]
#![cfg_attr(pf_rustc_nightly, feature(simd_ffi, stdsimd))]
#![cfg_attr(all(target_arch = "aarch64", nightly), feature(stdarch_arm_crc32))]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this use pf_rustc_nightly or nightly ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build seems to be working with both the nightly and pf_rustc_nightly flags. I tested with the following compilers:

active toolchain
----------------

nightly-2024-02-05-x86_64-unknown-linux-gnu (default)
rustc 1.78.0-nightly (268dbbbc4 2024-02-04)

active toolchain
----------------

beta-x86_64-unknown-linux-gnu (default)
rustc 1.77.0-beta.2 (f2048098a 2024-02-09)

However, the current nightly compiler fails again with a different error message.

active toolchain
----------------

nightly-x86_64-unknown-linux-gnu (default)
rustc 1.78.0-nightly (1a648b397 2024-02-11)

Error:

error[E0080]: could not evaluate static initializer
   --> /home/REDACTED/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/num/nonzero.rs:119:21
    |
119 |                     intrinsics::unreachable()
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^ entering unreachable code
    |
note: inside `NonZero::<u32>::new_unchecked`
   --> /home/REDACTED/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/num/nonzero.rs:119:21
    |
119 |                     intrinsics::unreachable()
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
note: inside `Entry::new`
   --> /home/REDACTED/.cargo/registry/src/index.crates.io-6f17d22bba15001f/pdf_encoding-0.1.0/src/lib.rs:109:17
    |
109 |                 NonZeroU32::new_unchecked(c as u32)
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: inside `c`
   --> /home/REDACTED/.cargo/registry/src/index.crates.io-6f17d22bba15001f/pdf_encoding-0.1.0/src/lib.rs:123:10
    |
123 |     Some(Entry::new(c))
    |          ^^^^^^^^^^^^^
note: inside `WINANSI`
   --> /home/REDACTED/.cargo/registry/src/index.crates.io-6f17d22bba15001f/pdf_encoding-0.1.0/src/cp1252.rs:2:2
    |
2   |  c('\u{0000}'), c('\u{0001}'), c('\u{0002}'), c('\u{0003}'), c('\u{0004}'), c('\u{0005}'), c('\u{0006}'), c('\u{0007}'),
    |  ^^^^^^^^^^^^^

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Well, at least I can fix that easily.

#![cfg_attr(pf_rustc_nightly, feature(simd_ffi))]

//! A minimal SIMD abstraction, usable outside of Pathfinder.

Expand Down
Loading