Resolve now-ambiguous trait bounds.

rust-lang/rust#73905 introduced changes to typechecking that made previously accepted trait bounds where a trait was automatically chosen now ambiguous. Resolves #210. See rust-lang/rust#77638 (comment) for additional discussion.
iliekturtles · Oct 16, 2020 · 62f07bf · 62f07bf
1 parent 1a3386a
commit 62f07bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/si/mod.rs b/src/si/mod.rs
@@ -203,6 +203,13 @@ pub mod marker {
                     V,
                 >
             where
+                L: crate::typenum::Integer,
+                M: crate::typenum::Integer,
+                T: crate::typenum::Integer,
+                I: crate::typenum::Integer,
+                Th: crate::typenum::Integer,
+                N: crate::typenum::Integer,
+                J: crate::typenum::Integer,
                 Ul: Units<V> + ?Sized,
                 Ur: Units<V> + ?Sized,
                 V: crate::num_traits::Num + crate::Conversion<V>,

diff --git a/src/system.rs b/src/system.rs
@@ -443,7 +443,8 @@ macro_rules! system {
                     for Quantity<Dl, Ul, V>
                 where
                     Dl: Dimension + ?Sized,
-                    $(Dl::$symbol: $crate::lib::ops::$AddSubTrait<Dr::$symbol>,)+
+                    $(Dl::$symbol: $crate::lib::ops::$AddSubTrait<Dr::$symbol>,
+                    <Dl::$symbol as $crate::lib::ops::$AddSubTrait<Dr::$symbol>>::Output: $crate::typenum::Integer,)+
                     Dl::Kind: $crate::marker::$MulDivTrait,
                     Dr: Dimension + ?Sized,
                     Dr::Kind: $crate::marker::$MulDivTrait,
@@ -534,7 +535,8 @@ macro_rules! system {
                             D: Dimension + ?Sized,
                             D::Kind: $crate::marker::$MulDivTrait,
                             U: Units<V> + ?Sized,
-                            $($crate::typenum::Z0: $crate::lib::ops::$AddSubTrait<D::$symbol>,)+
+                            $($crate::typenum::Z0: $crate::lib::ops::$AddSubTrait<D::$symbol>,
+                            <$crate::typenum::Z0 as $crate::lib::ops::$AddSubTrait<D::$symbol>>::Output: $crate::typenum::Integer,)+
                         {
                             type Output = Quantity<
                                 $quantities<
@@ -647,7 +649,8 @@ macro_rules! system {
                 $quantities<$($crate::typenum::PartialQuot<D::$symbol, $crate::typenum::P3>),+>,
                 U, V>
             where
-                $(D::$symbol: $crate::lib::ops::PartialDiv<$crate::typenum::P3>,)+
+                $(D::$symbol: $crate::lib::ops::PartialDiv<$crate::typenum::P3>,
+                <D::$symbol as $crate::lib::ops::PartialDiv<$crate::typenum::P3>>::Output: $crate::typenum::Integer,)+
                 D::Kind: $crate::marker::Div,
                 V: $crate::num::Float,
             {
@@ -757,7 +760,8 @@ macro_rules! system {
                 b: Quantity<$quantities<$($crate::typenum::Sum<D::$symbol, Da::$symbol>),+>, Ub, V>,
             ) -> Quantity<$quantities<$($crate::typenum::Sum<D::$symbol, Da::$symbol>),+>, U, V>
             where
-                $(D::$symbol: $crate::lib::ops::Add<Da::$symbol>,)+
+                $(D::$symbol: $crate::lib::ops::Add<Da::$symbol>,
+                <D::$symbol as $crate::lib::ops::Add<Da::$symbol>>::Output: $crate::typenum::Integer,)+
                 D::Kind: $crate::marker::Mul,
                 V: $crate::num::Float,
                 Da: Dimension + ?Sized,
@@ -786,7 +790,8 @@ macro_rules! system {
                 self
             ) -> Quantity<$quantities<$($crate::typenum::Negate<D::$symbol>),+>, U, V>
             where
-                $(D::$symbol: $crate::lib::ops::Neg,)+
+                $(D::$symbol: $crate::lib::ops::Neg,
+                <D::$symbol as $crate::lib::ops::Neg>::Output: $crate::typenum::Integer,)+
                 D::Kind: $crate::marker::Div,
                 V: $crate::num::Float,
             {
@@ -814,7 +819,8 @@ macro_rules! system {
                 self, _e: E
             ) -> Quantity<$quantities<$($crate::typenum::Prod<D::$symbol, E>),+>, U, V>
             where
-                $(D::$symbol: $crate::lib::ops::Mul<E>,)+
+                $(D::$symbol: $crate::lib::ops::Mul<E>,
+                <D::$symbol as $crate::lib::ops::Mul<E>>::Output: $crate::typenum::Integer,)+
                 D::Kind: $crate::marker::Mul,
                 E: $crate::typenum::Integer,
                 V: $crate::num::Float,
@@ -852,7 +858,8 @@ macro_rules! system {
                 $quantities<$($crate::typenum::PartialQuot<D::$symbol, $crate::typenum::P2>),+>,
                 U, V>
             where
-                $(D::$symbol: $crate::typenum::PartialDiv<$crate::typenum::P2>,)+
+                $(D::$symbol: $crate::typenum::PartialDiv<$crate::typenum::P2>,
+                <D::$symbol as $crate::typenum::PartialDiv<$crate::typenum::P2>>::Output: $crate::typenum::Integer,)+
                 D::Kind: $crate::marker::Div,
                 V: $crate::num::Float,
             {