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

Use [patch] instead of [replace] #19590

Merged
merged 1 commit into from
Dec 17, 2017
Merged

Use [patch] instead of [replace] #19590

merged 1 commit into from
Dec 17, 2017

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Dec 17, 2017

CC servo/webrender#2215

Also, [replace] prevented using [patch] for other crates. (Cargo forbids using both.)


This change is Reviewable

CC servo/webrender#2215

Also, `[replace]` prevented using `[patch]` for other crates.
(Cargo forbids using both.)
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Dec 17, 2017
@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 9eee610 has been approved by SimonSapin

@highfive highfive assigned SimonSapin and unassigned Manishearth Dec 17, 2017
@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 Dec 17, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 9eee610 with merge 3a37d80...

bors-servo pushed a commit that referenced this pull request Dec 17, 2017
Use [patch] instead of [replace]

CC servo/webrender#2215

Also, `[replace]` prevented using `[patch]` for other crates. (Cargo forbids using both.)

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

☀️ 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: SimonSapin
Pushing 3a37d80 to master...

@bors-servo bors-servo merged commit 9eee610 into master Dec 17, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Dec 17, 2017
@SimonSapin SimonSapin deleted the patch branch December 17, 2017 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants