Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www/firefox-esr: Fix build with rust 1.70.0
Import an upstream patch to fix a build failure with rust 1.70.0. Obtained from: mozilla/mp4parse-rust#376 PR: 271797
- Loading branch information
1 parent
283822d
commit 0aa4d0d
Showing
1 changed file
with
33 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 | ||
|
||
From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001 | ||
From: Matthew Gregan <kinetik@flim.org> | ||
Date: Thu, 16 Jun 2022 13:54:02 +1200 | ||
Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully | ||
qualified path. | ||
|
||
--- | ||
mp4parse/src/lib.rs | 9 +++++++-- | ||
1 file changed, 7 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs | ||
index 567ee21d..4f3d7153 100644 | ||
--- third_party/rust/mp4parse/src/lib.rs | ||
+++ third_party/rust/mp4parse/src/lib.rs | ||
@@ -3506,8 +3506,13 @@ macro_rules! impl_mul { | ||
type Output = $output; | ||
|
||
fn mul(self, rhs: $rhs) -> Self::Output { | ||
- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); | ||
- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); | ||
+ static_assertions::const_assert!( | ||
+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 | ||
+ ); | ||
+ static_assertions::const_assert!( | ||
+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX | ||
+ <= <$output as UpperBounded>::MAX | ||
+ ); | ||
|
||
let lhs: $inner = self.get().into(); | ||
let rhs: $inner = rhs.get().into(); | ||
|