Use path_for_whitelisting instead of canonical_path when matching for enum type specification and template opaque type specification

Author: johnmave126

src/ir/enum_ty.rs

@@ -6,7 +6,6 @@ use super::item::Item;
 use super::ty::{Type, TypeKind};
 use crate::clang;
 use crate::ir::annotations::Annotations;
-use crate::ir::item::ItemCanonicalPath;
 use crate::parse::{ClangItemParser, ParseError};
 use crate::regex_set::RegexSet;
 
@@ -153,7 +152,7 @@ impl Enum {
         enums: &RegexSet,
         item: &Item,
     ) -> bool {
-        let path = item.canonical_path(ctx);
+        let path = item.path_for_whitelisting(ctx);
         let enum_ty = item.expect_type();
 
         if enums.matches(&path[1..].join("::")) {

src/ir/template.rs

@@ -28,7 +28,7 @@
 //! ```
 
 use super::context::{BindgenContext, ItemId, TypeId};
-use super::item::{IsOpaque, Item, ItemAncestors, ItemCanonicalPath};
+use super::item::{IsOpaque, Item, ItemAncestors};
 use super::traversal::{EdgeKind, Trace, Tracer};
 use crate::clang;
 use crate::parse::ClangItemParser;
@@ -306,12 +306,13 @@ impl IsOpaque for TemplateInstantiation {
         // correct fix is to make `canonical_{name,path}` include template
         // arguments properly.
 
-        let mut path = item.canonical_path(ctx);
+        let mut path = item.path_for_whitelisting(ctx).clone();
         let args: Vec<_> = self
             .template_arguments()
             .iter()
             .map(|arg| {
-                let arg_path = arg.canonical_path(ctx);
+                let arg_path =
+                    ctx.resolve_item(*arg).path_for_whitelisting(ctx);
                 arg_path[1..].join("::")
             })
             .collect();