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.

Sign up for GitHub

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

Jump to bottom

Update bitflags to 0.7 #11191

Merged
merged 11 commits into from May 17, 2016
Merged

Update bitflags to 0.7 #11191

merged 11 commits into from May 17, 2016

Conversation

nox
Copy link
Contributor

@nox nox commented May 15, 2016 •
edited

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml
  • @fitzgen: components/devtools_traits/Cargo.toml, components/devtools_traits/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/script/Cargo.toml

@highfive
Copy link

warning Warning warning

  • These commits modify gfx, style, layout, net, 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 May 15, 2016
@highfive
Copy link

New code was committed to pull request.

2 similar comments
@highfive
Copy link

New code was committed to pull request.

@highfive
Copy link

New code was committed to pull request.

@nox nox mentioned this pull request May 16, 2016
Closed
@highfive
Copy link

New code was committed to pull request.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label May 16, 2016
@nox nox force-pushed the bitflags branch 2 times, most recently from 5d18428 to e8b684d Compare May 17, 2016 08:24
@nox nox removed the S-needs-rebase There are merge conflict errors. label May 17, 2016
@emilio emilio mentioned this pull request May 17, 2016
Closed
@highfive
Copy link

New code was committed to pull request.

@nox nox changed the title (Do not merge) Update bitflags to 0.7 Update bitflags to 0.7 May 17, 2016
@nox
Copy link
Contributor Author

nox commented May 17, 2016

This is ready to be merged.

@highfive
Copy link

New code was committed to pull request.

@highfive
Copy link

New code was committed to pull request.

@pcwalton
Copy link
Contributor

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 3cda52c has been approved by pcwalton

@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 May 17, 2016
@nox
Copy link
Contributor Author

nox commented May 17, 2016

@bors-servo p=1

@bors-servo
Copy link
Contributor

⌛ Testing commit 3cda52c with merge 6c08ad8...

bors-servo pushed a commit that referenced this pull request May 17, 2016
Auto merge of #11191 - servo:bitflags, r=pcwalton
6c08ad8 
Update bitflags to 0.7

- [x] servo/cocoa-rs#126 servo/cocoa-rs#127 servo/cocoa-rs#128 servo/glutin#91
- [x] https://github.com/cyderize/rust-websocket/pull/78
- [x] sfackler/rust-openssl#393
- [x] image-rs/image-png#36
- [x] servo/rust-selectors#87
- [x] Smithay/wayland-kbd#12
- [x] Smithay/wayland-rs#50
- [x] netvl/xml-rs#122 netvl/xml-rs#123

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

☀️ 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 3cda52c into master May 17, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 17, 2016
This was referenced May 17, 2016
Merged
Merged
@Ms2ger Ms2ger deleted the bitflags branch May 23, 2016 06:54
@mbrubeck mbrubeck mentioned this pull request May 23, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nox @highfive @bors-servo @pcwalton @SimonSapin