diff --git a/.gitignore b/.gitignore
index bf0df10791c..50b1a37ec15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 !/.cargo/config.*
 /.servobuild
 /.wpt
+/.vs
 /android-toolchains
 /target
 /ports/android/bin
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
deleted file mode 100644
index 2b7b33d8ded..00000000000
--- a/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": "x64-Debug (default)"
-}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 69b2c31a3c7..00000000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\components",
-  "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/.vs/servo/v15/.suo b/.vs/servo/v15/.suo
deleted file mode 100644
index 72ace035989..00000000000
Binary files a/.vs/servo/v15/.suo and /dev/null differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
deleted file mode 100644
index c5a5191e873..00000000000
Binary files a/.vs/slnx.sqlite and /dev/null differ
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 96da2168916..285925b7302 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -132,9 +132,7 @@ pub struct CanvasState {
 }
 
 impl CanvasState {
-    pub fn new(
-        global: &GlobalScope,
-    ) -> CanvasState {
+    pub fn new(global: &GlobalScope) -> CanvasState {
         let (sender, receiver) =
             profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
         let (ipc_renderer, canvas_id) = receiver.recv().unwrap();
@@ -247,8 +245,13 @@ impl CanvasRenderingContext2D {
     // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
     pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) {
         self.reset_to_initial_state();
-        self.canvas_state.borrow().ipc_renderer
-            .send(CanvasMsg::Recreate(size, self.canvas_state.borrow().get_canvas_id()))
+        self.canvas_state
+            .borrow()
+            .ipc_renderer
+            .send(CanvasMsg::Recreate(
+                size,
+                self.canvas_state.borrow().get_canvas_id(),
+            ))
             .unwrap();
     }
 
@@ -656,7 +659,11 @@ pub trait LayoutCanvasRenderingContext2DHelpers {
 impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> {
     #[allow(unsafe_code)]
     unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> {
-        (*self.unsafe_get()).canvas_state.borrow().ipc_renderer.clone()
+        (*self.unsafe_get())
+            .canvas_state
+            .borrow()
+            .ipc_renderer
+            .clone()
     }
 
     #[allow(unsafe_code)]
@@ -1523,7 +1530,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
 impl Drop for CanvasRenderingContext2D {
     fn drop(&mut self) {
         if let Err(err) = self
-            .canvas_state.borrow().ipc_renderer
+            .canvas_state
+            .borrow()
+            .ipc_renderer
             .send(CanvasMsg::Close(self.canvas_state.borrow().get_canvas_id()))
         {
             warn!("Could not close canvas: {}", err)