diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-18 22:57:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-18 22:57:59 -0500 |
commit | 5457b80233f9ce6773711c7189230d9a0a63d93a (patch) | |
tree | 035cee7e21bb31b434d6353241960c12b465e366 /components/script/dom/navigator.rs | |
parent | 157e3cc4e95e89e8c73a601028c09edaefe0f074 (diff) | |
parent | 5f961f9fd9aeb13ff6c5746a8d143a30a90b06c2 (diff) | |
download | servo-5457b80233f9ce6773711c7189230d9a0a63d93a.tar.gz servo-5457b80233f9ce6773711c7189230d9a0a63d93a.zip |
Auto merge of #13307 - bubbles231:code_refactor, r=Manishearth
Code refactoring
<!-- Please describe your changes on the following line: -->
The code was refactored to follow Rust naming conventions better.
---
<!-- 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] These changes help fix #12379.
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because logic was not changed.
<!-- 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/13307)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/navigator.rs')
-rw-r--r-- | components/script/dom/navigator.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 61936c59e5f..b2a4fa81b3b 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -21,7 +21,7 @@ pub struct Navigator { bluetooth: MutNullableHeap<JS<Bluetooth>>, plugins: MutNullableHeap<JS<PluginArray>>, mime_types: MutNullableHeap<JS<MimeTypeArray>>, - serviceWorker: MutNullableHeap<JS<ServiceWorkerContainer>>, + service_worker: MutNullableHeap<JS<ServiceWorkerContainer>>, } impl Navigator { @@ -31,7 +31,7 @@ impl Navigator { bluetooth: Default::default(), plugins: Default::default(), mime_types: Default::default(), - serviceWorker: Default::default(), + service_worker: Default::default(), } } @@ -105,7 +105,7 @@ impl NavigatorMethods for Navigator { // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#navigator-service-worker-attribute fn ServiceWorker(&self) -> Root<ServiceWorkerContainer> { - self.serviceWorker.or_init(|| ServiceWorkerContainer::new(self.global().r())) + self.service_worker.or_init(|| ServiceWorkerContainer::new(self.global().r())) } // https://html.spec.whatwg.org/multipage/#dom-navigator-cookieenabled |