Rename the `TemplateDeclaration` trait to `TemplateParameters`

The trait is all about accessing template parameters, and is also implemented
for things that are not template declarations or definitions, but do end up
using template parameters one way or another. The new name makes more sense.

7 files changed, 15 insertions, 14 deletions

diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 950de02a..0785f2fd 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -22,7 +22,7 @@ use ir::layout::Layout;
 use ir::module::Module;
 use ir::objc::{ObjCInterface, ObjCMethod};
 use ir::template::{AsNamed, TemplateInstantiation};
-use ir::ty::{TemplateDeclaration, Type, TypeKind};
+use ir::ty::{TemplateParameters, Type, TypeKind};
 use ir::var::Var;
 
 use std::borrow::Cow;
diff --git a/src/ir/comp.rs b/src/ir/comp.rs
index 2c7b6de2..8a796e5e 100644
--- a/src/ir/comp.rs
+++ b/src/ir/comp.rs
@@ -6,7 +6,7 @@ use super::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault};
 use super::item::Item;
 use super::layout::Layout;
 use super::traversal::{EdgeKind, Trace, Tracer};
-use super::ty::TemplateDeclaration;
+use super::ty::TemplateParameters;
 use clang;
 use parse::{ClangItemParser, ParseError};
 use std::cell::Cell;
@@ -812,7 +812,7 @@ impl CompInfo {
     }
 }
 
-impl TemplateDeclaration for CompInfo {
+impl TemplateParameters for CompInfo {
     fn self_template_params(&self,
                             _ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
diff --git a/src/ir/context.rs b/src/ir/context.rs
index 01416c9e..6cf3cdcd 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -8,7 +8,7 @@ use super::module::{Module, ModuleKind};
 use super::named::{UsedTemplateParameters, analyze};
 use super::template::TemplateInstantiation;
 use super::traversal::{self, Edge, ItemTraversal};
-use super::ty::{FloatKind, TemplateDeclaration, Type, TypeKind};
+use super::ty::{FloatKind, TemplateParameters, Type, TypeKind};
 use BindgenOptions;
 use cexpr;
 use callbacks::ParseCallbacks;
@@ -1501,7 +1501,7 @@ impl PartialType {
     }
 }
 
-impl TemplateDeclaration for PartialType {
+impl TemplateParameters for PartialType {
     fn self_template_params(&self,
                             _ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
diff --git a/src/ir/item.rs b/src/ir/item.rs
index 5e806de9..5d95130f 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -10,7 +10,7 @@ use super::layout::Opaque;
 use super::module::Module;
 use super::template::AsNamed;
 use super::traversal::{EdgeKind, Trace, Tracer};
-use super::ty::{TemplateDeclaration, Type, TypeKind};
+use super::ty::{TemplateParameters, Type, TypeKind};
 use clang;
 use clang_sys;
 use parse::{ClangItemParser, ClangSubItemParser, ParseError, ParseResult};
@@ -830,7 +830,7 @@ impl DotAttributes for Item {
     }
 }
 
-impl TemplateDeclaration for ItemId {
+impl TemplateParameters for ItemId {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
@@ -839,7 +839,7 @@ impl TemplateDeclaration for ItemId {
     }
 }
 
-impl TemplateDeclaration for Item {
+impl TemplateParameters for Item {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
@@ -847,7 +847,7 @@ impl TemplateDeclaration for Item {
     }
 }
 
-impl TemplateDeclaration for ItemKind {
+impl TemplateParameters for ItemKind {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
diff --git a/src/ir/named.rs b/src/ir/named.rs
index 4ff9ed91..1493b170 100644
--- a/src/ir/named.rs
+++ b/src/ir/named.rs
@@ -130,7 +130,7 @@ use super::context::{BindgenContext, ItemId};
 use super::item::{Item, ItemSet};
 use super::template::{AsNamed, TemplateInstantiation};
 use super::traversal::{EdgeKind, Trace};
-use super::ty::{TemplateDeclaration, TypeKind};
+use super::ty::{TemplateParameters, TypeKind};
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index b47e2bb2..0b1cf558 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -84,7 +84,8 @@ use std::mem;
 /// ... |Wtf   | ... | Some([T])            |
 /// ... |Qux   | ... | None                 |
 /// ----+------+-----+----------------------+
-pub trait TemplateDeclaration {
+
+pub trait TemplateParameters {
     /// Get the set of `ItemId`s that make up this template declaration's free
     /// template parameters.
     ///
@@ -623,7 +624,7 @@ fn is_invalid_named_type_empty_name() {
 }
 
 
-impl TemplateDeclaration for Type {
+impl TemplateParameters for Type {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
@@ -631,7 +632,7 @@ impl TemplateDeclaration for Type {
     }
 }
 
-impl TemplateDeclaration for TypeKind {
+impl TemplateParameters for TypeKind {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
diff --git a/src/uses.rs b/src/uses.rs
index 0799011b..40344dd6 100644
--- a/src/uses.rs
+++ b/src/uses.rs
@@ -37,7 +37,7 @@
 
 use ir::context::BindgenContext;
 use ir::item::{Item, ItemAncestors, ItemCanonicalName};
-use ir::ty::TemplateDeclaration;
+use ir::ty::TemplateParameters;
 use std::io;
 
 // Like `canonical_path`, except we always take namespaces into account, ignore