Skip to content

Commit adb0baf

Browse files
committed
---
yaml --- r: 153458 b: refs/heads/try2 c: d2c38aa h: refs/heads/master v: v3
1 parent 0dece43 commit adb0baf

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 6867d91d20a77ad9be4288829cedec2a8c2b72ba
8+
refs/heads/try2: d2c38aa6eb8d1cb5306f259a946bc0c1261e4382
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/collect.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,16 +1018,17 @@ fn ty_generics(ccx: &CrateCtxt,
10181018
let mut result = base_generics;
10191019

10201020
for (i, l) in lifetimes.iter().enumerate() {
1021-
result.regions.push(space,
1022-
ty::RegionParameterDef { name: l.name,
1023-
space: space,
1024-
index: i,
1025-
def_id: local_def(l.id) });
1021+
let def = ty::RegionParameterDef { name: l.name,
1022+
space: space,
1023+
index: i,
1024+
def_id: local_def(l.id) };
1025+
debug!("ty_generics: def for region param: {}", def);
1026+
result.regions.push(space, def);
10261027
}
10271028

10281029
for (i, param) in types.iter().enumerate() {
10291030
let def = get_or_create_type_parameter_def(ccx, space, param, i);
1030-
debug!("def for param: {}", def.repr(ccx.tcx));
1031+
debug!("ty_generics: def for type param: {}", def.repr(ccx.tcx));
10311032
result.types.push(space, def);
10321033
}
10331034

0 commit comments

Comments
 (0)