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 darling to 0.9 #23437

Merged
merged 1 commit into from May 24, 2019
Merged

Update darling to 0.9 #23437

merged 1 commit into from May 24, 2019

Conversation

@Eijebong
Copy link
Member

Eijebong commented May 21, 2019

This change is Reviewable

@jdm
Copy link
Member

jdm commented May 22, 2019

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2019

📌 Commit 0f2e44c has been approved by jdm

@highfive highfive assigned jdm and unassigned avadacatavra May 22, 2019
bors-servo added a commit that referenced this pull request May 22, 2019
Update darling to 0.9

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

bors-servo commented May 22, 2019

Testing commit 0f2e44c with merge 0972e53...

@jdm
Copy link
Member

jdm commented May 22, 2019

+ ./etc/ci/lockfile_changed.sh
diff --git a/Cargo.lock b/Cargo.lock
index 1da3d0aa8..d88ecbabd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -952,7 +952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@Eijebong Eijebong force-pushed the Eijebong:darling branch from 0f2e44c to 96fafe7 May 22, 2019
@Eijebong
Copy link
Member Author

Eijebong commented May 22, 2019

I guess derivative is a new dep ?

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member

jdm commented May 22, 2019

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2019

📌 Commit 96fafe7 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 23, 2019

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

@bors-servo
Copy link
Contributor

bors-servo commented May 23, 2019

🔒 Merge conflict

@Eijebong Eijebong force-pushed the Eijebong:darling branch from 96fafe7 to c7ff341 May 23, 2019
@Eijebong
Copy link
Member Author

Eijebong commented May 23, 2019

Rebased

@jdm
Copy link
Member

jdm commented May 23, 2019

@bors-servo
Copy link
Contributor

bors-servo commented May 23, 2019

📌 Commit c7ff341 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 24, 2019

Testing commit c7ff341 with merge ce37d5e...

bors-servo added a commit that referenced this pull request May 24, 2019
Update darling to 0.9

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

bors-servo commented May 24, 2019

☀️ Test successful - arm64, linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing ce37d5e to master...

@bors-servo bors-servo merged commit c7ff341 into servo:master May 24, 2019
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.