-
Notifications
You must be signed in to change notification settings - Fork 33
Conversation
nox
commented
Feb 19, 2016
1bc06a9
to
3c3c9e4
Compare
This is blocked by #44 because heapsize is broken with last nightlies. |
r=me once #44 lands |
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" | ||
- rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" | ||
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin | ||
- SET PATH=%PATH%;C:\MinGW\bin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is not needed unless you intend to actually use MinGW. -gnu
Rust comes with a bundled MinGW which should be sufficient for most needs.
439e658
to
70c7ede
Compare
|
||
let heap = GetProcessHeap(); | ||
|
||
if ptr as usize % (MIN_ALIGN * 2) != 0 && HeapValidate(heap, 0, ptr) == 0 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should actually be ptr as usize % (MIN_ALIGN * 2) == 0
. Personally I'd just depend entirely on HeapValidate
.
const MIN_ALIGN: usize = 8; | ||
#[cfg(all(any(target_arch = "x86_64", | ||
target_arch = "aarch64")))] | ||
const MIN_ALIGN: usize = 16; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't actually use MIN_ALIGN
anywhere in this function.
d185f75
to
d64e96f
Compare
☔ The latest upstream changes (presumably #46) made this pull request unmergeable. Please resolve the merge conflicts. |
We use HeapSize with GetProcessHeap() and flags 0, like Rust itself.
@bors-servo r+ |
📌 Commit eec2c5d has been approved by |
Use AppVeyor <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/heapsize/45) <!-- Reviewable:end -->
@bors-servo r- AppVeyor unhappy. |
Ah no, never mind. |
@bors-servo r=larsbergstrom |
📌 Commit eec2c5d has been approved by |
☀️ Test successful - travis |