Skip to content
This repository was archived by the owner on Jul 10, 2023. It is now read-only.

Use AppVeyor #45

Merged
merged 2 commits into from
Feb 22, 2016
Merged

Use AppVeyor #45

merged 2 commits into from
Feb 22, 2016

Conversation

nox
Copy link
Contributor

@nox nox commented Feb 19, 2016

Review on Reviewable

@nox nox force-pushed the appveyor branch 2 times, most recently from 1bc06a9 to 3c3c9e4 Compare February 19, 2016 15:12
@nox
Copy link
Contributor Author

nox commented Feb 19, 2016

This is blocked by #44 because heapsize is broken with last nightlies.

@larsbergstrom
Copy link
Contributor

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

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.

@nox nox force-pushed the appveyor branch 4 times, most recently from 439e658 to 70c7ede Compare February 19, 2016 20:20

let heap = GetProcessHeap();

if ptr as usize % (MIN_ALIGN * 2) != 0 && HeapValidate(heap, 0, ptr) == 0 {

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;

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.

@nox nox force-pushed the appveyor branch 4 times, most recently from d185f75 to d64e96f Compare February 20, 2016 15:49
@nox nox mentioned this pull request Feb 20, 2016
@bors-servo
Copy link

☔ The latest upstream changes (presumably #46) made this pull request unmergeable. Please resolve the merge conflicts.

nox added 2 commits February 22, 2016 15:48
We use HeapSize with GetProcessHeap() and flags 0, like Rust itself.
@larsbergstrom
Copy link
Contributor

@bors-servo r+

@bors-servo
Copy link

📌 Commit eec2c5d has been approved by larsbergstrom

@bors-servo
Copy link

⌛ Testing commit eec2c5d with merge d5f3026...

bors-servo pushed a commit that referenced this pull request Feb 22, 2016
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 -->
@nox
Copy link
Contributor Author

nox commented Feb 22, 2016

@bors-servo r-

AppVeyor unhappy.

@nox
Copy link
Contributor Author

nox commented Feb 22, 2016

Ah no, never mind.

@nox
Copy link
Contributor Author

nox commented Feb 22, 2016

@bors-servo r=larsbergstrom

@bors-servo
Copy link

📌 Commit eec2c5d has been approved by larsbergstrom

@bors-servo
Copy link

☀️ Test successful - travis

@bors-servo bors-servo merged commit eec2c5d into servo:master Feb 22, 2016
@nox nox deleted the appveyor branch February 22, 2016 14:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants