Get rid of structural records in libsyntax and the last bit in librustc.

1 files changed, 17 insertions, 10 deletions

diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index e27784d1f6b..152bd9b0ce4 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -44,7 +44,11 @@ impl cmp::Eq for cmnt_style {
     }
 }
 
-pub type cmnt = {style: cmnt_style, lines: ~[~str], pos: BytePos};
+pub struct cmnt {
+    style: cmnt_style,
+    lines: ~[~str],
+    pos: BytePos
+}
 
 pub fn is_doc_comment(s: &str) -> bool {
     (s.starts_with(~"///") && !is_line_non_doc_comment(s)) ||
@@ -147,7 +151,7 @@ fn consume_non_eol_whitespace(rdr: @mut StringReader) {
 fn push_blank_line_comment(rdr: @mut StringReader, comments: &mut ~[cmnt]) {
     debug!(">>> blank-line comment");
     let v: ~[~str] = ~[];
-    comments.push({style: blank_line, lines: v, pos: rdr.last_pos});
+    comments.push(cmnt {style: blank_line, lines: v, pos: rdr.last_pos});
 }
 
 fn consume_whitespace_counting_blank_lines(rdr: @mut StringReader,
@@ -166,7 +170,7 @@ fn read_shebang_comment(rdr: @mut StringReader, code_to_the_left: bool,
     debug!(">>> shebang comment");
     let p = rdr.last_pos;
     debug!("<<< shebang comment");
-    comments.push({
+    comments.push(cmnt {
         style: if code_to_the_left { trailing } else { isolated },
         lines: ~[read_one_line_comment(rdr)],
         pos: p
@@ -189,7 +193,7 @@ fn read_line_comments(rdr: @mut StringReader, code_to_the_left: bool,
     }
     debug!("<<< line comments");
     if !lines.is_empty() {
-        comments.push({
+        comments.push(cmnt {
             style: if code_to_the_left { trailing } else { isolated },
             lines: lines,
             pos: p
@@ -288,7 +292,7 @@ fn read_block_comment(rdr: @mut StringReader,
         style = mixed;
     }
     debug!("<<< block comment");
-    comments.push({style: style, lines: lines, pos: p});
+    comments.push(cmnt {style: style, lines: lines, pos: p});
 }
 
 fn peeking_at_comment(rdr: @mut StringReader) -> bool {
@@ -311,12 +315,14 @@ fn consume_comment(rdr: @mut StringReader,
     debug!("<<< consume comment");
 }
 
-pub type lit = {lit: ~str, pos: BytePos};
+pub struct lit {
+    lit: ~str,
+    pos: BytePos
+}
 
 pub fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
                                     path: ~str,
-                                    srdr: io::Reader) ->
-   {cmnts: ~[cmnt], lits: ~[lit]} {
+                                    srdr: io::Reader) -> (~[cmnt], ~[lit]) {
     let src = @str::from_bytes(srdr.read_whole_stream());
     let itr = parse::token::mk_fake_ident_interner();
     let cm = CodeMap::new();
@@ -350,12 +356,13 @@ pub fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
         let TokenAndSpan {tok: tok, sp: sp} = rdr.peek();
         if token::is_lit(tok) {
             let s = get_str_from(rdr, bstart);
-            literals.push({lit: s, pos: sp.lo});
+            literals.push(lit {lit: s, pos: sp.lo});
             log(debug, ~"tok lit: " + s);
         } else {
             log(debug, ~"tok: " + token::to_str(rdr.interner, tok));
         }
         first_read = false;
     }
-    return {cmnts: comments, lits: literals};
+
+    (comments, literals)
 }