summaryrefslogtreecommitdiff
path: root/src/codegen/mod.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-07-21 02:36:08 -0700
committerGitHub <noreply@github.com>2017-07-21 02:36:08 -0700
commitb51ddf36c187b9aff8e3c4af54d450bd989f598b (patch)
tree9860e0f0b2d6b47945973b4ffe6a1d5772680ed8 /src/codegen/mod.rs
parent680094a8697547c80cbe4b036bd9b77b039c116f (diff)
parent3dedc2c8c87a8ea61eeed54c19c105cd73bb5490 (diff)
Auto merge of #829 - servo:disambig, r=emilio
Use fully disambiguated name instead of a number for layout tests (fixes #394) These numbers cause tons of churn in the diffs for checked in bindings. r? @fitzgen
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r--src/codegen/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index c5c8ebee..0076f1df 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -772,7 +772,7 @@ impl CodeGenerator for TemplateInstantiation {
let size = layout.size;
let align = layout.align;
- let name = item.canonical_name(ctx);
+ let name = item.full_disambiguated_name(ctx);
let mut fn_name = format!("__bindgen_test_layout_{}_instantiation", name);
let times_seen = result.overload_number(&fn_name);
if times_seen > 0 {