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

Move some types from msg to script_traits. #12216

Merged
merged 3 commits into from Jul 5, 2016
Merged

Move some types from msg to script_traits. #12216

merged 3 commits into from Jul 5, 2016

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 4, 2016 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented Jul 4, 2016

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/constellation.rs, components/webdriver_server/lib.rs, components/constellation/pipeline.rs
  • @jgraham: components/webdriver_server/lib.rs
  • @KiChjang: components/script/webdriver_handlers.rs, components/script/dom/bindings/trace.rs, components/script_traits/webdriver_msg.rs, components/script_traits/webdriver_msg.rs, components/script/script_thread.rs, components/script/dom/window.rs, components/script_layout_interface/message.rs, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/lib.rs, components/script_traits/lib.rs
@highfive
Copy link

highfive commented Jul 4, 2016

warning Warning warning

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

nox commented Jul 4, 2016

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

bors-servo commented Jul 4, 2016

📌 Commit 0cffe89 has been approved by nox
@highfive highfive assigned nox and unassigned larsbergstrom Jul 4, 2016
@jdm
Copy link
Member

jdm commented Jul 4, 2016

@bors-servo: r+
Excellent, thanks!
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #12214
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

📌 Commit 0cffe89 has been approved by jdm
@highfive highfive assigned jdm and unassigned nox Jul 4, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

⌛ Testing commit 0cffe89 with merge e8c6367...
bors-servo added a commit that referenced this pull request Jul 4, 2016
@bors-servo
Auto merge of #12216 - servo:msg, r=jdm
e8c6367 
Move some types from msg to script_traits.

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

bors-servo commented Jul 4, 2016

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Jul 4, 2016

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

bors-servo commented Jul 4, 2016

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

☔ The latest upstream changes (presumably #11875) made this pull request unmergeable. Please resolve the merge conflicts.
Ms2ger added 3 commits Jul 4, 2016
@Ms2ger
Move WebDriverCommandMsg to script_traits.
54bb138
@Ms2ger
Move WindowSizeData to script_traits.
b8fe9e9
@Ms2ger
Move webdriver_msg to script_traits.
Loading status checks…
77caf83
@Ms2ger Ms2ger force-pushed the msg branch from 0cffe89 to 77caf83 Jul 5, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 5, 2016

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

bors-servo commented Jul 5, 2016

📌 Commit 77caf83 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Jul 5, 2016

⌛ Testing commit 77caf83 with merge 1812610...
bors-servo added a commit that referenced this pull request Jul 5, 2016
@bors-servo
Auto merge of #12216 - servo:msg, r=jdm
Loading status checks…
1812610 
Move some types from msg to script_traits.

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

bors-servo commented Jul 5, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit 77caf83 into master Jul 5, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Jul 5, 2016
Closed
Merged
Merged
Closed
@aneeshusa
Copy link
Member

aneeshusa commented Jul 5, 2016

Bittrotted 3x my PRs right after I rebased them :(
@nox nox deleted the msg branch Jul 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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

7 participants
@Ms2ger @highfive @nox @bors-servo @jdm @aneeshusa @larsbergstrom
You can’t perform that action at this time.