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

Update crates to use bitflags 0.5 #10396

Closed
wants to merge 1 commit into from
Closed

Update crates to use bitflags 0.5 #10396

wants to merge 1 commit into from

Conversation

saurvs
Copy link
Contributor

@saurvs saurvs commented Apr 4, 2016

Part of #10077


This change is Reviewable

@highfive
Copy link

highfive commented Apr 4, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/logical_geometry.rs, components/style/Cargo.toml, components/style/restyle_hints.rs, components/style/element_state.rs
  • @KiChjang: components/script/Cargo.toml, components/script/dom/node.rs, components/script/dom/webglrenderingcontext.rs
  • @SimonSapin: components/style/logical_geometry.rs, components/style/Cargo.toml, components/style/restyle_hints.rs, components/style/element_state.rs
  • @emilio: components/script/dom/webglrenderingcontext.rs

@highfive
Copy link

highfive commented Apr 4, 2016

warning Warning warning

  • These commits modify gfx, layout, style, and script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 4, 2016
@nox
Copy link
Contributor

nox commented Apr 4, 2016

I don't see any Cargo.lock changes so this is incomplete. Please use ./mach cargo-update -p on bitflags and probably the crates that depend on it.

@nox nox added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 4, 2016
@nox nox assigned nox and unassigned metajack Apr 4, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Apr 4, 2016
@metajack
Copy link
Contributor

metajack commented Apr 4, 2016

@bors-servo r+

Looks like the Cargo.lock's got updated.

@bors-servo
Copy link
Contributor

📌 Commit 3d9c1b6 has been approved by metajack

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 4, 2016
@metajack
Copy link
Contributor

metajack commented Apr 4, 2016

@bors-servo r-

This adds new dependencies but doesn't remove the old ones. There should be only one dependency on bitflags or there should be an explanation here as to why we need 2 or 3 versions of it.

@saurvs
Copy link
Contributor Author

saurvs commented Apr 5, 2016

After I updated all the crates to use bitflags 0.5, I ran ./mach build and then ./mach update-cargo. I guess the old versions of bitflags still remain in some files because the crates that aren't a part of Servo still use an older version of bitflags? If so, they need to be updated for Servo to completely depend on 0.5, and that'll take some more time.

@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Apr 6, 2016
@nox
Copy link
Contributor

nox commented May 16, 2016

Superseded by #11191.

@nox nox closed this May 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-needs-rebase There are merge conflict errors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants