summaryrefslogtreecommitdiff
path: root/src/codegen/mod.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-20 01:26:56 -0700
committerGitHub <noreply@github.com>2017-06-20 01:26:56 -0700
commit521b7d11b0a814b9533a83e981f7a5d7fac63fbf (patch)
tree9b814322d5709888127e4d71ef579d5f9410d573 /src/codegen/mod.rs
parent27e2c108ef25f9a207f7f8b3cf2dff5ea7c4381f (diff)
parent88ea65696b6850460405357836ea6ab4a12a5f3f (diff)
Auto merge of #764 - fitzgen:as-named-to-as-template-param, r=emilio
Rename `AsNamed` to `AsTemplateParam` And also its trait methods `is_named` and `as_named` into `is_template_param` and `as_template_param` respectively. These new names better reflect what the trait is about. r? @emilio
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r--src/codegen/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index bd5b1f3b..4f0ea371 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -23,7 +23,7 @@ use ir::item_kind::ItemKind;
use ir::layout::Layout;
use ir::module::Module;
use ir::objc::{ObjCInterface, ObjCMethod};
-use ir::template::{AsNamed, TemplateInstantiation, TemplateParameters};
+use ir::template::{AsTemplateParam, TemplateInstantiation, TemplateParameters};
use ir::ty::{Type, TypeKind};
use ir::var::Var;
@@ -641,7 +641,7 @@ impl CodeGenerator for Type {
if let Some(ref params) = used_template_params {
for template_param in params {
if let Some(id) =
- template_param.as_named(ctx, &()) {
+ template_param.as_template_param(ctx, &()) {
let template_param = ctx.resolve_type(id);
if template_param.is_invalid_named_type() {
warn!("Item contained invalid template \
@@ -2729,7 +2729,7 @@ impl TryToRustTy for Type {
let template_params = item.used_template_params(ctx)
.unwrap_or(vec![])
.into_iter()
- .filter(|param| param.is_named(ctx, &()))
+ .filter(|param| param.is_template_param(ctx, &()))
.collect::<Vec<_>>();
let spelling = self.name().expect("Unnamed alias?");