Resolve a couple of unimplemented!()s

varkor · yodaldevoid · varkor · commit 5fc0395053c7 · 2019-05-06T14:58:21.000+01:00
Co-Authored-By: Gabriel Smith &lt;yodaldevoid@users.noreply.github.com&gt;
diff --git a/src/librustc/infer/canonical/query_response.rs b/src/librustc/infer/canonical/query_response.rs
@@ -318,8 +318,9 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
                     obligations.extend(ok.into_obligations());
                 }
 
-                (UnpackedKind::Const(..), UnpackedKind::Const(..)) => {
-                    unimplemented!() // FIXME(const_generics)
+                (UnpackedKind::Const(v1), UnpackedKind::Const(v2)) => {
+                    let ok = self.at(cause, param_env).eq(v1, v2)?;
+                    obligations.extend(ok.into_obligations());
                 }
 
                 _ => {
@@ -626,8 +627,9 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
                         obligations
                             .extend(self.at(cause, param_env).eq(v1, v2)?.into_obligations());
                     }
-                    (UnpackedKind::Const(..), UnpackedKind::Const(..)) => {
-                        unimplemented!() // FIXME(const_generics)
+                    (UnpackedKind::Const(v1), UnpackedKind::Const(v2)) => {
+                        let ok = self.at(cause, param_env).eq(v1, v2)?;
+                        obligations.extend(ok.into_obligations());
                     }
                     _ => {
                         bug!("kind mismatch, cannot unify {:?} and {:?}", value1, value2,);

Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,9 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {`
`318`	`318`	`obligations.extend(ok.into_obligations());`
`319`	`319`	`}`
`320`	`320`
`321`		`- (UnpackedKind::Const(..), UnpackedKind::Const(..)) => {`
`322`		`- unimplemented!() // FIXME(const_generics)`
	`321`	`+ (UnpackedKind::Const(v1), UnpackedKind::Const(v2)) => {`
	`322`	`+ let ok = self.at(cause, param_env).eq(v1, v2)?;`
	`323`	`+ obligations.extend(ok.into_obligations());`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`_ => {`
`@@ -626,8 +627,9 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {`
`626`	`627`	`obligations`
`627`	`628`	`.extend(self.at(cause, param_env).eq(v1, v2)?.into_obligations());`
`628`	`629`	`}`
`629`		`- (UnpackedKind::Const(..), UnpackedKind::Const(..)) => {`
`630`		`- unimplemented!() // FIXME(const_generics)`
	`630`	`+ (UnpackedKind::Const(v1), UnpackedKind::Const(v2)) => {`
	`631`	`+ let ok = self.at(cause, param_env).eq(v1, v2)?;`
	`632`	`+ obligations.extend(ok.into_obligations());`
`631`	`633`	`}`
`632`	`634`	`_ => {`
`633`	`635`	`bug!("kind mismatch, cannot unify {:?} and {:?}", value1, value2,);`