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

Rename blacklist to blocklist in WebBluetooth #14206

Merged
merged 1 commit into from Nov 22, 2016
Merged

Rename blacklist to blocklist in WebBluetooth #14206

merged 1 commit into from Nov 22, 2016

Conversation

@zakorgy
Copy link
Contributor

zakorgy commented Nov 14, 2016 •
edited by larsbergstrom

There was a renaming in the specification.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes OR

This change is Reviewable
@highfive
Copy link

highfive commented Nov 14, 2016

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/dom/bluetoothremotegattserver.rs, components/script/dom/bluetoothremotegattservice.rs, components/script/dom/bluetooth.rs, components/script/dom/bluetoothremotegattdescriptor.rs, components/script/dom/bluetoothremotegattcharacteristic.rs
  • @KiChjang: components/script/dom/bluetoothremotegattserver.rs, components/script/dom/bluetoothremotegattservice.rs, components/script/dom/bluetooth.rs, components/script/dom/bluetoothremotegattdescriptor.rs, components/script/dom/bluetoothremotegattcharacteristic.rs
@zakorgy
Copy link
Contributor Author

zakorgy commented Nov 14, 2016

r? @jdm
@highfive highfive assigned jdm and unassigned cbrewster Nov 14, 2016
@jdm
Copy link
Member

jdm commented Nov 14, 2016

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

bors-servo commented Nov 14, 2016

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

bors-servo commented Nov 14, 2016

☔ The latest upstream changes (presumably #14205) made this pull request unmergeable. Please resolve the merge conflicts.
@zakorgy zakorgy force-pushed the szeged:blacklist-to-blocklist branch from 7d4a712 to 92d8ac8 Nov 15, 2016
@jdm
Copy link
Member

jdm commented Nov 15, 2016

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

bors-servo commented Nov 15, 2016

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

bors-servo commented Nov 15, 2016

⌛ Testing commit 92d8ac8 with merge b9fc1a3...
bors-servo added a commit that referenced this pull request Nov 15, 2016
@bors-servo
Auto merge of #14206 - szeged:blacklist-to-blocklist, r=jdm
Loading status checks…
b9fc1a3 
Rename blacklist to blocklist in WebBluetooth

<!-- Please describe your changes on the following line: -->
There was a renaming in the [specification](WebBluetoothCG/web-bluetooth@1d5cfa4).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/14206)
<!-- Reviewable:end -->
@bors-servo bors-servo mentioned this pull request Nov 15, 2016
Merged
@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2016

💔 Test failed - linux-rel-wpt
@highfive
Copy link

highfive commented Nov 15, 2016 

  ▶ FAIL [expected PASS] /_mozilla/css/incremental_trailing_whitespace_a.html
  └   → /_mozilla/css/incremental_trailing_whitespace_a.html da54041086f2975f8e3c776d2283ad6609e6862a
/_mozilla/css/incremental_trailing_whitespace_ref.html f5d0147c8bddbdc772a7e5e86c7c9e433fcd486b
Testing da54041086f2975f8e3c776d2283ad6609e6862a == f5d0147c8bddbdc772a7e5e86c7c9e433fcd486b

  ▶ FAIL [expected PASS] /_mozilla/css/inline_block_opacity_change.html
  └   → /_mozilla/css/inline_block_opacity_change.html aed6845267bba6c52d3aa69c4889449b454d8117
/_mozilla/css/inline_block_opacity_change_ref.html febec1b4730afab195f280694dad47200b09ea3c
Testing aed6845267bba6c52d3aa69c4889449b454d8117 == febec1b4730afab195f280694dad47200b09ea3c
@jdm
Copy link
Member

jdm commented Nov 15, 2016

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

bors-servo commented Nov 16, 2016

⌛ Testing commit 92d8ac8 with merge e42d572...
bors-servo added a commit that referenced this pull request Nov 16, 2016
@bors-servo
Auto merge of #14206 - szeged:blacklist-to-blocklist, r=jdm
Loading status checks…
e42d572 
Rename blacklist to blocklist in WebBluetooth

<!-- Please describe your changes on the following line: -->
There was a renaming in the [specification](WebBluetoothCG/web-bluetooth@1d5cfa4).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/14206)
<!-- Reviewable:end -->
@Ms2ger
Copy link
Contributor

Ms2ger commented Nov 16, 2016

@bors-servo p=-2
@bors-servo
Copy link
Contributor

bors-servo commented Nov 16, 2016

💔 Test failed - mac-rel-wpt1
@bors-servo
Copy link
Contributor

bors-servo commented Nov 17, 2016

☔ The latest upstream changes (presumably #14207) made this pull request unmergeable. Please resolve the merge conflicts.
@zakorgy
Rename blacklist to blocklist
Loading status checks…
f98fbec
@zakorgy zakorgy force-pushed the szeged:blacklist-to-blocklist branch from 92d8ac8 to f98fbec Nov 17, 2016
@zakorgy
Copy link
Contributor Author

zakorgy commented Nov 18, 2016

r? @jdm
@jdm
Copy link
Member

jdm commented Nov 21, 2016

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

bors-servo commented Nov 21, 2016

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

bors-servo commented Nov 22, 2016

⌛ Testing commit f98fbec with merge a89ba50...
bors-servo added a commit that referenced this pull request Nov 22, 2016
@bors-servo
Auto merge of #14206 - szeged:blacklist-to-blocklist, r=jdm
Loading status checks…
a89ba50 
Rename blacklist to blocklist in WebBluetooth

<!-- Please describe your changes on the following line: -->
There was a renaming in the [specification](WebBluetoothCG/web-bluetooth@1d5cfa4).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

bors-servo commented Nov 22, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev
@bors-servo bors-servo merged commit f98fbec into servo:master Nov 22, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Nov 22, 2016
Merged
Merged
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
@zakorgy @highfive @jdm @bors-servo @Ms2ger @cbrewster
You can’t perform that action at this time.