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

Cleanup ports/servo to only rely on libservo #20483

Merged
merged 1 commit into from Mar 31, 2018
Merged

Cleanup ports/servo to only rely on libservo #20483

merged 1 commit into from Mar 31, 2018

Conversation

@fabricedesre
Copy link
Contributor

fabricedesre commented Mar 31, 2018 •
edited by SimonSapin

When using ports/servo as a starting point for an embedding, it's easier if it only relies on the libservo crate and not directly on components ones. Since libservo reexports all the modules we need, it's a straightforward fix.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because There are no relevant tests, and no real code change.

This change is Reviewable
@fabricedesre fabricedesre requested a review from paulrouget Mar 31, 2018
@highfive
Copy link

highfive commented Mar 31, 2018

Heads up! This PR modifies the following files:

  • @paulrouget: ports/servo/glutin_app/keyutils.rs, ports/servo/browser.rs, ports/servo/glutin_app/window.rs, ports/servo/main.rs, ports/servo/glutin_app/mod.rs and 1 more
@paulrouget
paulrouget requested changes Mar 31, 2018
View changes
Copy link
Contributor

paulrouget left a comment

Can you remove the commented lines?
@fabricedesre fabricedesre force-pushed the fabricedesre:port-cleanup branch from 2e91e35 to 81cbfc2 Mar 31, 2018
@fabricedesre
Copy link
Contributor Author

fabricedesre commented Mar 31, 2018

Can you remove the commented lines?

Yep, done.
@fabricedesre
Copy link
Contributor Author

fabricedesre commented Mar 31, 2018

Arg, tidy was clean locally... what did I miss 😞
@fabricedesre fabricedesre force-pushed the fabricedesre:port-cleanup branch from 81cbfc2 to b8587f3 Mar 31, 2018
@paulrouget
paulrouget approved these changes Mar 31, 2018
View changes
@paulrouget
Copy link
Contributor

paulrouget commented Mar 31, 2018

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

bors-servo commented Mar 31, 2018

📌 Commit b8587f3 has been approved by paulrouget
@highfive highfive assigned paulrouget and unassigned fabricedesre Mar 31, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Mar 31, 2018

⌛ Testing commit b8587f3 with merge 83add9b...
bors-servo added a commit that referenced this pull request Mar 31, 2018
@bors-servo
Auto merge of #20483 - fabricedesre:port-cleanup, r=paulrouget
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
83add9b 
Cleanup ports/servo to only rely on libservo

<!-- Please describe your changes on the following line: -->
When using `ports/servo` as a starting point for an embedding, it's easier if it only relies on the `libservo` crate and not directly on `components` ones. Since `libservo` reexports all the modules we need, it's a straightforward fix.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because There are no relevant tests, and no real code change.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/20483)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 31, 2018

💔 Test failed - android
@CYBAI
Copy link
Collaborator

CYBAI commented Mar 31, 2018 

bash ./etc/ci/lockfile_changed.sh
 in dir /home/servo/buildbot/slave/android/build (timeout 1200 secs)
 watching logfiles {}
 argv: ['bash', './etc/ci/lockfile_changed.sh']
 environment:
  ANDROID_NDK=/home/servo/android/ndk/current/
  ANDROID_SDK=/home/servo/android/sdk/current/
  BUILD_MACHINE=<buildbot.process.properties.Property instance at 0x7f28989cbd88>
  CARGO_INCREMENTAL=0
  CCACHE=/usr/bin/ccache
  DISPLAY=:0
  HOME=/home/servo
  JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
  PATH=/home/servo/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:/home/servo/android/sdk/current/platform-tools
  PWD=/home/servo/buildbot/slave/android/build
  RUSTFLAGS=-Dwarnings
  RUST_BACKTRACE=1
  SCCACHE_IDLE_TIMEOUT=1200
  SERVO_CACHE_DIR=/home/servo/.servo
  SHELL=/bin/bash
  TERM=linux
  UPSTART_INSTANCE=
  UPSTART_JOB=buildbot-slave
 using PTY: False
diff --git a/Cargo.lock b/Cargo.lock
index e8726c0..25eb879 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2717,25 +2717,18 @@ dependencies = [
  "android_injected_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "compositing 0.0.1",
  "euclid 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libservo 0.0.1",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "msg 0.0.1",
  "osmesa-src 17.3.1-devel (git+https://github.com/servo/osmesa-src)",
  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "script_traits 0.0.1",
  "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo_config 0.0.1",
- "servo_geometry 0.0.1",
  "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "style_traits 0.0.1",
  "tinyfiledialogs 3.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.57.0 (git+https://github.com/servo/webrender)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winit 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winres 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
program finished with exit code 1
@fabricedesre
Cleanup ports/servo to only rely on libservo
Loading status checks…
bab1394
@fabricedesre fabricedesre force-pushed the fabricedesre:port-cleanup branch from b8587f3 to bab1394 Mar 31, 2018
@paulrouget
Copy link
Contributor

paulrouget commented Mar 31, 2018

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

bors-servo commented Mar 31, 2018

📌 Commit bab1394 has been approved by paulrouget
@bors-servo
Copy link
Contributor

bors-servo commented Mar 31, 2018

⌛ Testing commit bab1394 with merge f7a495a...
bors-servo added a commit that referenced this pull request Mar 31, 2018
@bors-servo
Auto merge of #20483 - fabricedesre:port-cleanup, r=paulrouget
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f7a495a 
Cleanup ports/servo to only rely on libservo

<!-- Please describe your changes on the following line: -->
When using `ports/servo` as a starting point for an embedding, it's easier if it only relies on the `libservo` crate and not directly on `components` ones. Since `libservo` reexports all the modules we need, it's a straightforward fix.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because There are no relevant tests, and no real code change.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/20483)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 31, 2018

💔 Test failed - linux-rel-css
@CYBAI
Copy link
Collaborator

CYBAI commented Mar 31, 2018 

{"status": "NOTRUN", "group": "default", "message": null, "stack": null, "subtest": "Overall test", "test": "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html", "line": 136121, "action": "test_result", "expected": "PASS"}
{"status": "TIMEOUT", "group": "default", "message": null, "stack": null, "subtest": null, "test": "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html", "line": 136134, "action": "test_result", "expected": "OK"}
@jdm
Copy link
Member

jdm commented Mar 31, 2018

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

bors-servo commented Mar 31, 2018

⚡ Previous build results for android, arm32, arm64, linux-dev, 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 are reusable. Rebuilding only linux-rel-css...
@bors-servo
Copy link
Contributor

bors-servo commented Mar 31, 2018

☀️ 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: paulrouget
Pushing f7a495a to master...
@bors-servo bors-servo merged commit bab1394 into servo:master Mar 31, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Mar 31, 2018
Closed
0 of 5 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paulrouget paulrouget

Assignees

@paulrouget paulrouget

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

Successfully merging this pull request may close these issues.

None yet

7 participants
@fabricedesre @highfive @paulrouget @bors-servo @CYBAI @jdm @pcwalton
You can’t perform that action at this time.