Skip to content
This repository was archived by the owner on Jul 10, 2023. It is now read-only.

Unpin the bitflags dependency. #94

Merged
merged 1 commit into from
Jul 6, 2015
Merged

Unpin the bitflags dependency. #94

merged 1 commit into from
Jul 6, 2015

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented Jul 5, 2015

It causes Servo to depend on two versions of the bitflags crate (0.1 and 0.2).

It causes Servo to depend on two versions of the bitflags crate (0.1 and 0.2).
@jdm
Copy link
Member

jdm commented Jul 5, 2015

@bors-servo: r+

Ms2ger added a commit that referenced this pull request Jul 6, 2015
Unpin the bitflags dependency; r=jdm
@Ms2ger Ms2ger merged commit 1a9bdf4 into master Jul 6, 2015
@Ms2ger Ms2ger deleted the unpin branch July 6, 2015 07:35
Ms2ger added a commit to servo/servo that referenced this pull request Jul 6, 2015
This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.
bors-servo pushed a commit to servo/servo that referenced this pull request Jul 6, 2015
Update most dependencies.

This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6562)
<!-- Reviewable:end -->
Ms2ger added a commit to servo/servo that referenced this pull request Jul 6, 2015
This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.
bors-servo pushed a commit to servo/servo that referenced this pull request Jul 6, 2015
Update most dependencies.

This excludes

* layers, as its latest commits have an API change we still need to adapt to;
* hyper, as it gained a dependency on the solicit crate, which triggers an ICE
  in the current rustc (<rust-lang/rust#26805>);
* websocket, as it depends on a hyper API change;
* tenacious, as it has not yet been updated to the current rustc
  (<Manishearth/rust-tenacious#6>).

Unfortunately, this adds a third copy of bitflags to our dependencies; I've
created pull requests to the guilty dependencies:
<sfackler/rust-openssl#236> and
<servo/cocoa-rs#94>.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6562)
<!-- Reviewable:end -->
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants