Skip to content

Commit 563ab74

Browse files
committed
---
yaml --- r: 124156 b: refs/heads/auto c: d2c38aa h: refs/heads/master v: v3
1 parent 78a06c3 commit 563ab74

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6867d91d20a77ad9be4288829cedec2a8c2b72ba
16+
refs/heads/auto: d2c38aa6eb8d1cb5306f259a946bc0c1261e4382
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)