Prepare WebRender for crates.io release

Changes made:

    - Update webrender and in-repo crates that are dependencies of
    webrender to version 0.68

    - Update these crates to use workspace depency versions similar to
      stylo#249 (seeing as the feedback on that change was positive).

I have not bothered updating the versions of the other in-repo crates
that are not dependencies of webrender (e.g. wrench and crates that are
used by wrench like swgl) as we don't need to publish those and thus
their version numbers don't matter, and I figured it would keep the diff
a little smaller. But it would be easy to update those too if we wanted
to.

Signed-off-by: Nico Burns <nico@nicoburns.com>

Author: nicoburns

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
       - name: Install freetype
-        run: sudo apt install libfreetype-dev
+        run: sudo apt update && sudo apt install -y libfreetype-dev
       - name: Build wrench
         run: |
           cd wrench

Cargo.lock

@@ -8,7 +8,19 @@ members = [
 ]
 resolver = "2"
 
+[workspace.package]
+version = "0.68.0"
+
 [workspace.dependencies]
+# Local repo dependencies
+webrender = { version = "0.68", path = "./webrender", package = "webrender" }
+api = { version = "0.68", path = "./webrender_api", package = "webrender_api" }
+webrender_build = { version = "0.68", path = "./webrender_build", package = "webrender_build" }
+glyph_rasterizer = { version = "0.68", path = "./wr_glyph_rasterizer", package = "wr_glyph_rasterizer" }
+malloc_size_of = { version = "0.2.2", path = "./wr_malloc_size_of", package = "wr_malloc_size_of" }
+swgl = { version = "0.68", path = "./swgl", package = "swgl" }
+peek-poke = { version = "0.3", path = "./peek-poke", package = "peek-poke" }
+
 gleam = "0.15.1"
 glean = "=65.2.1"
 

Cargo.toml

@@ -4,8 +4,8 @@
 
 WebRender is a GPU-based 2D rendering engine written in [Rust](https://www.rust-lang.org/). [Firefox](https://www.mozilla.org/firefox), the research web browser [Servo](https://github.com/servo/servo), and other GUI frameworks draw with it. It currently uses the OpenGL API internally.
 
-Note that the canonical home for this code is in gfx/wr folder of the
-mozilla-central repository at https://hg.mozilla.org/mozilla-central. The
+Note that the canonical home for this code is in [gfx/wr folder[(https://github.com/mozilla-firefox/firefox/tree/main/gfx/wr)] of the
+mozilla-central repository at https://github.com/mozilla-firefox/firefox. The
 Github repository at https://github.com/servo/webrender should be considered
 a downstream mirror, although it contains additional metadata (such as Github
 wiki pages) that do not exist in mozilla-central. Pull requests against the

README.md

@@ -9,7 +9,7 @@ description = "Software OpenGL implementation for WebRender."
 [build-dependencies]
 cc = "1.0.46"
 glsl-to-cxx = { path = "../glsl-to-cxx" }
-webrender_build = { path = "../webrender_build" }
+webrender_build = { workspace = true }
 
 [dependencies]
 gleam = { workspace = true }

swgl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webrender"
-version = "0.68.0"
+version.workspace = true
 authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -25,7 +25,7 @@ debugger = ["tiny_http", "serde_json", "url", "sha1", "base64", "api/debugger"]
 [build-dependencies]
 build-parallel = "0.1.2"
 glslopt = "0.1.11"
-webrender_build = { version = "0.0.2", path = "../webrender_build" }
+webrender_build = { workspace = true }
 
 [dependencies]
 bincode = "1.0"
@@ -44,10 +44,10 @@ rayon = "1"
 ron = { optional = true, version = "0.10.0" }
 serde = { optional = true, version = "1.0", features = ["serde_derive"] }
 smallvec = "1"
-api = { version = "0.68.0", path = "../webrender_api", package = "webrender_api" }
-webrender_build = { version = "0.0.2", path = "../webrender_build" }
-malloc_size_of = { version = "0.2.0", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
-glyph_rasterizer = { version = "0.1.0", path = "../wr_glyph_rasterizer", package = "wr_glyph_rasterizer", default-features = false }
+api = { workspace = true }
+webrender_build = { workspace = true }
+malloc_size_of = { workspace = true }
+glyph_rasterizer = { workspace = true }
 svg_fmt = "0.4"
 tracy-rs = "0.1.2"
 derive_more = { version = "2", features = ["add_assign"] }

webrender/Cargo.toml

@@ -1491,8 +1491,9 @@ impl RenderBackend {
                 .cloned()
                 .filter(|key| !document_already_present(*key))
                 .collect();
-            #[allow(unused_variables)]
+            #[cfg_attr(not(feature = "capture"), allow(unused_variables))]
             let mut built_frame = false;
+            #[cfg_attr(not(feature = "capture"), allow(unused_assignments))]
             for &document_id in &nop_documents {
                 built_frame |= self.update_document(
                     document_id,

webrender/src/render_backend.rs

@@ -23,7 +23,7 @@ malloc_size_of_derive = "0.1"
 serde = { version = "1.0", features = ["rc"] }
 serde_derive = "1.0"
 serde_bytes = "0.11"
-malloc_size_of = { version = "0.2.0", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
-peek-poke = { version = "0.3", path = "../peek-poke", features = ["extras"] }
+malloc_size_of = { workspace = true }
+peek-poke = { workspace = true, features = ["extras"] }
 crossbeam-channel = "0.5"
 zeitstempel = "0.1.2"

webrender_api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "webrender_build"
 authors = ["The Servo Project Developers"]
-version = "0.0.2"
+version.workspace = true
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
 description = "Code shared between precompilation (build.rs) and the rest of WebRender"

webrender_build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wr_glyph_rasterizer"
-version = "0.1.0"
+version.workspace = true
 authors = ["The Mozilla Project Developers"]
 description = "A glyph rasterizer for WebRender"
 license = "MPL-2.0"
@@ -15,9 +15,9 @@ replay = ["api/deserialize", "serde", "smallvec/serde"]
 gecko = ["firefox-on-glean", "glean"]
 
 [dependencies]
-api = { version = "0.68.0", path = "../webrender_api", package = "webrender_api" }
+api = { workspace = true }
 euclid = { version = "0.22.0", features = ["serde"] }
-malloc_size_of = { version = "0.2.0", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
+malloc_size_of = { workspace = true }
 malloc_size_of_derive = "0.1"
 rayon = "1"
 smallvec = "1"