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

Net: removed opts::get() usage #23520

Merged
merged 1 commit into from Jun 7, 2019
Merged

Net: removed opts::get() usage #23520

merged 1 commit into from Jun 7, 2019

Conversation

@oneturkmen
Copy link
Contributor

oneturkmen commented Jun 5, 2019 •
edited by SimonSapin

Removed usage of opts::get() in components/net.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix partially #22854 (GitHub issue number if applicable)
  • There are tests for these changes OR
  • These changes do not require tests because these are cleanup/refactoring changes.

This change is Reviewable
@highfive
Copy link

highfive commented Jun 5, 2019

Heads up! This PR modifies the following files:

  • @paulrouget: components/servo/lib.rs
  • @KiChjang: components/net/resource_thread.rs, components/net/websocket_loader.rs
@highfive
Copy link

highfive commented Jun 5, 2019

warning Warning warning

  • These commits modify net code, but no tests are modified. Please consider adding a test!
@oneturkmen
Copy link
Contributor Author

oneturkmen commented Jun 5, 2019

r? @jdm
@jdm
jdm requested changes Jun 5, 2019
View changes
Copy link
Member

jdm left a comment

Let's remove the servo_config dependency from Cargo.toml as well.
@oneturkmen oneturkmen force-pushed the oneturkmen:net-remove-opts-get branch from 0210690 to e8aca56 Jun 5, 2019
@oneturkmen
Copy link
Contributor Author

oneturkmen commented Jun 5, 2019 •
edited

Travis and AppVeyor both failed due to the missing servo_config crate:

error[E0463]: can't find crate for servo_config
--> components/net/lib.rs:20:1
|
20 | extern crate servo_config;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate
error: aborting due to previous error
For more information about this error, try rustc --explain E0463.
error: Could not compile net.
warning: build failed, waiting for other jobs to finish...
error: build failed
The command "./mach test-unit" exited with 101.

Should I add servo_config dependency back to Cargo.toml?

+ it's weird that it successfully builds locally (or I miss something here).
@jdm
Copy link
Member

jdm commented Jun 6, 2019

Ah, it's used by a unit test. Interesting.
@jdm
Copy link
Member

jdm commented Jun 6, 2019

Ok, go ahead and re-add the dependency and we can merge these changes.
@oneturkmen oneturkmen force-pushed the oneturkmen:net-remove-opts-get branch from e8aca56 to 7f3d2a8 Jun 6, 2019
@jdm
Copy link
Member

jdm commented Jun 6, 2019

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

bors-servo commented Jun 6, 2019

📌 Commit 7f3d2a8 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jun 6, 2019

⌛ Testing commit 7f3d2a8 with merge 2d15a4f...
bors-servo added a commit that referenced this pull request Jun 6, 2019
@bors-servo
Auto merge of #23520 - oneturkmen:net-remove-opts-get, r=jdm
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…
2d15a4f 
Net: removed opts::get() usage

<!-- Please describe your changes on the following line: -->
Removed usage of opts::get() in components/net.

---
<!-- 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
- [x] These changes fix *partially* #22854 (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because these are cleanup/refactoring changes.

<!-- 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/23520)
<!-- Reviewable:end -->
@oneturkmen
Copy link
Contributor Author

oneturkmen commented Jun 6, 2019

It's the unit tests again. Will adjust them tomorrow.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 6, 2019

💔 Test failed - status-taskcluster
@oneturkmen
Net: removed opts::get() usage
Loading status checks…
9034fb6
@oneturkmen oneturkmen force-pushed the oneturkmen:net-remove-opts-get branch from 7f3d2a8 to 9034fb6 Jun 7, 2019
@oneturkmen
Copy link
Contributor Author

oneturkmen commented Jun 7, 2019 •
edited

@jdm fyi Travis seems to have finished the build ~4 hours ago - yet it shows "in progress" here.
@jdm
Copy link
Member

jdm commented Jun 7, 2019

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

bors-servo commented Jun 7, 2019

📌 Commit 9034fb6 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jun 7, 2019

⌛ Testing commit 9034fb6 with merge e4b0731...
bors-servo added a commit that referenced this pull request Jun 7, 2019
@bors-servo
Auto merge of #23520 - oneturkmen:net-remove-opts-get, r=jdm
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…
e4b0731 
Net: removed opts::get() usage

<!-- Please describe your changes on the following line: -->
Removed usage of opts::get() in components/net.

---
<!-- 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
- [x] These changes fix *partially* #22854 (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because these are cleanup/refactoring changes.

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

bors-servo commented Jun 7, 2019

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Jun 7, 2019

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

bors-servo commented Jun 7, 2019

⌛ Testing commit 9034fb6 with merge 626c431...
bors-servo added a commit that referenced this pull request Jun 7, 2019
@bors-servo
Auto merge of #23520 - oneturkmen:net-remove-opts-get, r=jdm
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…
626c431 
Net: removed opts::get() usage

<!-- Please describe your changes on the following line: -->
Removed usage of opts::get() in components/net.

---
<!-- 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
- [x] These changes fix *partially* #22854 (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because these are cleanup/refactoring changes.

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

bors-servo commented Jun 7, 2019

☀️ Test successful - arm64, linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing 626c431 to master...
@bors-servo bors-servo merged commit 9034fb6 into servo:master Jun 7, 2019
3 of 4 checks passed
3 of 4 checks passed
Travis CI - Pull Request Build Started
Details
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@oneturkmen oneturkmen deleted the oneturkmen:net-remove-opts-get branch Jun 7, 2019
@oneturkmen oneturkmen mentioned this pull request Jul 2, 2019
Open
6 of 11 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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