Skip to content

Commit 5901a54

Browse files
committed
---
yaml --- r: 13711 b: refs/heads/master c: d513d98 h: refs/heads/master i: 13709: 6f95be0 13707: 46c67c5 13703: 005dc5c 13695: 3054090 v: v3
1 parent 7dd24af commit 5901a54

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: bacf9e9887872a40d16798813aa66b6916cc6a4e
2+
refs/heads/master: d513d9893ecd416943d96822f794c3212c8b60b8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/typeck/astconv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ fn ast_path_to_ty<AC: ast_conv, RS: region_scope copy>(
134134
path: @ast::path,
135135
path_id: ast::node_id) -> ty_param_substs_and_ty {
136136

137-
// Lookup the polytype of the item and then substitute the provided types
137+
// Look up the polytype of the item and then substitute the provided types
138138
// for any type/region parameters.
139139
let tcx = self.tcx();
140140
let {substs: substs, ty: ty} =
@@ -216,7 +216,7 @@ fn ast_ty_to_ty<AC: ast_conv, RS: region_scope copy>(
216216
some(ty::atttce_resolved(ty)) { ret ty; }
217217
some(ty::atttce_unresolved) {
218218
tcx.sess.span_fatal(ast_ty.span, "illegal recursive type. \
219-
insert a enum in the cycle, \
219+
insert an enum in the cycle, \
220220
if this is desired)");
221221
}
222222
none { /* go on */ }

0 commit comments

Comments
 (0)