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

Rollup of 10 pull requests #47276

Merged
merged 23 commits into from
Jan 9, 2018
Merged

Rollup of 10 pull requests #47276

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3cfea33
wherein careful doc-decoration arithmetic proves quite the ICE-breaker
zackmdavis Jan 5, 2018
fd37526
Make wasm obey backtrace feature, like other targets
aidanhs Jan 7, 2018
92189bc
Remove redundant -Zdebug-llvm option
dotdash Jan 5, 2018
4be1d5c
Remove dead function LLVMRustLinkInParsedExternalBitcode()
dotdash Jan 5, 2018
ebc8507
Remove dead function rustc_llvm::debug_loc_to_string()
dotdash Jan 5, 2018
907855f
Remove unused LLVMRustJITMemoryManagerRef typedef
dotdash Jan 6, 2018
9e4a692
Replace empty array hack with repr(align)
Jan 7, 2018
1df384d
Rename ReprExtern to ReprC, and similarily rename a few other fields …
Jan 7, 2018
1fc6ad5
Add HashMap::remove_entry
sfackler Jan 7, 2018
cf3fefe
rustc::ty: Rename `struct_variant` to `non_enum_variant`
Jan 7, 2018
8302044
rustdoc: Don't import macros from private imports
ollie27 Jan 8, 2018
1a7b00d
Don't look for niches inside generator types. Fixes #47253
Zoxc Jan 8, 2018
9396973
Add missing links
GuillaumeGomez Jan 8, 2018
4a6f440
Rollup merge of #47210 - zackmdavis:the_3rd_of_2_hardest_problems_in_…
kennytm Jan 8, 2018
1cbbbc0
Rollup merge of #47233 - dotdash:cleanup_llvm, r=alexcrichton
kennytm Jan 8, 2018
9214e9b
Rollup merge of #47246 - aidanhs:aphs-wasm-backtrace-feature, r=KodrAus
kennytm Jan 8, 2018
4c0823a
Rollup merge of #47254 - rkruppe:no-more-align-hack, r=alexcrichton
kennytm Jan 8, 2018
d72a509
Rollup merge of #47256 - rkruppe:misc-cleanup, r=eddyb
kennytm Jan 8, 2018
6648dcd
Rollup merge of #47258 - rkruppe:struct-assert, r=eddyb
kennytm Jan 8, 2018
5ffaf4c
Rollup merge of #47259 - sfackler:map-remove-entry, r=dtolnay
kennytm Jan 8, 2018
de4e1a9
Rollup merge of #47263 - ollie27:rustdoc_private_macro_import, r=Guil…
kennytm Jan 8, 2018
9dd7cae
Rollup merge of #47270 - Zoxc:gen-layout-fix, r=eddyb
kennytm Jan 8, 2018
9ef9854
Rollup merge of #47272 - GuillaumeGomez:missing-links, r=QuietMisdreavus
kennytm Jan 8, 2018
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
1 change: 0 additions & 1 deletion src/libstd/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@
#![feature(rand)]
#![feature(raw)]
#![feature(repr_align)]
#![feature(repr_simd)]
#![feature(rustc_attrs)]
#![feature(shared)]
#![feature(sip_hash_13)]
Expand Down
14 changes: 3 additions & 11 deletions src/libstd/sys/windows/c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ use os::raw::c_ulonglong;
use libc::{wchar_t, size_t, c_void};
use ptr;

#[repr(simd)]
#[repr(C)]
#[cfg(target_arch = "x86_64")]
struct u64x2(u64, u64);

pub use self::FILE_INFO_BY_HANDLE_CLASS::*;
pub use self::EXCEPTION_DISPOSITION::*;

Expand Down Expand Up @@ -700,9 +695,8 @@ pub struct FLOATING_SAVE_AREA {
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct CONTEXT {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub P1Home: DWORDLONG,
pub P2Home: DWORDLONG,
pub P3Home: DWORDLONG,
Expand Down Expand Up @@ -760,17 +754,15 @@ pub struct CONTEXT {
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct M128A {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
pub Low: c_ulonglong,
pub High: c_longlong
}

#[cfg(target_arch = "x86_64")]
#[repr(C)]
#[repr(C, align(16))]
pub struct FLOATING_SAVE_AREA {
_align_hack: [u64x2; 0], // FIXME align on 16-byte
_Dummy: [u8; 512] // FIXME: Fill this out
}

Expand Down