buildMozillaMach: backport cbindgen 0.29.4 compat

Cherry-picked from 153 to remain compatible with cbindgen 0.29.4.
This commit is contained in:
Martin Weinelt
2026-06-30 03:11:48 +02:00
parent 0042d4e701
commit 1cb1099ea9
2 changed files with 41 additions and 0 deletions
@@ -0,0 +1,36 @@
commit c4aab1ba6aadd6985fcd271679d2118f094ec876
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Tue Jun 9 22:04:44 2026 +0000
Bug 2046162 - Remove some redundant pub qualifiers. r=gfx-reviewers,aosmond
The enum is not public so this doesn't change behavior but a patch I'm
working on in cbindgen gets a bit confused with this.
Differential Revision: https://phabricator.services.mozilla.com/D305678
diff --git a/gfx/wr/webrender/src/texture_cache.rs b/gfx/wr/webrender/src/texture_cache.rs
index e14c26bd3190..77e1f3a312ac 100644
--- a/gfx/wr/webrender/src/texture_cache.rs
+++ b/gfx/wr/webrender/src/texture_cache.rs
@@ -273,9 +273,9 @@ enum BudgetType {
}
impl BudgetType {
- pub const COUNT: usize = 7;
+ const COUNT: usize = 7;
- pub const VALUES: [BudgetType; BudgetType::COUNT] = [
+ const VALUES: [BudgetType; BudgetType::COUNT] = [
BudgetType::SharedColor8Linear,
BudgetType::SharedColor8Nearest,
BudgetType::SharedColor8Glyphs,
@@ -285,7 +285,7 @@ impl BudgetType {
BudgetType::Standalone,
];
- pub const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
+ const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
profiler::ATLAS_COLOR8_LINEAR_PRESSURE,
profiler::ATLAS_COLOR8_NEAREST_PRESSURE,
profiler::ATLAS_COLOR8_GLYPHS_PRESSURE,
@@ -341,6 +341,11 @@ buildStdenv.mkDerivation {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1985509
./140-bindgen-string-view.patch
]
++ lib.optionals (lib.versionAtLeast version "140" && lib.versionOlder version "140.13") [
# https://github.com/mozilla/cbindgen/issues/1165
# https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
./153-cbindgen-0.29.4-compat.patch
]
++ extraPatches;
postPatch = ''