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

Update some dependencies, remove heapsize from the build #19510

Merged
merged 2 commits into from Dec 8, 2017
Merged

Update some dependencies, remove heapsize from the build #19510

merged 2 commits into from Dec 8, 2017
+247 −264

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Dec 7, 2017 •
edited

This change is Reviewable
@highfive
Copy link

highfive commented Dec 7, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml
  • @canaltinova: components/style/Cargo.toml
  • @emilio: components/style/Cargo.toml, components/layout/Cargo.toml
  • @fitzgen: components/script_layout_interface/Cargo.toml, components/script/Cargo.toml
  • @KiChjang: components/script_layout_interface/Cargo.toml, components/script/Cargo.toml
  • @asajeffrey: components/script_layout_interface/Cargo.toml, components/script/Cargo.toml
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 7, 2017 •
edited

This uses git dependencies commits that have not been merged yet: servo/webrender#2192, servo/rust-azure#281
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

☔ The latest upstream changes (presumably #19514) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin SimonSapin force-pushed the heapsize branch from c632429 to bd134e5 Dec 7, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Dec 7, 2017

☔ The latest upstream changes (presumably #19512) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin
Update app_units and webrender
76270ad
@SimonSapin SimonSapin changed the title Update app_units and webrender Update some dependencies, remove heapsize from the build Dec 8, 2017
@SimonSapin SimonSapin force-pushed the heapsize branch 2 times, most recently from f0a606d to b21b5e4 Dec 8, 2017
@SimonSapin SimonSapin force-pushed the heapsize branch from b21b5e4 to e6ca579 Dec 8, 2017
@Eijebong
Eijebong reviewed Dec 8, 2017
View changes
Cargo.lock
@@ -3062,11 +3051,6 @@ name = "smallbitvec"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]

This comment has been minimized.

Sign in to view
@Eijebong

Eijebong Dec 8, 2017

Member

This is deduplicating smallvec. It should be removed from the [ignore]packages list of servo-tidy

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Dec 8, 2017

Author Member

Oops, thanks. Fixed that and import order to make tidy happy.
@SimonSapin
Update euclid, azure, skia, offscreen_gl_context, plane-split, webrender
Loading status checks…
e17697f
@SimonSapin SimonSapin force-pushed the heapsize branch from e6ca579 to e17697f Dec 8, 2017
@SimonSapin
Copy link
Member Author

SimonSapin commented Dec 8, 2017

@bors-servo r=nox
@bors-servo
Copy link
Contributor

bors-servo commented Dec 8, 2017

📌 Commit e17697f has been approved by nox
@highfive highfive assigned nox and unassigned pcwalton Dec 8, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Dec 8, 2017

⌛ Testing commit e17697f with merge 07bd84e...
bors-servo added a commit that referenced this pull request Dec 8, 2017
@bors-servo
Auto merge of #19510 - servo:heapsize, r=nox
Loading status checks…
07bd84e 
Update some dependencies, remove heapsize from the build

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19510)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 8, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox
Pushing 07bd84e to master...
@bors-servo bors-servo merged commit e17697f into master Dec 8, 2017
3 of 4 checks passed
3 of 4 checks passed
dependency-ci An error occured
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Dec 8, 2017
Closed
Closed
@SimonSapin SimonSapin deleted the heapsize branch Dec 12, 2017
@ghost ghost mentioned this pull request Dec 12, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eijebong Eijebong

Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@SimonSapin @highfive @bors-servo @Eijebong @jdm @nox @pcwalton
You can’t perform that action at this time.