Bump bitflags to 1.0 #18967

Eijebong · 2017-10-20T14:21:07Z

See #18809

Still haven't had time to test it but it should fix the tests failures that appeared in m-c

This change is

highfive · 2017-10-20T14:21:13Z

Heads up! This PR modifies the following files:

@bholley: ports/geckolib/glue.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/position.mako.rs, components/selectors/matching.rs, components/style/properties/computed_value_flags.rs and 49 more
@jgraham: components/webdriver_server/keys.rs
@canaltinova: components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/computed_value_flags.rs, components/style/stylist.rs, components/style/properties/gecko.mako.rs and 46 more
@emilio: ports/geckolib/glue.rs, components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/position.mako.rs, components/layout/flow.rs, components/layout/wrapper.rs and 71 more
@fitzgen: components/script/textinput.rs, components/script/dom/htmlfieldsetelement.rs, components/script/dom/htmltextareaelement.rs, components/script/dom/validitystate.rs, components/script/dom/htmloptgroupelement.rs and 35 more
@KiChjang: components/script/textinput.rs, components/script/dom/htmlfieldsetelement.rs, components/script/dom/htmltextareaelement.rs, components/script/dom/validitystate.rs, components/script/dom/htmloptgroupelement.rs and 30 more
@asajeffrey: components/webdriver_server/keys.rs
@paulrouget: ports/glutin/window.rs, ports/glutin/Cargo.toml

highfive · 2017-10-20T14:21:14Z

Warning

These commits modify unsafe code. Please review it carefully!

emilio · 2017-10-20T16:37:41Z

./mach build-geckolib seems to fail:

error[E0425]: cannot find value `NS_DOCUMENT_STATE_RTL_LOCALE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:202:66
|
202 | NonTSPseudoClass::MozLocaleDir(..) => element_state::NS_DOCUMENT_STATE_RTL_LOCALE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error[E0425]: cannot find value `NS_DOCUMENT_STATE_WINDOW_INACTIVE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:203:67
|
203 | NonTSPseudoClass::MozWindowInactive => element_state::NS_DOCUMENT_STATE_WINDOW_INACTIVE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error: aborting due to 2 previous errors
error: Could not compile `style`.
To learn more, run the command again with --verbose.
[Warning] Could not generate notification! Optional Python module 'dbus' is not installed.
GeckoLib build completed in 0:01:46
The command "./mach build-geckolib" exited with 101.
42.68s$ ./mach test-stylo
Compiling size_of_test v0.0.1 (file:///home/travis/build/servo/servo/components/size_of_test)
Compiling stylo_tests v0.0.1 (file:///home/travis/build/servo/servo/tests/unit/stylo)
Compiling style v0.0.1 (file:///home/travis/build/servo/servo/components/style)
error[E0425]: cannot find value `NS_DOCUMENT_STATE_RTL_LOCALE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:202:66
|
202 | NonTSPseudoClass::MozLocaleDir(..) => element_state::NS_DOCUMENT_STATE_RTL_LOCALE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error[E0425]: cannot find value `NS_DOCUMENT_STATE_WINDOW_INACTIVE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:203:67
|
203 | NonTSPseudoClass::MozWindowInactive => element_state::NS_DOCUMENT_STATE_WINDOW_INACTIVE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`error[E0425]: cannot find value `NS_DOCUMENT_STATE_RTL_LOCALE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:202:66
|
202 | NonTSPseudoClass::MozLocaleDir(..) => element_state::NS_DOCUMENT_STATE_RTL_LOCALE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error[E0425]: cannot find value `NS_DOCUMENT_STATE_WINDOW_INACTIVE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:203:67
|
203 | NonTSPseudoClass::MozWindowInactive => element_state::NS_DOCUMENT_STATE_WINDOW_INACTIVE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error: aborting due to 2 previous errors
error: Could not compile `style`.
To learn more, run the command again with --verbose.
[Warning] Could not generate notification! Optional Python module 'dbus' is not installed.
GeckoLib build completed in 0:01:46
The command "./mach build-geckolib" exited with 101.
42.68s$ ./mach test-stylo
Compiling size_of_test v0.0.1 (file:///home/travis/build/servo/servo/components/size_of_test)
Compiling stylo_tests v0.0.1 (file:///home/travis/build/servo/servo/tests/unit/stylo)
Compiling style v0.0.1 (file:///home/travis/build/servo/servo/components/style)
error[E0425]: cannot find value `NS_DOCUMENT_STATE_RTL_LOCALE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:202:66
|
202 | NonTSPseudoClass::MozLocaleDir(..) => element_state::NS_DOCUMENT_STATE_RTL_LOCALE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`
error[E0425]: cannot find value `NS_DOCUMENT_STATE_WINDOW_INACTIVE` in module `element_state`
--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:203:67
|
203 | NonTSPseudoClass::MozWindowInactive => element_state::NS_DOCUMENT_STATE_WINDOW_INACTIVE,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `element_state`

Eijebong · 2017-10-20T16:38:59Z

Yeah, I failed my rebase ^^

jdm · 2017-10-20T17:52:49Z

Geckolib still fails :)

error[E0599]: no associated item named `NS_DOCUMENT_STATE_RTL_LOCALE` found for type `element_state::ElementState` in the current scope

--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:202:51

|

202 | NonTSPseudoClass::MozLocaleDir(..) => ElementState::NS_DOCUMENT_STATE_RTL_LOCALE,

| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

|

= help: items from traits can only be used if the trait is implemented and in scope

= note: the following traits define an item `NS_DOCUMENT_STATE_RTL_LOCALE`, perhaps you need to implement one of them:

candidate #1: `<element_state::DocumentState as std::fmt::Debug>::fmt::__BitFlags`

candidate #2: `element_state::DocumentState::all::__BitFlags`

error[E0599]: no associated item named `NS_DOCUMENT_STATE_WINDOW_INACTIVE` found for type `element_state::ElementState` in the current scope

--> /home/travis/build/servo/servo/components/style/gecko/selector_parser.rs:203:52

|

203 | NonTSPseudoClass::MozWindowInactive => ElementState::NS_DOCUMENT_STATE_WINDOW_INACTIVE,

| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

|

= help: items from traits can only be used if the trait is implemented and in scope

= note: the following traits define an item `NS_DOCUMENT_STATE_WINDOW_INACTIVE`, perhaps you need to implement one of them:

candidate #1: `<element_state::DocumentState as std::fmt::Debug>::fmt::__BitFlags`

candidate #2: `element_state::DocumentState::all::__BitFlags`

error: aborting due to 2 previous errors

error: Could not compile `style`.

bors-servo · 2017-10-20T18:49:41Z

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

bors-servo · 2017-10-24T00:00:34Z

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

Eijebong · 2017-10-28T18:11:12Z

geckotry: https://treeherder.mozilla.org/#/jobs?repo=try&revision=86d1cd3505d3181f44ef4b43a5e083b0bae00b7a

Eijebong · 2017-10-28T21:53:03Z

Fixed those 3 'layout/style' tests

Eijebong · 2017-10-30T15:09:41Z

Gecko try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=b6f08bd2e1d6f158e3dca65d950e237c06e23799

mbrubeck

r=mbrubeck with the merge conflict resolved


        Bump bitflags to 1.0 in every servo crate

Eijebong · 2017-10-30T22:36:54Z

Rebased

jdm · 2017-10-30T22:38:32Z

@bors-servo: r=mbrubeck

bors-servo · 2017-10-30T22:38:33Z

📌 Commit 29b4eec has been approved by mbrubeck

mbrubeck · 2017-10-30T23:02:15Z

@bors-servo p=1

(high bitrot risk)

bors-servo · 2017-10-30T23:25:47Z

⌛ Testing commit 29b4eec with merge fe4139b...


        Auto merge of #18967 - Eijebong:bitflags2.0, r=mbrubeck

Bump bitflags to 1.0 See #18809 Still haven't had time to test it but it should fix the tests failures that appeared in m-c  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18967)

bors-servo · 2017-10-31T00:31:46Z

☀️ 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: mbrubeck
Pushing fe4139b to master...

highfive assigned mbrubeck Oct 20, 2017

highfive added the S-awaiting-review label Oct 20, 2017

Eijebong force-pushed the Eijebong:bitflags2.0 branch from 47cefb8 to 4b1190d Oct 20, 2017

highfive added the S-needs-rebase label Oct 20, 2017

Eijebong force-pushed the Eijebong:bitflags2.0 branch from 4b1190d to 546a366 Oct 22, 2017

highfive added the S-needs-rebase label Oct 24, 2017

Eijebong force-pushed the Eijebong:bitflags2.0 branch from 546a366 to b9eeaf7 Oct 27, 2017

Eijebong force-pushed the Eijebong:bitflags2.0 branch from b9eeaf7 to 6794607 Oct 28, 2017

nox changed the title ~~Bump bitflags to 1.0, take 2~~ Bump bitflags to 1.0 Oct 30, 2017

Eijebong force-pushed the Eijebong:bitflags2.0 branch from 6794607 to 49b96f5 Oct 30, 2017

mbrubeck approved these changes Oct 30, 2017

View changes

Bump bitflags to 1.0 in every servo crate

Loading status checks…

29b4eec

Eijebong force-pushed the Eijebong:bitflags2.0 branch from 49b96f5 to 29b4eec Oct 30, 2017

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Oct 30, 2017

bors-servo merged commit 29b4eec into servo:master Oct 31, 2017
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Oct 31, 2017

This was referenced Oct 31, 2017

[WIP] Ensure every inline flow starts and ends with a text fragment. #18780

Open

Added implementation for itemprop and itemtype along with test files #19038

Merged

Bump bindgen to 0.31 #19043

Closed

servo / servo

Bump bitflags to 1.0 #18967

Bump bitflags to 1.0 #18967

Eijebong commented Oct 20, 2017 •

edited by SimonSapin

highfive commented Oct 20, 2017

highfive commented Oct 20, 2017

emilio commented Oct 20, 2017

Eijebong commented Oct 20, 2017

jdm commented Oct 20, 2017

bors-servo commented Oct 20, 2017

bors-servo commented Oct 24, 2017

Eijebong commented Oct 28, 2017

Eijebong commented Oct 28, 2017

Eijebong commented Oct 30, 2017

mbrubeck left a comment

Eijebong commented Oct 30, 2017

jdm commented Oct 30, 2017

bors-servo commented Oct 30, 2017

mbrubeck commented Oct 30, 2017

bors-servo commented Oct 30, 2017

bors-servo commented Oct 31, 2017

servo / servo

Join GitHub today

Bump bitflags to 1.0 #18967

Bump bitflags to 1.0 #18967

Conversation

Eijebong commented Oct 20, 2017 • edited by SimonSapin

highfive commented Oct 20, 2017

highfive commented Oct 20, 2017

emilio commented Oct 20, 2017

Eijebong commented Oct 20, 2017

jdm commented Oct 20, 2017

bors-servo commented Oct 20, 2017

bors-servo commented Oct 24, 2017

Eijebong commented Oct 28, 2017

Eijebong commented Oct 28, 2017

Eijebong commented Oct 30, 2017

mbrubeck left a comment

Eijebong commented Oct 30, 2017

jdm commented Oct 30, 2017

bors-servo commented Oct 30, 2017

mbrubeck commented Oct 30, 2017

bors-servo commented Oct 30, 2017

bors-servo commented Oct 31, 2017

Eijebong commented Oct 20, 2017 •

edited by SimonSapin