Skip to content
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 some types out of msg. #13816

Merged
merged 1 commit into from Nov 4, 2016
Merged

Move some types out of msg. #13816

merged 1 commit into from Nov 4, 2016

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 18, 2016

This change is Reviewable

@highfive
Copy link

highfive commented Oct 18, 2016

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs, components/webdriver_server/lib.rs, components/webdriver_server/Cargo.toml, components/constellation/constellation.rs
  • @jgraham: components/webdriver_server/lib.rs, components/webdriver_server/Cargo.toml
  • @fitzgen: components/script/dom/request.rs, components/script/dom/xmlhttprequest.rs, components/script/dom/window.rs, components/script_traits/lib.rs, components/script_traits/lib.rs, components/script/dom/document.rs, components/script/dom/htmllinkelement.rs, components/script/dom/workerglobalscope.rs, components/script_traits/script_msg.rs, components/script_traits/script_msg.rs, components/script/script_thread.rs, components/script/dom/htmliframeelement.rs, components/script/dom/htmlanchorelement.rs, components/script/dom/htmlformelement.rs, components/script/dom/bindings/trace.rs, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
  • @KiChjang: components/script/dom/request.rs, components/script/dom/xmlhttprequest.rs, components/script/dom/window.rs, components/script_traits/lib.rs, components/script_traits/lib.rs, components/script/dom/document.rs, components/script/dom/htmllinkelement.rs, components/net/http_loader.rs, components/script/dom/workerglobalscope.rs, components/net_traits/lib.rs, components/net_traits/lib.rs, components/net_traits/image_cache_thread.rs, components/net_traits/image_cache_thread.rs, components/script_traits/script_msg.rs, components/script_traits/script_msg.rs, components/net/file_loader.rs, components/net_traits/image/base.rs, components/net_traits/image/base.rs, components/script/script_thread.rs, components/net/image_cache_thread.rs, components/script/dom/htmliframeelement.rs, components/net/fetch/methods.rs, components/script/dom/htmlanchorelement.rs, components/script/dom/htmlformelement.rs, components/script/dom/bindings/trace.rs, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml, components/net_traits/request.rs, components/net_traits/request.rs
@highfive
Copy link

highfive commented Oct 18, 2016

warning Warning warning

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

nox commented Oct 18, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

📌 Commit 980991b has been approved by nox

@highfive highfive assigned nox and unassigned SimonSapin Oct 18, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

Testing commit 980991b with merge 692f263...

bors-servo added a commit that referenced this pull request Oct 18, 2016
Move some types out of msg.

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

bors-servo commented Oct 18, 2016

💔 Test failed - mac-dev-unit

@jdm
Copy link
Member

jdm commented Oct 18, 2016

error[E0432]: unresolved import `msg::constellation_msg::ReferrerPolicy`
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/net/data_loader.rs:10:42
   |
10 | use msg::constellation_msg::{PipelineId, ReferrerPolicy};
   |                                          ^^^^^^^^^^^^^^ no `ReferrerPolicy` in `msg::constellation_msg`

error[E0432]: unresolved import `msg::constellation_msg::ReferrerPolicy`
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/net/fetch.rs:23:30
   |
23 | use msg::constellation_msg::{ReferrerPolicy, TEST_PIPELINE_ID};
   |                              ^^^^^^^^^^^^^^ no `ReferrerPolicy` in `msg::constellation_msg`

error[E0432]: unresolved import `msg::constellation_msg::ReferrerPolicy`
 --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/net/resource_thread.rs:6:42
  |
6 | use msg::constellation_msg::{PipelineId, ReferrerPolicy};
  |                                          ^^^^^^^^^^^^^^ no `ReferrerPolicy` in `msg::constellation_msg`

error[E0432]: unresolved import `msg::constellation_msg::ReferrerPolicy`
  --> /Users/servo/buildbot/slave/mac-dev-unit/build/tests/unit/net/http_loader.rs:21:42
   |
21 | use msg::constellation_msg::{PipelineId, ReferrerPolicy, TEST_PIPELINE_ID};
   |                                          ^^^^^^^^^^^^^^ no `ReferrerPolicy` in `msg::constellation_msg`
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2016

The latest upstream changes (presumably #13878) made this pull request unmergeable. Please resolve the merge conflicts.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 2, 2016

The latest upstream changes (presumably #13742) made this pull request unmergeable. Please resolve the merge conflicts.

@Ms2ger Ms2ger force-pushed the msg-crate branch from b45f75b to 0b991b6 Nov 2, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Nov 2, 2016

The latest upstream changes (presumably #13961) made this pull request unmergeable. Please resolve the merge conflicts.

@Ms2ger Ms2ger force-pushed the msg-crate branch from 0b991b6 to a9a9ac8 Nov 3, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 3, 2016

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2016

📌 Commit a9a9ac8 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2016

The latest upstream changes (presumably #14043) made this pull request unmergeable. Please resolve the merge conflicts.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2016

🔒 Merge conflict

@Ms2ger Ms2ger force-pushed the msg-crate branch from a9a9ac8 to 277c6d0 Nov 4, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Nov 4, 2016

@bors-servo r=nox

@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2016

📌 Commit 277c6d0 has been approved by nox

@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2016

Testing commit 277c6d0 with merge be58dc3...

bors-servo added a commit that referenced this pull request Nov 4, 2016
Move some types out of msg.

<!-- 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/13816)

<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2016

@bors-servo bors-servo merged commit 277c6d0 into master Nov 4, 2016
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
dependency-ci Dependencies checked
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the msg-crate branch Nov 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.