nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-22 11:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #70600 - danielframpton:aarch64-windows-tests, r=alexcrichton

Browse Source 
Ensure there are versions of test code for aarch64 windows

Remove the `cfg` flags that were preventing some tests from running on `aarch64-pc-windows-msvc`.

All the existing `target_os = windows` targets had the same `align()` and `size()` values, so this change just removes the `target_arch` flags.

r? @alexcrichton
This commit is contained in:
Dylan DPC 2020-03-31 19:29:31 +02:00 committed by GitHub
commit b9546075ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/ui/intrinsics/intrinsic-alignment.rs
View File

@ -56,16 +56,6 @@ mod m {
#[cfg(target_os = "windows")]
mod m {
#[main]
#[cfg(target_arch = "x86")]
pub fn main() {
unsafe {
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
assert_eq!(::rusti::min_align_of::<u64>(), 8);
}
}
#[main]
#[cfg(target_arch = "x86_64")]
pub fn main() {
unsafe {
assert_eq!(::rusti::pref_align_of::<u64>(), 8);

7
src/test/ui/structs-enums/rec-align-u64.rs
View File

@ -67,13 +67,6 @@ mod m {
#[cfg(target_os = "windows")]
mod m {
#[cfg(target_arch = "x86")]
pub mod m {
pub fn align() -> usize { 8 }
pub fn size() -> usize { 16 }
}
#[cfg(target_arch = "x86_64")]
pub mod m {
pub fn align() -> usize { 8 }
pub fn size() -> usize { 16 }