Skip to content

Commit c008a01

Browse files
authored
Auto merge of servo#29978 - mrobinson:fix-webrender-errors, r=atbrakhi
Fix warnings in vendored WebRender These show up every time one builds, so this adds a patch on top of our vendored copy of WebRender to fix these errors for now. <!-- Please describe your changes on the following line: --> --- <!-- 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 do not require tests because they do not change behavior. <!-- 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. -->
2 parents 1b00548 + 4db0b5d commit c008a01

File tree

30 files changed

+706
-127
lines changed

30 files changed

+706
-127
lines changed

third_party/webrender/direct-composition/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#![cfg(windows)]
66

7-
extern crate gleam;
8-
extern crate mozangle;
9-
extern crate winapi;
7+
use gleam;
8+
use mozangle;
9+
use winapi;
1010

1111
use com::{ComPtr, CheckHResult, as_ptr};
1212
use std::ptr;

third_party/webrender/direct-composition/src/main_windows.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate direct_composition;
6-
extern crate euclid;
7-
extern crate gleam;
8-
extern crate webrender;
9-
extern crate winit;
5+
use direct_composition;
6+
use euclid;
7+
use gleam;
8+
use webrender;
9+
use winit;
1010

1111
use euclid::size2;
1212
use direct_composition::DirectComposition;

third_party/webrender/examples/alpha_perf.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate euclid;
6-
extern crate gleam;
7-
extern crate glutin;
8-
extern crate webrender;
9-
extern crate winit;
5+
use euclid;
6+
use gleam;
7+
use glutin;
8+
use webrender;
9+
use winit;
1010

1111
#[path = "common/boilerplate.rs"]
1212
mod boilerplate;

third_party/webrender/examples/animation.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
//! rounded cornered rectangle, which is done automatically during the
1111
//! scene building for render optimization.
1212
13-
extern crate euclid;
14-
extern crate gleam;
15-
extern crate glutin;
16-
extern crate webrender;
17-
extern crate winit;
13+
use euclid;
14+
use gleam;
15+
use glutin;
16+
use webrender;
17+
use winit;
1818

1919
#[path = "common/boilerplate.rs"]
2020
mod boilerplate;

third_party/webrender/examples/basic.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate euclid;
6-
extern crate gleam;
7-
extern crate glutin;
8-
extern crate webrender;
9-
extern crate winit;
5+
use euclid;
6+
use gleam;
7+
use glutin;
8+
use webrender;
9+
use winit;
1010

1111
#[path = "common/boilerplate.rs"]
1212
mod boilerplate;

third_party/webrender/examples/blob.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate gleam;
6-
extern crate glutin;
7-
extern crate rayon;
8-
extern crate webrender;
9-
extern crate winit;
5+
use gleam;
6+
use glutin;
7+
use rayon;
8+
use webrender;
9+
use winit;
1010

1111
#[path = "common/boilerplate.rs"]
1212
mod boilerplate;

third_party/webrender/examples/document.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate euclid;
6-
extern crate gleam;
7-
extern crate glutin;
8-
extern crate webrender;
9-
extern crate winit;
5+
use euclid;
6+
use gleam;
7+
use glutin;
8+
use webrender;
9+
use winit;
1010

1111
#[path = "common/boilerplate.rs"]
1212
mod boilerplate;

third_party/webrender/examples/frame_output.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate euclid;
6-
extern crate gleam;
7-
extern crate glutin;
8-
extern crate webrender;
9-
extern crate winit;
5+
use euclid;
6+
use gleam;
7+
use glutin;
8+
use webrender;
9+
use winit;
1010

1111
#[path = "common/boilerplate.rs"]
1212
mod boilerplate;

third_party/webrender/examples/iframe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate gleam;
6-
extern crate glutin;
7-
extern crate webrender;
8-
extern crate winit;
5+
use gleam;
6+
use glutin;
7+
use webrender;
8+
use winit;
99

1010
#[path = "common/boilerplate.rs"]
1111
mod boilerplate;

third_party/webrender/examples/image_resize.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
extern crate gleam;
6-
extern crate glutin;
7-
extern crate webrender;
8-
extern crate winit;
5+
use gleam;
6+
use glutin;
7+
use webrender;
8+
use winit;
99

1010
#[path = "common/boilerplate.rs"]
1111
mod boilerplate;

0 commit comments

Comments
 (0)