diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-09-02 16:45:00 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-09-02 22:11:46 -0700 |
| commit | f1555e2ca88d3c300e1c92cdc4cbc5bf84de86cd (patch) | |
| tree | d993d819f17a9d95b274015d504a073e7915e671 /src/comp/syntax | |
| parent | 6217ce958e4b1007ca9e49751dba1aa1b68fbe67 (diff) | |
| download | rust-f1555e2ca88d3c300e1c92cdc4cbc5bf84de86cd.tar.gz rust-f1555e2ca88d3c300e1c92cdc4cbc5bf84de86cd.zip | |
Rename ty_istr to ty_str. Issue #855
Diffstat (limited to 'src/comp/syntax')
| -rw-r--r-- | src/comp/syntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/print/pprust.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/visit.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs index 84d9c28cfe1..aecd78262ef 100644 --- a/src/comp/syntax/ast.rs +++ b/src/comp/syntax/ast.rs @@ -302,7 +302,7 @@ tag ty_ { ty_float; ty_machine(ty_mach); ty_char; - ty_istr; + ty_str; ty_box(mt); ty_vec(mt); ty_ptr(mt); diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index 1b5d5f38835..9e45df8d111 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -486,7 +486,7 @@ fn parse_ty(p: &parser, colons_before_params: bool) -> @ast::ty { } else if eat_word(p, "float") { t = ast::ty_float; } else if eat_word(p, "str") { - t = ast::ty_istr; + t = ast::ty_str; } else if eat_word(p, "char") { t = ast::ty_char; /* diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index 33704b0e07c..442756a790d 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -275,7 +275,7 @@ fn print_type(s: &ps, ty: &@ast::ty) { ast::ty_float. { word(s.s, "float"); } ast::ty_machine(tm) { word(s.s, ast_util::ty_mach_to_str(tm)); } ast::ty_char. { word(s.s, "char"); } - ast::ty_istr. { word(s.s, "str"); } + ast::ty_str. { word(s.s, "str"); } ast::ty_box(mt) { word(s.s, "@"); print_mt(s, mt); } ast::ty_vec(mt) { word(s.s, "["); diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs index 7cd281afdca..e075b1d821c 100644 --- a/src/comp/syntax/visit.rs +++ b/src/comp/syntax/visit.rs @@ -120,7 +120,7 @@ fn visit_ty<E>(t: &@ty, e: &E, v: &vt<E>) { ty_uint. {/* no-op */ } ty_machine(_) {/* no-op */ } ty_char. {/* no-op */ } - ty_istr. {/* no-op */ } + ty_str. {/* no-op */ } ty_box(mt) { v.visit_ty(mt.ty, e, v); } ty_vec(mt) { v.visit_ty(mt.ty, e, v); } ty_ptr(mt) { v.visit_ty(mt.ty, e, v); } |