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

Clean up dependencies. #6295

Merged
merged 1 commit into from Jun 7, 2015
Merged

Clean up dependencies. #6295

merged 1 commit into from Jun 7, 2015

Conversation

@metajack
Copy link
Contributor

metajack commented Jun 5, 2015

Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

Review on Reviewable
@frewsxcv
Copy link
Member

frewsxcv commented Jun 5, 2015

Doesn't make a difference to me really which one we use. Merge conflicts aside, I think we can just go with yours, unless you see any reason to use mine
@metajack metajack mentioned this pull request Jun 5, 2015
Closed
@metajack metajack force-pushed the metajack:cargo-cleanup branch 2 times, most recently from 7ad9ed2 to 58577fb Jun 5, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 5, 2015

Before this lands, we need servo/surfman#9 and cargo.lock updates.
@metajack
Copy link
Contributor Author

metajack commented Jun 5, 2015

@frewsxcv Ok, I think I incorporated everything from your branch into my changes. Can you look this over?
@frewsxcv
Copy link
Member

frewsxcv commented Jun 5, 2015

Everything looks good to me :shipit:
@metajack metajack force-pushed the metajack:cargo-cleanup branch from 58577fb to 2fbb8a0 Jun 5, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 5, 2015

Ok, offscreen_gl_context changes are in. This is ready to go.
@metajack
Copy link
Contributor Author

metajack commented Jun 5, 2015

@bors-servo: r=frewsxcv,metajack

Putting my name in as self review only because @frewsxcv isn't yet on bors' list.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2015

📌 Commit 2fbb8a0 has been approved by frewsxcv,metajack
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2015

⌛ Testing commit 2fbb8a0 with merge 2fc393c...
bors-servo pushed a commit that referenced this pull request Jun 5, 2015
bors-servo
Auto merge of #6295 - metajack:cargo-cleanup, r=frewsxcv,metajack
2fc393c 
Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

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

bors-servo commented Jun 5, 2015

💔 Test failed - linux1
@frewsxcv
Copy link
Member

frewsxcv commented Jun 5, 2015

I opened an issue for that fail: aweinstock314/rust-clipboard#4
@metajack
Copy link
Contributor Author

metajack commented Jun 5, 2015

Wonderful. That bug is my fault.
@frewsxcv
Copy link
Member

frewsxcv commented Jun 6, 2015

This can get retried now that aweinstock314/rust-clipboard#4 has been fixed
@metajack metajack force-pushed the metajack:cargo-cleanup branch from 2fbb8a0 to 1a593b1 Jun 6, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 6, 2015

Only change was updating clipboard to the latest version which fixes the linux build error.
@frewsxcv
Copy link
Member

frewsxcv commented Jun 6, 2015

:shipit:
@frewsxcv
Copy link
Member

frewsxcv commented Jun 6, 2015

Merge conflicts FYI
@metajack metajack force-pushed the metajack:cargo-cleanup branch from 1a593b1 to 433fdef Jun 7, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 7, 2015

@bors-servo: r=frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2015

📌 Commit 433fdef has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2015

⌛ Testing commit 433fdef with merge 023f319...
bors-servo pushed a commit that referenced this pull request Jun 7, 2015
bors-servo
Auto merge of #6295 - metajack:cargo-cleanup, r=frewsxcv
023f319 
Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

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

bors-servo commented Jun 7, 2015

💔 Test failed - linux2
@metajack metajack force-pushed the metajack:cargo-cleanup branch from 433fdef to 5f92811 Jun 7, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 7, 2015

Updated layers.
@metajack
Copy link
Contributor Author

metajack commented Jun 7, 2015

@bors-servo: r=frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2015

📌 Commit 5f92811 has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2015

⌛ Testing commit 5f92811 with merge e0bf0af...
bors-servo pushed a commit that referenced this pull request Jun 7, 2015
bors-servo
Auto merge of #6295 - metajack:cargo-cleanup, r=frewsxcv
e0bf0af 
Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

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

bors-servo commented Jun 7, 2015

💔 Test failed - linux3
@metajack
Copy link
Contributor Author

metajack commented Jun 7, 2015

This needs servo/rust-layers#171
@metajack
Clean up dependencies.
Loading status checks…
b5ebbae
@metajack metajack force-pushed the metajack:cargo-cleanup branch from 5f92811 to b5ebbae Jun 7, 2015
@metajack
Copy link
Contributor Author

metajack commented Jun 7, 2015

@bors-servo: r=frewsxcv

servo/rust-layers#171 landed and I've updated the Cargo.locks.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2015

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

bors-servo commented Jun 7, 2015

⌛ Testing commit b5ebbae with merge 96311aa...
bors-servo pushed a commit that referenced this pull request Jun 7, 2015
bors-servo
Auto merge of #6295 - metajack:cargo-cleanup, r=frewsxcv
Loading status checks…
96311aa 
Overlaps a bunch with #6288. Putting this here so @frewsxcv can take a look and we can figure out how to merge our work together.

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

bors-servo commented Jun 7, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2
@bors-servo bors-servo merged commit b5ebbae into servo:master Jun 7, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@metajack metajack deleted the metajack:cargo-cleanup branch Jun 7, 2015
@frewsxcv frewsxcv mentioned this pull request Jun 9, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-review
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@metajack @frewsxcv @bors-servo @highfive
You can’t perform that action at this time.