mirror of
https://git.freebsd.org/ports.git
synced 2025-06-15 01:30:33 -04:00
4bd3e53dbd
Import an upstream patch to fix a build failure with rust 1.70.0. Obtained from: https://github.com/mozilla/mp4parse-rust/pull/376 PR: 271797
33 lines
1.3 KiB
Text
33 lines
1.3 KiB
Text
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();
|
|
|