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 Epoch to gfx_traits #9230

Merged
merged 1 commit into from Jan 11, 2016
Merged

Move Epoch to gfx_traits #9230

merged 1 commit into from Jan 11, 2016
+26 −28

Conversation

@Aesthetikx
Copy link
Contributor

Aesthetikx commented Jan 9, 2016

Resolves #9222. Moved Epoch from components/msg/compositor_msg to
components/gfx_traits/lib. Updated use statements to reflect the move.

Review on Reviewable
@highfive
Copy link

highfive commented Jan 9, 2016

warning Warning warning

  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!
@KiChjang
Copy link
Member

KiChjang commented Jan 9, 2016

Please try not to work on issues without first claiming them. We don't want duplication of efforts among developers.
@Aesthetikx
Copy link
Contributor Author

Aesthetikx commented Jan 9, 2016

Sorry about that, I'll make sure to claim next time.
@KiChjang KiChjang self-assigned this Jan 9, 2016
@KiChjang
Copy link
Member

KiChjang commented Jan 9, 2016

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

bors-servo commented Jan 9, 2016

📌 Commit 1b546c9 has been approved by KiChjang
@jdm
Copy link
Member

jdm commented Jan 9, 2016

Thanks for doing this!
@jdm
Copy link
Member

jdm commented Jan 9, 2016

@bors-servo: r-
Unfortunately this doesn't pass ./mach test-tidy yet:

./components/compositing/constellation.rs:26: use statement is not in alphabetical order

    expected: gfx_traits::PaintMsg as FromPaintMsg

    found: gfx_traits::Epoch

./components/gfx/paint_task.rs:18: Line is longer than 120 characters
@jdm jdm added S-fails-tidy and removed S-awaiting-merge labels Jan 9, 2016
@Aesthetikx
Copy link
Contributor Author

Aesthetikx commented Jan 10, 2016

Indeed, I'll get that sorted out.
@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2016

☔ The latest upstream changes (presumably #9214) made this pull request unmergeable. Please resolve the merge conflicts.
@Aesthetikx Aesthetikx force-pushed the Aesthetikx:move_epoch_to_gfx_traits branch from 1b546c9 to 39f394c Jan 10, 2016
@Aesthetikx
Move Epoch to gfx_traits
Loading status checks…
f329955 
Resolves #9222. Moved Epoch from components/msg/compositor_msg to
components/gfx_traits/lib. Updated use statements to reflect the move.
@Aesthetikx Aesthetikx force-pushed the Aesthetikx:move_epoch_to_gfx_traits branch from 39f394c to f329955 Jan 10, 2016
@jdm
Copy link
Member

jdm commented Jan 11, 2016

@bors-servo: r=KiChjang
@bors-servo
Copy link
Contributor

bors-servo commented Jan 11, 2016

📌 Commit f329955 has been approved by KiChjang
@bors-servo
Copy link
Contributor

bors-servo commented Jan 11, 2016

⌛ Testing commit f329955 with merge e89dd05...
bors-servo added a commit that referenced this pull request Jan 11, 2016
@bors-servo
Auto merge of #9230 - Aesthetikx:move_epoch_to_gfx_traits, r=KiChjang
Loading status checks…
e89dd05 
Move Epoch to gfx_traits

Resolves #9222. Moved Epoch from components/msg/compositor_msg to
components/gfx_traits/lib. Updated use statements to reflect the move.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9230)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 11, 2016

💔 Test failed - mac-rel-css
@KiChjang
Copy link
Member

KiChjang commented Jan 11, 2016

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

bors-servo commented Jan 11, 2016

⚡ Previous build results for android, gonk, linux-dev, mac-dev-ref-unit, mac-rel-wpt are reusable. Rebuilding only linux-rel, mac-rel-css...
@KiChjang KiChjang removed the S-fails-tidy label Jan 11, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jan 11, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit f329955 into servo:master Jan 11, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@KiChjang KiChjang

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Aesthetikx @highfive @KiChjang @bors-servo @jdm @SimonSapin
You can’t perform that action at this time.