Skip to content

/ servo

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

Deduplicate parking_lot by updating it to 0.9 #24129

Merged
merged 1 commit into from Sep 5, 2019
Merged

Deduplicate parking_lot by updating it to 0.9 #24129

merged 1 commit into from Sep 5, 2019

Conversation

@Eijebong
Copy link
Member

Eijebong commented Sep 3, 2019 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Sep 3, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/Cargo.toml
  • @KiChjang: components/script/Cargo.toml
  • @emilio: components/style/Cargo.toml, components/layout/Cargo.toml
@highfive
Copy link

highfive commented Sep 3, 2019

warning Warning warning

  • These commits modify style, layout, and script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Sep 3, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 3, 2019

📌 Commit 5d3dfd3 has been approved by jdm
@highfive highfive assigned jdm and unassigned asajeffrey Sep 3, 2019
@Eijebong Eijebong force-pushed the Eijebong:parking_lot branch from 5d3dfd3 to 4ea1232 Sep 3, 2019
@Eijebong
Copy link
Member Author

Eijebong commented Sep 3, 2019

@jdm Updated scopeguard too since updating parking_lot allowed for that
@jdm
Copy link
Member

jdm commented Sep 3, 2019 

�[0m�[1m�[38;5;9merror�[0m�[0m�[1m: use of deprecated item 'libc::fixed_width_ints::uint8_t': Use u8 instead.�[0m
�[0m  �[0m�[0m�[1m�[38;5;12m--> �[0m�[0mcomponents/background_hang_monitor/sampler.rs:33:27�[0m
�[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
�[0m�[1m�[38;5;12m33�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0mpub type Address = *const libc::uint8_t;�[0m
�[0m   �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                          �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^^^�[0m
�[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
�[0m   �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: `-D deprecated` implied by `-D warnings`�[0m

�[0m�[1m�[38;5;9merror�[0m�[0m�[1m: aborting due to previous error�[0m
@jdm
Copy link
Member

jdm commented Sep 3, 2019

New deprecation introduced by updating libstd.
@Eijebong Eijebong force-pushed the Eijebong:parking_lot branch from 4ea1232 to a7c9e8a Sep 3, 2019
@Eijebong
Copy link
Member Author

Eijebong commented Sep 3, 2019

Arf. Should be fixed now
@jdm
Copy link
Member

jdm commented Sep 3, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 3, 2019

📌 Commit a7c9e8a has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Sep 3, 2019

⌛ Testing commit a7c9e8a with merge c252911...
bors-servo added a commit that referenced this pull request Sep 3, 2019
@bors-servo
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c252911 
Deduplicate parking_lot by updating it 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/24129)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 3, 2019

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Sep 3, 2019

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 3, 2019

⌛ Testing commit a7c9e8a with merge 89cdf13...
bors-servo added a commit that referenced this pull request Sep 3, 2019
@bors-servo
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
89cdf13 
Deduplicate parking_lot by updating it 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/24129)
<!-- Reviewable:end -->
@Eijebong
Copy link
Member Author

Eijebong commented Sep 5, 2019

There, the libc stuff is fixed now
@Eijebong
Deduplicate parking_lot and friends by updating it to 0.9
Loading status checks…
b6cddbe
@jdm
Copy link
Member

jdm commented Sep 5, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

📌 Commit b6cddbe has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

⌛ Testing commit b6cddbe with merge 3b7cdf7...
bors-servo added a commit that referenced this pull request Sep 5, 2019
@bors-servo
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3b7cdf7 
Deduplicate parking_lot by updating it 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/24129)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Sep 5, 2019

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

⌛ Testing commit b6cddbe with merge 18cae58...
bors-servo added a commit that referenced this pull request Sep 5, 2019
@bors-servo
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
18cae58 
Deduplicate parking_lot by updating it 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/24129)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Sep 5, 2019

@bors-servo retry

  • network issue
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

⌛ Testing commit b6cddbe with merge 524e135...
bors-servo added a commit that referenced this pull request Sep 5, 2019
@bors-servo
Auto merge of #24129 - Eijebong:parking_lot, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
524e135 
Deduplicate parking_lot by updating it 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/24129)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing 524e135 to master...
@bors-servo bors-servo merged commit b6cddbe into servo:master Sep 5, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Sep 5, 2019
Merged
3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Eijebong @highfive @jdm @bors-servo @CYBAI @asajeffrey
You can’t perform that action at this time.