Bug 1525402 - Migrate webrender externs to a Rust 2018 compatible form. r=kvark

Notably `extern crate foo as bar` is no longer supported
(must do it in Cargo.toml). Also stopped using euclid through webrender_api,
because it produces worse results in 2018.

Differential Revision: https://phabricator.services.mozilla.com/D29566

--HG--
extra : moz-landing-system : lando

Cargo.lock

@@ -3359,6 +3359,7 @@ dependencies = [
  "core-text 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",

gfx/wr/Cargo.lock

@@ -1643,6 +1643,7 @@ dependencies = [
  "core-text 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",

gfx/wr/webrender/Cargo.toml

@@ -11,10 +11,10 @@ build = "build.rs"
 default = ["freetype-lib"]
 freetype-lib = ["freetype/servo-freetype-sys"]
 profiler = ["thread_profiler/thread_profiler"]
-debugger = ["ws", "serde_json", "serde", "image", "base64"]
-capture = ["webrender_api/serialize", "ron", "serde", "smallvec/serde"]
-replay = ["webrender_api/deserialize", "ron", "serde"]
-display_list_stats = ["webrender_api/display_list_stats"]
+debugger = ["ws", "serde_json", "serde", "image_loader", "base64"]
+capture = ["api/serialize", "ron", "serde", "smallvec/serde"]
+replay = ["api/deserialize", "ron", "serde"]
+display_list_stats = ["api/display_list_stats"]
 pathfinder = ["pathfinder_font_renderer", "pathfinder_gfx_utils", "pathfinder_partitioner", "pathfinder_path_utils"]
 serialize_program = ["serde", "webrender_build/serialize_program"]
 no_static_freetype = []
@@ -29,9 +29,10 @@ bitflags = "1.0"
 byteorder = "1.0"
 cfg-if = "0.1.2"
 cstr = "0.1.2"
+euclid = { version = "0.19.5", features = ["serde"] }
 fxhash = "0.2.1"
 gleam = "0.6.17"
-image = { optional = true, version = "0.21", default-features = false, features = ["png_codec"] }
+image_loader = { optional = true, version = "0.21", package = "image", default-features = false, features = ["png_codec"] }
 lazy_static = "1"
 log = "0.4"
 malloc_size_of_derive = "0.1"
@@ -46,9 +47,9 @@ sha2 = "0.8"
 smallvec = "0.6"
 thread_profiler = "0.1.1"
 time = "0.1"
-webrender_api = { version = "0.60.0", path = "../webrender_api" }
+api = { version = "0.60.0", path = "../webrender_api", package = "webrender_api" }
 webrender_build = { version = "0.0.1", path = "../webrender_build" }
-wr_malloc_size_of = { version = "0.0.1", path = "../wr_malloc_size_of" }
+malloc_size_of = { version = "0.0.1", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
 ws = { optional = true, version = "0.7.3" }
 svg_fmt = "0.4"
 

gfx/wr/webrender/src/glyph_rasterizer/mod.rs

@@ -8,7 +8,7 @@ use api::{ColorU, GlyphIndex, GlyphDimensions, SyntheticItalics};
 use api::units::*;
 use euclid::approxeq::ApproxEq;
 use internal_types::ResourceCacheError;
-use wr_malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
+use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use platform::font::FontContext;
 use rayon::ThreadPool;
 use std::cmp;

gfx/wr/webrender/src/lib.rs

@@ -69,9 +69,8 @@ extern crate serde;
 #[macro_use]
 extern crate thread_profiler;
 
-extern crate wr_malloc_size_of;
+extern crate malloc_size_of;
 extern crate svg_fmt;
-use wr_malloc_size_of as malloc_size_of;
 
 #[macro_use]
 mod profiler;
@@ -170,6 +169,7 @@ extern crate dwrote;
 
 extern crate bincode;
 extern crate byteorder;
+pub extern crate euclid;
 extern crate fxhash;
 extern crate gleam;
 extern crate num_traits;
@@ -193,7 +193,7 @@ extern crate time;
 #[cfg(feature = "debugger")]
 extern crate ws;
 #[cfg(feature = "debugger")]
-extern crate image as image_loader;
+extern crate image_loader;
 #[cfg(feature = "debugger")]
 extern crate base64;
 #[cfg(all(feature = "capture", feature = "png"))]
@@ -202,7 +202,7 @@ extern crate png;
 extern crate rand;
 
 #[macro_use]
-pub extern crate webrender_api;
+pub extern crate api;
 extern crate webrender_build;
 
 #[doc(hidden)]
@@ -217,5 +217,4 @@ pub use renderer::{ExternalImageSource, GpuProfile, GraphicsApi, GraphicsApiInfo
 pub use renderer::{Renderer, RendererOptions, RenderResults, RendererStats, SceneBuilderHooks};
 pub use renderer::{ThreadListener, ShaderPrecacheFlags, MAX_VERTEX_TEXTURE_WIDTH};
 pub use shade::{Shaders, WrShaders};
-pub use webrender_api as api;
-pub use webrender_api::euclid;
+pub use api as webrender_api;

gfx/wr/webrender_api/Cargo.toml

@@ -26,7 +26,7 @@ serde = { version = "=1.0.88", features = ["rc"] }
 serde_derive = { version = "=1.0.88", features = ["deserialize_in_place"] }
 serde_bytes = "0.10"
 time = "0.1"
-wr_malloc_size_of = { version = "0.0.1", path = "../wr_malloc_size_of" }
+malloc_size_of = { version = "0.0.1", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.6"

gfx/wr/webrender_api/src/lib.rs

@@ -37,8 +37,7 @@ extern crate serde;
 extern crate serde_derive;
 extern crate time;
 
-extern crate wr_malloc_size_of;
-use wr_malloc_size_of as malloc_size_of;
+extern crate malloc_size_of;
 
 mod api;
 pub mod channel;