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

Format script component #21737

Merged
merged 1 commit into from Sep 20, 2018
Merged

Format script component #21737

merged 1 commit into from Sep 20, 2018

Conversation

@chansuke
Copy link
Contributor

chansuke commented Sep 18, 2018 •
edited by jdm

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix part of #21373.
  • These changes do not require tests because they format code only.

This change is Reviewable
@highfive
Copy link

highfive commented Sep 18, 2018

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @emilio (or someone else) soon.
@highfive
Copy link

highfive commented Sep 18, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/textencoder.rs, components/script/dom/htmlbrelement.rs, components/script/dom/audiodestinationnode.rs, components/script/dom/abstractworkerglobalscope.rs, components/script/dom/htmlformcontrolscollection.rs and 352 more
  • @KiChjang: components/script/dom/textencoder.rs, components/script/dom/htmlbrelement.rs, components/script/dom/audiodestinationnode.rs, components/script/dom/abstractworkerglobalscope.rs, components/script/dom/htmlformcontrolscollection.rs and 352 more
@highfive
Copy link

highfive commented Sep 18, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@jdm jdm mentioned this pull request Sep 18, 2018
Closed
53 of 53 tasks complete
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2018

☔ The latest upstream changes (presumably #21723) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
jdm reviewed Sep 19, 2018
View changes
components/script/dom/bindings/utils.rs
@@ -184,23 +184,29 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Option<u32>
return if StringIsArray(str, &mut i) != 0 { i } else { -1 }
} else {
IdToInt32(cx, id);
}*/
}
}*/}

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Sep 19, 2018

Member

Filed rust-lang/rustfmt#3032.
components/script/dom/bindings/trace.rs
RefCell::new(RootedTraceableSet::new());
);
thread_local!(/// TLV Holds a set of JSTraceables that need to be rooted
static ROOTED_TRACEABLES: RefCell<RootedTraceableSet> = RefCell::new(RootedTraceableSet::new()););

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Sep 19, 2018

Member

Filed rust-lang/rustfmt#3031.
components/script/dom/bluetooth.rs
@@ -12,7 +12,7 @@ use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothDataFilt
use dom::bindings::codegen::Bindings::BluetoothBinding::{BluetoothMethods, RequestDeviceOptions};
use dom::bindings::codegen::Bindings::BluetoothPermissionResultBinding::BluetoothPermissionDescriptor;
use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerBinding::
BluetoothRemoteGATTServerMethods;
BluetoothRemoteGATTServerMethods;

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Sep 19, 2018

Member

Filed rust-lang/rustfmt#3033.
components/script/dom/htmltableelement.rs
}
.find(|n| {
n.is::<HTMLTableSectionElement>() && n.local_name() == &local_name!("tbody")
}) {

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Sep 19, 2018

Member

Filed rust-lang/rustfmt#3038.
components/script/dom/treewalker.rs
// is meant for internal use from Rust code, which
// will probably be using a native Rust filter,
// which cannot produce an Err result.
{

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Sep 19, 2018

Member

Filed rust-lang/rustfmt#3039.
@jdm jdm removed the S-awaiting-review label Sep 19, 2018
@chansuke @jdm
Format script component
Loading status checks…
c37a345
@jdm jdm force-pushed the chansuke:format_script branch from 40ca517 to c37a345 Sep 19, 2018
@jdm
Copy link
Member

jdm commented Sep 19, 2018

@bors-servo p=10 r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

📌 Commit c37a345 has been approved by jdm
@highfive highfive assigned jdm and unassigned emilio Sep 19, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

⌛ Testing commit c37a345 with merge df2adeb...
bors-servo added a commit that referenced this pull request Sep 19, 2018
@bors-servo
Auto merge of #21737 - chansuke:format_script, 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…
df2adeb 
Format script component

---
<!-- 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
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format code only.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

bors-servo commented Sep 19, 2018

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

jdm commented Sep 20, 2018

@bors-servo retry

  • oom
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

⚡ Previous build results for android, android-x86, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

☀️ Test successful - android, android-x86, 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: jdm
Pushing df2adeb to master...
@bors-servo bors-servo merged commit c37a345 into servo:master Sep 20, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Sep 20, 2018
Merged
4 of 4 tasks complete
This was referenced Sep 20, 2018
Closed
Merged
Closed
Merged
Open
Merged
Open
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@chansuke @highfive @bors-servo @jdm @emilio
You can’t perform that action at this time.