Make a builder for item resolution options

We have a couple knobs to turn for item resolution, such as whether we keep
going through type references and type aliases. It makes sense to have a single,
easy place to configure these knobs.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 20151fe3..950de02a 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -2647,8 +2647,10 @@ impl TryToRustTy for TemplateInstantiation {
                 // This can happen if we generated an opaque type for a partial
                 // template specialization, and we've hit an instantiation of
                 // that partial specialization.
-                extra_assert!(ctx.resolve_type_through_type_refs(decl)
-                                  .is_opaque());
+                extra_assert!(decl.into_resolver()
+                                  .through_type_refs()
+                                  .resolve(ctx)
+                                  .is_opaque(ctx));
                 return Err(error::Error::InstantiationOfOpaqueType);
             }
         };