---

yaml
---
r: 50814
b: refs/heads/try
c: 9c4d804
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 9350d14ecb025f963198e9baa39679f808496785
+refs/heads/try: 9c4d804cfe421d9a48ba2f0c6d12b7c654e75964
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/comm.rs

@@ -110,7 +110,6 @@ pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
 // required.
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> Chan<T> {
     fn send(&self, x: T) { chan_send(self, x) }
     fn try_send(&self, x: T) -> bool { chan_try_send(self, x) }
@@ -150,7 +149,6 @@ fn chan_try_send<T:Owned>(self: &Chan<T>, x: T) -> bool {
 // Use an inherent impl so that imports are not required:
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> Port<T> {
     fn recv(&self) -> T { port_recv(self) }
     fn try_recv(&self) -> Option<T> { port_try_recv(self) }
@@ -228,7 +226,6 @@ pub fn PortSet<T: Owned>() -> PortSet<T>{
 // Use an inherent impl so that imports are not required:
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T:Owned> PortSet<T> {
     fn recv(&self) -> T { port_set_recv(self) }
     fn try_recv(&self) -> Option<T> { port_set_try_recv(self) }
@@ -304,7 +301,6 @@ pub type SharedChan<T> = unstable::Exclusive<Chan<T>>;
 
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> SharedChan<T> {
     fn send(&self, x: T) { shared_chan_send(self, x) }
     fn try_send(&self, x: T) -> bool { shared_chan_try_send(self, x) }

branches/try/src/libcore/io.rs

@@ -21,9 +21,7 @@ use libc;
 use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t};
 use libc::consts::os::posix88::*;
 use os;
-use cast;
-use path::Path;
-use ops::Drop;
+use prelude::*;
 use ptr;
 use result;
 use str;
@@ -77,7 +75,6 @@ pub trait Reader {
 
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 impl Reader for @Reader {
     fn read(&self, bytes: &mut [u8], len: uint) -> uint {
         self.read(bytes, len)
@@ -660,7 +657,6 @@ pub trait Writer {
 
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 impl Writer for @Writer {
     fn write(&self, v: &[const u8]) { self.write(v) }
     fn seek(&self, a: int, b: SeekStyle) { self.seek(a, b) }
@@ -990,7 +986,7 @@ pub trait WriterUtil {
 
 impl<T:Writer> WriterUtil for T {
     fn write_char(&self, ch: char) {
-        if ch as uint < 128u {
+        if (ch as uint) < 128u {
             self.write(&[ch as u8]);
         } else {
             self.write_str(str::from_char(ch));

branches/try/src/libcore/num/strconv.rs

@@ -165,7 +165,7 @@ pub pure fn to_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+NumStrConv+Copy+
                                   Div<T,T>+Neg<T>+Modulo<T,T>+Mul<T,T>>(
         num: &T, radix: uint, negative_zero: bool,
         sign: SignFormat, digits: SignificantDigits) -> (~[u8], bool) {
-    if radix as int <  2 {
+    if (radix as int) < 2 {
         fail!(fmt!("to_str_bytes_common: radix %? to low, \
                    must lie in the range [2, 36]", radix));
     } else if radix as int > 36 {
@@ -455,10 +455,10 @@ pub pure fn from_str_bytes_common<T:NumCast+Zero+One+Ord+Copy+Div<T,T>+
         _ if special && radix >= DIGIT_I_RADIX // first digit of 'inf'
           => fail!(fmt!("from_str_bytes_common: radix %? incompatible with \
                         special values 'inf' and 'NaN'", radix)),
-        _ if radix as int < 2
+        _ if (radix as int) < 2
           => fail!(fmt!("from_str_bytes_common: radix %? to low, \
                         must lie in the range [2, 36]", radix)),
-        _ if radix as int > 36
+        _ if (radix as int) > 36
           => fail!(fmt!("from_str_bytes_common: radix %? to high, \
                         must lie in the range [2, 36]", radix)),
         _ => ()

branches/try/src/libcore/prelude.rs

@@ -43,7 +43,6 @@ pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
 pub use vec::{CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{OwnedVector, OwnedCopyableVector};
-pub use io::{Reader, ReaderUtil, Writer, WriterUtil};
 
 /* Reexported runtime types */
 pub use comm::{stream, Port, Chan, GenericChan, GenericSmartChan, GenericPort, Peekable};

branches/try/src/libcore/repr.rs

@@ -242,7 +242,7 @@ pub impl ReprVisitor {
         let (sz, al) = unsafe { ((*inner).size, (*inner).align) };
         self.writer.write_char('[');
         let mut first = true;
-        while p as uint < end as uint {
+        while (p as uint) < (end as uint) {
             if first {
                 first = false;
             } else {

branches/try/src/libcore/unstable/extfmt.rs

@@ -536,7 +536,7 @@ pub mod rt {
         // displayed
         let mut unpadded = match cv.precision {
           CountImplied => s.to_owned(),
-          CountIs(max) => if max as uint < str::char_len(s) {
+          CountIs(max) => if (max as uint) < str::char_len(s) {
             str::substr(s, 0, max as uint)
           } else {
             s.to_owned()

branches/try/src/librustc/front/test.rs

@@ -369,7 +369,6 @@ fn mk_tests(cx: &TestCtxt) -> @ast::item {
 
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 fn mk_tests(cx: &TestCtxt) -> @ast::item {
 
     let ext_cx = cx.ext_cx;

branches/try/src/librustdoc/markdown_pass.rs

@@ -127,7 +127,7 @@ fn write_page(ctxt: &Ctxt, page: &doc::Page) {
         write_item_no_header(ctxt, doc);
       }
     }
-    ctxt.w.put_done();
+    ctxt.w.write_done();
 }
 
 #[test]
@@ -146,8 +146,8 @@ fn should_request_new_writer_for_each_page() {
 }
 
 fn write_title(ctxt: &Ctxt, page: doc::Page) {
-    ctxt.w.put_line(fmt!("%% %s", make_title(page)));
-    ctxt.w.put_line(~"");
+    ctxt.w.write_line(fmt!("%% %s", make_title(page)));
+    ctxt.w.write_line(~"");
 }
 
 fn make_title(page: doc::Page) -> ~str {
@@ -198,8 +198,8 @@ fn write_header(ctxt: &Ctxt, lvl: Hlvl, doc: doc::ItemTag) {
 
 fn write_header_(ctxt: &Ctxt, lvl: Hlvl, title: ~str) {
     let hashes = str::from_chars(vec::from_elem(lvl as uint, '#'));
-    ctxt.w.put_line(fmt!("%s %s", hashes, title));
-    ctxt.w.put_line(~"");
+    ctxt.w.write_line(fmt!("%s %s", hashes, title));
+    ctxt.w.write_line(~"");
 }
 
 pub fn header_kind(doc: doc::ItemTag) -> ~str {
@@ -332,8 +332,8 @@ fn write_desc(
 ) {
     match desc {
         Some(desc) => {
-            ctxt.w.put_line(desc);
-            ctxt.w.put_line(~"");
+            ctxt.w.write_line(desc);
+            ctxt.w.write_line(~"");
         }
         None => ()
     }
@@ -347,8 +347,8 @@ fn write_sections(ctxt: &Ctxt, sections: &[doc::Section]) {
 
 fn write_section(ctxt: &Ctxt, section: doc::Section) {
     write_header_(ctxt, H4, copy section.header);
-    ctxt.w.put_line(copy section.body);
-    ctxt.w.put_line(~"");
+    ctxt.w.write_line(copy section.body);
+    ctxt.w.write_line(~"");
 }
 
 #[test]
@@ -398,7 +398,7 @@ fn write_item_(ctxt: &Ctxt, doc: doc::ItemTag, write_header: bool) {
       doc::TraitTag(TraitDoc) => write_trait(ctxt, TraitDoc),
       doc::ImplTag(ImplDoc) => write_impl(ctxt, ImplDoc),
       doc::TyTag(TyDoc) => write_type(ctxt, TyDoc),
-      doc::StructTag(StructDoc) => put_struct(ctxt, StructDoc),
+      doc::StructTag(StructDoc) => write_struct(ctxt, StructDoc),
     }
 }
 
@@ -428,13 +428,13 @@ fn write_index(ctxt: &Ctxt, index: doc::Index) {
         let header = header_text_(entry.kind, entry.name);
         let id = copy entry.link;
         if entry.brief.is_some() {
-            ctxt.w.put_line(fmt!("* [%s](%s) - %s",
+            ctxt.w.write_line(fmt!("* [%s](%s) - %s",
                                    header, id, (&entry.brief).get()));
         } else {
-            ctxt.w.put_line(fmt!("* [%s](%s)", header, id));
+            ctxt.w.write_line(fmt!("* [%s](%s)", header, id));
         }
     }
-    ctxt.w.put_line(~"");
+    ctxt.w.write_line(~"");
 }
 
 #[test]
@@ -526,8 +526,8 @@ fn write_fnlike(
 fn write_sig(ctxt: &Ctxt, sig: Option<~str>) {
     match sig {
       Some(sig) => {
-        ctxt.w.put_line(code_block_indent(sig));
-        ctxt.w.put_line(~"");
+        ctxt.w.write_line(code_block_indent(sig));
+        ctxt.w.write_line(~"");
       }
       None => fail!(~"unimplemented")
     }
@@ -641,18 +641,18 @@ fn write_variants(
         write_variant(ctxt, copy *variant);
     }
 
-    ctxt.w.put_line(~"");
+    ctxt.w.write_line(~"");
 }
 
 fn write_variant(ctxt: &Ctxt, doc: doc::VariantDoc) {
     fail_unless!(doc.sig.is_some());
     let sig = (&doc.sig).get();
     match copy doc.desc {
       Some(desc) => {
-        ctxt.w.put_line(fmt!("* `%s` - %s", sig, desc));
+        ctxt.w.write_line(fmt!("* `%s` - %s", sig, desc));
       }
       None => {
-        ctxt.w.put_line(fmt!("* `%s`", sig));
+        ctxt.w.write_line(fmt!("* `%s`", sig));
       }
     }
 }
@@ -804,7 +804,7 @@ fn should_write_type_signature() {
     fail_unless!(str::contains(markdown, ~"\n\n    type t = int\n\n"));
 }
 
-fn put_struct(
+fn write_struct(
     ctxt: &Ctxt,
     doc: doc::StructDoc
 ) {
@@ -813,7 +813,7 @@ fn put_struct(
 }
 
 #[test]
-fn should_put_struct_header() {
+fn should_write_struct_header() {
     let markdown = test::render(~"struct S { field: () }");
     fail_unless!(str::contains(markdown, ~"## Struct `S`\n\n"));
 }

branches/try/src/librustdoc/markdown_writer.rs

@@ -34,21 +34,21 @@ pub type Writer = ~fn(v: WriteInstr);
 pub type WriterFactory = ~fn(page: doc::Page) -> Writer;
 
 pub trait WriterUtils {
-    fn put_str(&self, +str: ~str);
-    fn put_line(&self, +str: ~str);
-    fn put_done(&self);
+    fn write_str(&self, +str: ~str);
+    fn write_line(&self, +str: ~str);
+    fn write_done(&self);
 }
 
 impl WriterUtils for Writer {
-    fn put_str(&self, str: ~str) {
+    fn write_str(&self, str: ~str) {
         (*self)(Write(str));
     }
 
-    fn put_line(&self, str: ~str) {
-        self.put_str(str + ~"\n");
+    fn write_line(&self, str: ~str) {
+        self.write_str(str + ~"\n");
     }
 
-    fn put_done(&self) {
+    fn write_done(&self) {
         (*self)(Done)
     }
 }

branches/try/src/libstd/comm.rs

@@ -28,7 +28,6 @@ pub struct DuplexStream<T, U> {
 // Allow these methods to be used without import:
 #[cfg(stage1)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T:Owned,U:Owned> DuplexStream<T, U> {
     fn send(&self, x: T) {
         self.chan.send(x)

branches/try/src/libstd/time.rs

@@ -819,8 +819,8 @@ priv fn do_strftime(format: &str, tm: &Tm) -> ~str {
           'M' => fmt!("%02d", tm.tm_min as int),
           'm' => fmt!("%02d", tm.tm_mon as int + 1),
           'n' => ~"\n",
-          'P' => if tm.tm_hour as int < 12 { ~"am" } else { ~"pm" },
-          'p' => if tm.tm_hour as int < 12 { ~"AM" } else { ~"PM" },
+          'P' => if (tm.tm_hour as int) < 12 { ~"am" } else { ~"pm" },
+          'p' => if (tm.tm_hour as int) < 12 { ~"AM" } else { ~"PM" },
           'R' => {
             fmt!("%s:%s",
                 parse_type('H', tm),

branches/try/src/libsyntax/parse/parser.rs

@@ -581,7 +581,9 @@ pub impl Parser {
         }
     }
 
-    fn parse_ty(&self, colons_before_params: bool) -> @Ty {
+    // Useless second parameter for compatibility with quasiquote macros.
+    // Bleh!
+    fn parse_ty(&self, _: bool) -> @Ty {
         maybe_whole!(self, nt_ty);
 
         let lo = self.span.lo;
@@ -661,7 +663,7 @@ pub impl Parser {
             result
         } else if *self.token == token::MOD_SEP
             || is_ident_or_path(&*self.token) {
-            let path = self.parse_path_with_tps(colons_before_params);
+            let path = self.parse_path_with_tps(false);
             ty_path(path, self.get_id())
         } else {
             self.fatal(~"expected type");

branches/try/src/libsyntax/print/pprust.rs

@@ -370,10 +370,6 @@ pub fn print_opt_lifetime(s: @ps, lifetime: Option<@ast::Lifetime>) {
 }
 
 pub fn print_type(s: @ps, &&ty: @ast::Ty) {
-    print_type_ex(s, ty, false);
-}
-
-pub fn print_type_ex(s: @ps, &&ty: @ast::Ty, print_colons: bool) {
     maybe_print_comment(s, ty.span.lo);
     ibox(s, 0u);
     match ty.node {
@@ -415,7 +411,7 @@ pub fn print_type_ex(s: @ps, &&ty: @ast::Ty, print_colons: bool) {
                       f.purity, f.onceness, &f.decl, None,
                       None, None);
       }
-      ast::ty_path(path, _) => print_path(s, path, print_colons),
+      ast::ty_path(path, _) => print_path(s, path, false),
       ast::ty_fixed_length_vec(ref mt, v) => {
         word(s.s, ~"[");
         match mt.mutbl {
@@ -1211,7 +1207,7 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) {
         print_expr(s, expr);
         space(s.s);
         word_space(s, ~"as");
-        print_type_ex(s, ty, true);
+        print_type(s, ty);
       }
       ast::expr_if(test, ref blk, elseopt) => {
         print_if(s, test, blk, elseopt, false);