aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-03 10:00:40 -0400
committerGitHub <noreply@github.com>2018-09-03 10:00:40 -0400
commit156b1cc8918a2923f41582fb65f4eb661f84de0c (patch)
treebc57a1f3e9be41d47e9f64310ed963174b787adb /components
parentd8446f85a95723dec3a18b05bdd30514a57bddab (diff)
parent984680714e14d3c3513d1db4cdd8dc3452cb7a6a (diff)
downloadservo-156b1cc8918a2923f41582fb65f4eb661f84de0c.tar.gz
servo-156b1cc8918a2923f41582fb65f4eb661f84de0c.zip
Auto merge of #21593 - chansuke:format_webvr_traits, r=jdm
Format components webvr_traits #21373 <!-- Please describe your changes on the following line: --> Format `components/webvr_traits` with `rstfmt` command. --- <!-- 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 _____ <!-- 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/21593) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/webvr_traits/lib.rs3
-rw-r--r--components/webvr_traits/webvr_traits.rs13
2 files changed, 13 insertions, 3 deletions
diff --git a/components/webvr_traits/lib.rs b/components/webvr_traits/lib.rs
index 9fd8c85074b..baf4b20943e 100644
--- a/components/webvr_traits/lib.rs
+++ b/components/webvr_traits/lib.rs
@@ -6,7 +6,8 @@
extern crate ipc_channel;
extern crate msg;
-#[macro_use] extern crate serde;
+#[macro_use]
+extern crate serde;
pub extern crate rust_webvr_api as webvr;
mod webvr_traits;
diff --git a/components/webvr_traits/webvr_traits.rs b/components/webvr_traits/webvr_traits.rs
index 10fc9576b90..86c194fc404 100644
--- a/components/webvr_traits/webvr_traits.rs
+++ b/components/webvr_traits/webvr_traits.rs
@@ -15,11 +15,20 @@ pub enum WebVRMsg {
UnregisterContext(PipelineId),
PollEvents(IpcSender<bool>),
GetDisplays(IpcSender<WebVRResult<Vec<VRDisplayData>>>),
- GetFrameData(PipelineId, u32, f64, f64, IpcSender<WebVRResult<VRFrameData>>),
+ GetFrameData(
+ PipelineId,
+ u32,
+ f64,
+ f64,
+ IpcSender<WebVRResult<VRFrameData>>,
+ ),
ResetPose(PipelineId, u32, IpcSender<WebVRResult<VRDisplayData>>),
RequestPresent(PipelineId, u32, IpcSender<WebVRResult<()>>),
ExitPresent(PipelineId, u32, Option<IpcSender<WebVRResult<()>>>),
CreateCompositor(u32),
- GetGamepads(Vec<u32>, IpcSender<WebVRResult<Vec<(Option<VRGamepadData>, VRGamepadState)>>>),
+ GetGamepads(
+ Vec<u32>,
+ IpcSender<WebVRResult<Vec<(Option<VRGamepadData>, VRGamepadState)>>>,
+ ),
Exit,
}