Skip to content

/ servo

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.

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

Move util::range into its own crate #9717

Merged
merged 1 commit into from Feb 26, 2016
Merged

Move util::range into its own crate #9717

merged 1 commit into from Feb 26, 2016

Conversation

@schuster
Copy link
Contributor

schuster commented Feb 21, 2016

Fixes #9695

Review on Reviewable
@highfive
Copy link

highfive commented Feb 21, 2016

warning Warning warning

  • These commits modify gfx and layout code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member

nox commented Feb 21, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2016

📌 Commit 7cfd441 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2016

⌛ Testing commit 7cfd441 with merge a6ae29f...
bors-servo added a commit that referenced this pull request Feb 21, 2016
@bors-servo
Auto merge of #9717 - schuster:move-range, r=nox
a6ae29f 
Move util::range into its own crate

Fixes #9695

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9717)
<!-- Reviewable:end -->
@nox nox self-assigned this Feb 21, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2016

💔 Test failed - gonk
@schuster
Copy link
Contributor Author

schuster commented Feb 22, 2016

I'm not sure how to interpret this test failure - is the problem that Cargo.lock changed? I think that's expected in this case, right?
@jdm
Copy link
Member

jdm commented Feb 22, 2016

@schuster: we have multiple Cargo.lock files that need to be changed simultaneously. ./mach build-cef and GONKDIR=/tmp ./mach build-gonkwill cause them to be updated appropriately.
@nox
Copy link
Member

nox commented Feb 22, 2016

No need to build these. Just run ./mach cargo-update -p gfx -p layout.
@nox
Copy link
Member

nox commented Feb 23, 2016

Please squash.
@schuster schuster force-pushed the schuster:move-range branch from 6bd68d7 to 7cb4d74 Feb 23, 2016
@schuster
Copy link
Contributor Author

schuster commented Feb 23, 2016

Oops, sorry. I'll take a look at what's going wrong and fix it.
@KiChjang
Copy link
Member

KiChjang commented Feb 23, 2016

@schuster You most probably need a rebase, and everything should work fine.
@jdm
Copy link
Member

jdm commented Feb 23, 2016 

cargo build -v

    Updating registry `https://github.com/rust-lang/crates.io-index`

    Updating git repository `https://github.com/glennw/webrender_traits`

    Updating git repository `https://github.com/servo/ipc-channel`

    Updating git repository `https://github.com/glennw/webrender`

    Updating git repository `https://github.com/ecoal95/rust-offscreen-rendering-context`

    Updating git repository `https://github.com/servo/rust-layers`

    Updating git repository `https://github.com/servo/gaol`

    Updating git repository `https://github.com/TyOverby/bincode`

    Updating git repository `https://github.com/Manishearth/rust-tenacious`

    Updating git repository `https://github.com/servo/rust-azure`

    Updating git repository `https://github.com/servo/rust-freetype`

    Updating git repository `https://github.com/Ygg01/xml5ever`

    Updating git repository `https://github.com/servo/rust-mozjs`

    Updating git repository `https://github.com/ecoal95/angle`

    Updating git repository `https://github.com/servo/mozjs`

    Updating git repository `https://github.com/huonw/simd`

failed to select a version for `heapsize` (required by `range`):

all possible versions conflict with previously selected versions of `heapsize`

  version 0.3.3 in use by heapsize v0.3.3

  possible versions to select: 0.3.0

Run ./mach update-cargo -p heapsize and it should be good.
@jdm jdm closed this Feb 23, 2016
@jdm jdm reopened this Feb 23, 2016
@wafflespeanut
Copy link
Member

wafflespeanut commented Feb 25, 2016

Good to know :)
@schuster
Move util::range into its own crate
Loading status checks…
205336b
@schuster schuster force-pushed the schuster:move-range branch from 7cb4d74 to 205336b Feb 26, 2016
@schuster
Copy link
Contributor Author

schuster commented Feb 26, 2016

Ok, this push should do it (currently waiting on the Travis build). I think I ran into an instance of rust-lang/cargo#2090 (thanks to @mbrubeck for referring me to it), but I was able to work around it.

EDIT: fixed link to Cargo bug
@frewsxcv
Copy link
Member

frewsxcv commented Feb 26, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

📌 Commit 205336b has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

⌛ Testing commit 205336b with merge 4300ba2...
bors-servo added a commit that referenced this pull request Feb 26, 2016
@bors-servo
Auto merge of #9717 - schuster:move-range, r=frewsxcv
Loading status checks…
4300ba2 
Move util::range into its own crate

Fixes #9695

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9717)
<!-- Reviewable:end -->
@frewsxcv
Copy link
Member

frewsxcv commented Feb 26, 2016

Thanks!
@KiChjang KiChjang assigned frewsxcv and unassigned nox Feb 26, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

💔 Test failed - linux-rel
@frewsxcv
Copy link
Member

frewsxcv commented Feb 26, 2016

@bors-servo retry #8120
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

⚡ Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-css are reusable. Rebuilding only linux-rel, mac-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

💔 Test failed - mac-rel-wpt
@jdm
Copy link
Member

jdm commented Feb 26, 2016

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

⚡ Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-css are reusable. Rebuilding only linux-rel, mac-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

💔 Test failed - linux-rel
@frewsxcv
Copy link
Member

frewsxcv commented Feb 26, 2016

@bors-servo retry #9148
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

⚡ Previous build results for android, gonk, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt are reusable. Rebuilding only linux-rel...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 26, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 205336b into servo:master Feb 26, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Feb 26, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@frewsxcv frewsxcv

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

9 participants
@schuster @highfive @nox @bors-servo @jdm @KiChjang @Ms2ger @wafflespeanut @frewsxcv
You can’t perform that action at this time.