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.

Author: fitzgen

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;

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>> {

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>> {

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,15 +839,15 @@ impl TemplateDeclaration for ItemId {
     }
 }
 
-impl TemplateDeclaration for Item {
+impl TemplateParameters for Item {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {
         self.kind.self_template_params(ctx)
     }
 }
 
-impl TemplateDeclaration for ItemKind {
+impl TemplateParameters for ItemKind {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {

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;
 

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,15 +624,15 @@ 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>> {
         self.kind.self_template_params(ctx)
     }
 }
 
-impl TemplateDeclaration for TypeKind {
+impl TemplateParameters for TypeKind {
     fn self_template_params(&self,
                             ctx: &BindgenContext)
                             -> Option<Vec<ItemId>> {

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