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

Update bitflags to 1.0 in every servo crate #18809

Merged
merged 1 commit into from Oct 19, 2017
Merged

Update bitflags to 1.0 in every servo crate #18809

merged 1 commit into from Oct 19, 2017

Conversation

@Eijebong
Copy link
Member

Eijebong commented Oct 10, 2017 •
edited by SimonSapin

It still needs dependencies update to remove all the other bitflags
versions.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because it's a dependency update

This change is Reviewable
@highfive
Copy link

highfive commented Oct 10, 2017

Heads up! This PR modifies the following files:

  • @bholley: ports/geckolib/glue.rs, components/style/properties/longhand/background.mako.rs, components/style/invalidation/element/invalidator.rs, components/style/properties/longhand/position.mako.rs, components/selectors/matching.rs and 41 more
  • @jgraham: components/webdriver_server/keys.rs
  • @canaltinova: components/style/properties/longhand/background.mako.rs, components/style/invalidation/element/invalidator.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/computed_value_flags.rs, components/style/stylist.rs and 38 more
  • @emilio: ports/geckolib/glue.rs, components/style/properties/longhand/background.mako.rs, components/style/invalidation/element/invalidator.rs, components/style/properties/longhand/position.mako.rs, components/layout/flow.rs and 63 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
Copy link

highfive commented Oct 10, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style, layout, gfx, and script code, but no tests are modified. Please consider adding a test!
@SimonSapin
Copy link
Member

SimonSapin commented Oct 10, 2017

This adds a fifth version of bitflags to the dependency graph. It’s not overly dramatic since bitflags itself is small, but could we try to bitflags in some external dependencies first?
@Eijebong
Copy link
Member Author

Eijebong commented Oct 10, 2017

Well I wanted to do this as soon as possible because it's so huge. We can wait for dependencies if you'd prefer to do so.
@SimonSapin
Copy link
Member

SimonSapin commented Oct 10, 2017

Alright, since PR is large and prone to bitrot feel free to ignore me. The build fails on Travis, though. You can run ./mach test-unit and ./mach check-geckolib to test locally.
@Eijebong
Copy link
Member Author

Eijebong commented Oct 10, 2017

Yeah, I forgot to compile tests, fixing them right now
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from 597d66a to 09462d4 Oct 10, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2017

☔ The latest upstream changes (presumably #18808) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong
Copy link
Member Author

Eijebong commented Oct 10, 2017

Tests are failing because firefox is still using rust 1.19
@SimonSapin
Copy link
Member

SimonSapin commented Oct 10, 2017

It sounds like this is blocked on https://bugzilla.mozilla.org/show_bug.cgi?id=1396884, unfortunately.
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch 2 times, most recently from ff5cf61 to 0c5aaed Oct 11, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2017

☔ The latest upstream changes (presumably #18844) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from 0c5aaed to 5a24548 Oct 12, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2017

☔ The latest upstream changes (presumably #18850) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from 5a24548 to 543ae42 Oct 13, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 13, 2017

☔ The latest upstream changes (presumably #18863) made this pull request unmergeable. Please resolve the merge conflicts.
@rillian
Copy link
Contributor

rillian commented Oct 14, 2017

I've bumped the gecko minimum rust version to 1.20.0, so it should be ok to update the lint and merge this now.
@SimonSapin
Copy link
Member

SimonSapin commented Oct 14, 2017

Thanks @rillian.

@Eijebong, this should be good to go once #18883 lands.
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from 543ae42 to 6d667bd Oct 15, 2017
@Eijebong Eijebong mentioned this pull request Oct 15, 2017
Merged
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from 6d667bd to e77b50c Oct 17, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2017

☔ The latest upstream changes (presumably #18919) made this pull request unmergeable. Please resolve the merge conflicts.
@nox
Copy link
Member

nox commented Oct 19, 2017

Thanks for keeping up with that huge task.
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

⌛ Testing commit e85fcd1 with merge bc86efd...
bors-servo added a commit that referenced this pull request Oct 19, 2017
@bors-servo
Auto merge of #18809 - Eijebong:bitflags, r=nox
Loading status checks…
bc86efd 
Update bitflags to 1.0 in every servo crate

It still needs dependencies update to remove all the other bitflags
versions.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it's a dependency update

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

bors-servo commented Oct 19, 2017

💔 Test failed - linux-dev
@Eijebong
Update bitflags to 1.0 in every servo crate
Loading status checks…
e8e2d0a 
It still needs dependencies update to remove all the other bitflags
versions.
@Eijebong Eijebong force-pushed the Eijebong:bitflags branch from e85fcd1 to e8e2d0a Oct 19, 2017
@Eijebong
Copy link
Member Author

Eijebong commented Oct 19, 2017

@nox Fixed
@nox
Copy link
Member

nox commented Oct 19, 2017

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

bors-servo commented Oct 19, 2017

📌 Commit e8e2d0a has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

⌛ Testing commit e8e2d0a with merge fe16c1d...
bors-servo added a commit that referenced this pull request Oct 19, 2017
@bors-servo
Auto merge of #18809 - Eijebong:bitflags, r=nox
Loading status checks…
fe16c1d 
Update bitflags to 1.0 in every servo crate

It still needs dependencies update to remove all the other bitflags
versions.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it's a dependency update

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

bors-servo commented Oct 19, 2017

☀️ 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: nox
Pushing fe16c1d to master...
@bors-servo bors-servo merged commit e8e2d0a into servo:master Oct 19, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Oct 19, 2017
Merged
Merged
Open
Merged
@moz-servo-sync moz-servo-sync mentioned this pull request Oct 19, 2017
Merged
moz-servo-sync added a commit to moz-servo-sync/servo that referenced this pull request Oct 19, 2017
Gecko Backout @moz-servo-sync
Backed out changeset e64e659c077d: servo PR servo#18809 and revendor …
11c6417 
…for reftest failures, e.g. in layout/reftests/bugs/392435-1.html. r=backout on a CLOSED TREE

Backs out servo#18809
@emilio emilio mentioned this pull request Oct 19, 2017
Merged
bors-servo added a commit that referenced this pull request Oct 19, 2017
@bors-servo
Auto merge of #18960 - emilio:gecko-backout-manually, r=emilio
Loading status checks…
89c1892 
Backed out changeset e64e659c077d: servo PR #18809 and revendor for r…

…eftest failures, e.g. in layout/reftests/bugs/392435-1.html. r=backout on a CLOSED TREE

Backs out #18809
@Eijebong Eijebong mentioned this pull request Oct 20, 2017
Merged
bors-servo added a commit that referenced this pull request Oct 30, 2017
@bors-servo
Auto merge of #18967 - Eijebong:bitflags2.0, r=mbrubeck
Loading status checks…
fe4139b 
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

<!-- 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/18967)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@Eijebong @highfive @SimonSapin @bors-servo @rillian @nox @KiChjang
You can’t perform that action at this time.