File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
trunk/src/rustc/middle/typeck Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: bacf9e9887872a40d16798813aa66b6916cc6a4e
2
+ refs/heads/master: d513d9893ecd416943d96822f794c3212c8b60b8
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5
5
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ fn ast_path_to_ty<AC: ast_conv, RS: region_scope copy>(
134
134
path : @ast:: path ,
135
135
path_id : ast:: node_id ) -> ty_param_substs_and_ty {
136
136
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
138
138
// for any type/region parameters.
139
139
let tcx = self . tcx ( ) ;
140
140
let { substs: substs , ty: ty} =
@@ -216,7 +216,7 @@ fn ast_ty_to_ty<AC: ast_conv, RS: region_scope copy>(
216
216
some ( ty:: atttce_resolved ( ty) ) { ret ty; }
217
217
some ( ty:: atttce_unresolved) {
218
218
tcx. sess . span_fatal ( ast_ty. span , "illegal recursive type. \
219
- insert a enum in the cycle, \
219
+ insert an enum in the cycle, \
220
220
if this is desired)") ;
221
221
}
222
222
none { /* go on */ }
You can’t perform that action at this time.
0 commit comments