---

yaml
---
r: 64048
b: refs/heads/snap-stage3
c: 3e933b1
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 149c976aa0b6441b93f2e2140e10e0424d39ea17
+refs/heads/snap-stage3: 3e933b199c69e1b6c32ecb65bb8f06127cfb8312
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/tests.mk

@@ -15,7 +15,7 @@
 
 # The names of crates that must be tested
 TEST_TARGET_CRATES = std extra
-TEST_HOST_CRATES = syntax rustc rustdoc rusti rust rustpkg
+TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg
 TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
 
 # Markdown files under doc/ that should have their code extracted and run

branches/snap-stage3/mk/tools.mk

@@ -50,7 +50,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)):		\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4))	\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4))
 	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
+	$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)):				\
 		$$(DRIVER_CRATE) 							\

branches/snap-stage3/src/compiletest/common.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 #[deriving(Eq)]
 pub enum mode {
     mode_compile_fail,

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -11,21 +11,16 @@
 #[crate_type = "bin"];
 
 #[allow(non_camel_case_types)];
+#[allow(unrecognized_lint)]; // NOTE: remove after snapshot
+#[deny(warnings)];
 
-#[no_core]; // XXX: Remove after snapshot
-#[no_std];
+extern mod extra;
 
-extern mod core(name = "std", vers = "0.7");
-extern mod extra(name = "extra", vers = "0.7");
-
-use core::prelude::*;
-use core::*;
+use std::os;
 
 use extra::getopts;
 use extra::test;
 
-use core::result::{Ok, Err};
-
 use common::config;
 use common::mode_run_pass;
 use common::mode_run_fail;
@@ -42,13 +37,6 @@ pub mod runtest;
 pub mod common;
 pub mod errors;
 
-mod std {
-    pub use core::cmp;
-    pub use core::str;
-    pub use core::sys;
-    pub use core::unstable;
-}
-
 pub fn main() {
     let args = os::args();
     let config = parse_config(args);
@@ -98,8 +86,8 @@ pub fn parse_config(args: ~[~str]) -> config {
         run_ignored: getopts::opt_present(matches, "ignored"),
         filter:
              if !matches.free.is_empty() {
-                 option::Some(copy matches.free[0])
-             } else { option::None },
+                 Some(copy matches.free[0])
+             } else { None },
         logfile: getopts::opt_maybe_str(matches, "logfile").map(|s| Path(*s)),
         runtool: getopts::opt_maybe_str(matches, "runtool"),
         rustcflags: getopts::opt_maybe_str(matches, "rustcflags"),
@@ -148,8 +136,8 @@ pub fn log_config(config: &config) {
 
 pub fn opt_str<'a>(maybestr: &'a Option<~str>) -> &'a str {
     match *maybestr {
-        option::None => "(none)",
-        option::Some(ref s) => {
+        None => "(none)",
+        Some(ref s) => {
             let s: &'a str = *s;
             s
         }
@@ -161,7 +149,7 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
 }
 
 pub fn str_opt(maybestr: ~str) -> Option<~str> {
-    if maybestr != ~"(none)" { option::Some(maybestr) } else { option::None }
+    if maybestr != ~"(none)" { Some(maybestr) } else { None }
 }
 
 pub fn str_mode(s: ~str) -> mode {
@@ -199,8 +187,8 @@ pub fn test_opts(config: &config) -> test::TestOpts {
         logfile: copy config.logfile,
         run_tests: true,
         run_benchmarks: false,
-        save_results: option::None,
-        compare_results: option::None
+        save_results: None,
+        compare_results: None
     }
 }
 
@@ -268,7 +256,7 @@ pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
 }
 
 pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {
-    use core::cell::Cell;
+    use std::cell::Cell;
     let config = Cell::new(copy *config);
     let testfile = Cell::new(testfile.to_str());
     test::DynTestFn(|| { runtest::run(config.take(), testfile.take()) })

branches/snap-stage3/src/compiletest/errors.rs

@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
-use core::io;
+use std::io;
 
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 

branches/snap-stage3/src/compiletest/header.rs

@@ -8,13 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::config;
 use common;
 
-use core::io;
-use core::os;
+use std::io;
+use std::os;
 
 pub struct TestProps {
     // Lines that should be expected, in order, on standard out

branches/snap-stage3/src/compiletest/procsrv.rs

@@ -8,11 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
-use core::os;
-use core::run;
-use core::str;
+use std::os;
+use std::run;
+use std::str;
 
 #[cfg(target_os = "win32")]
 fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {

branches/snap-stage3/src/compiletest/runtest.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::mode_run_pass;
 use common::mode_run_fail;
 use common::mode_compile_fail;
@@ -22,10 +20,10 @@ use procsrv;
 use util;
 use util::logv;
 
-use core::io;
-use core::os;
-use core::uint;
-use core::vec;
+use std::io;
+use std::os;
+use std::uint;
+use std::vec;
 
 pub fn run(config: config, testfile: ~str) {
     if config.verbose {

branches/snap-stage3/src/compiletest/util.rs

@@ -8,12 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::config;
 
-use core::io;
-use core::os::getenv;
+use std::io;
+use std::os::getenv;
 
 pub fn make_new_path(path: &str) -> ~str {
 

branches/snap-stage3/src/driver/driver.rs

@@ -8,11 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_core];
-#[no_std];
-
-extern mod core(name = "std", vers = "0.7");
-
 #[cfg(rustpkg)]
 extern mod this(name = "rustpkg");
 

branches/snap-stage3/src/etc/vim/syntax/rust.vim

@@ -95,7 +95,7 @@ syn region    rustDeriving    start="deriving(" end=")" contains=rustTrait
 " Number literals
 syn match     rustNumber      display "\<[0-9][0-9_]*\>"
 syn match     rustNumber      display "\<[0-9][0-9_]*\(u\|u8\|u16\|u32\|u64\)\>"
-syn match     rustNumber      display "\<[0-9][0-9_]*\(i8\|i16\|i32\|i64\)\>"
+syn match     rustNumber      display "\<[0-9][0-9_]*\(i\|i8\|i16\|i32\|i64\)\>"
 
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\>"
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\(u\|u8\|u16\|u32\|u64\)\>"

branches/snap-stage3/src/libextra/json.rs

@@ -481,30 +481,22 @@ pub fn to_pretty_str(json: &Json) -> ~str {
     io::with_str_writer(|wr| to_pretty_writer(wr, json))
 }
 
-static BUF_SIZE : uint = 64000;
-
 #[allow(missing_doc)]
 pub struct Parser {
     priv rdr: @io::Reader,
-    priv buf: ~[char],
-    priv buf_idx: uint,
     priv ch: char,
     priv line: uint,
     priv col: uint,
 }
 
 /// Decode a json value from an io::reader
 pub fn Parser(rdr: @io::Reader) -> Parser {
-    let mut p = Parser {
+    Parser {
         rdr: rdr,
-        buf: rdr.read_chars(BUF_SIZE),
-        buf_idx: 0,
-        ch: 0 as char,
+        ch: rdr.read_char(),
         line: 1,
-        col: 0,
-    };
-    p.bump();
-    p
+        col: 1,
+    }
 }
 
 impl Parser {
@@ -529,26 +521,13 @@ impl Parser {
     fn eof(&self) -> bool { self.ch == -1 as char }
 
     fn bump(&mut self) {
-        if self.eof() {
-            return;
-        }
-
-        self.col += 1u;
-
-        if self.buf_idx >= self.buf.len() {
-            self.buf = self.rdr.read_chars(BUF_SIZE);
-            if self.buf.len() == 0 {
-                self.ch = -1 as char;
-                return;
-            }
-            self.buf_idx = 0;
-        }
-        self.ch = self.buf[self.buf_idx];
-        self.buf_idx += 1;
+        self.ch = self.rdr.read_char();
 
         if self.ch == '\n' {
             self.line += 1u;
             self.col = 1u;
+        } else {
+            self.col += 1u;
         }
     }
 

branches/snap-stage3/src/librustc/front/test.rs

@@ -17,7 +17,7 @@ use front::config;
 use std::vec;
 use syntax::ast_util::*;
 use syntax::attr;
-use syntax::codemap::{dummy_sp, span, ExpandedFrom, CallInfo, NameAndSpan};
+use syntax::codemap::{dummy_sp, span, ExpnInfo, NameAndSpan};
 use syntax::codemap;
 use syntax::ext::base::ExtCtxt;
 use syntax::fold;
@@ -72,13 +72,13 @@ fn generate_test_harness(sess: session::Session,
     };
 
     let ext_cx = cx.ext_cx;
-    ext_cx.bt_push(ExpandedFrom(CallInfo {
+    ext_cx.bt_push(ExpnInfo {
         call_site: dummy_sp(),
         callee: NameAndSpan {
             name: @"test",
             span: None
         }
-    }));
+    });
 
     let precursor = @fold::AstFoldFns {
         fold_crate: fold::wrap(|a,b| fold_crate(cx, a, b) ),

branches/snap-stage3/src/librustc/middle/lint.rs

@@ -966,10 +966,6 @@ fn lint_unused_mut() -> visit::vt<@mut Context> {
             visit_fn_decl(cx, &tm.decl);
             visit::visit_ty_method(tm, (cx, vt));
         },
-        visit_struct_method: |sm, (cx, vt)| {
-            visit_fn_decl(cx, &sm.decl);
-            visit::visit_struct_method(sm, (cx, vt));
-        },
         visit_trait_method: |tm, (cx, vt)| {
             match *tm {
                 ast::required(ref tm) => visit_fn_decl(cx, &tm.decl),
@@ -1049,14 +1045,6 @@ fn lint_missing_doc() -> visit::vt<@mut Context> {
     }
 
     visit::mk_vt(@visit::Visitor {
-        visit_struct_method: |m, (cx, vt)| {
-            if m.vis == ast::public {
-                check_attrs(cx, m.attrs, m.span,
-                            "missing documentation for a method");
-            }
-            visit::visit_struct_method(m, (cx, vt));
-        },
-
         visit_ty_method: |m, (cx, vt)| {
             // All ty_method objects are linted about because they're part of a
             // trait (no visibility)

branches/snap-stage3/src/librusti/rusti.rs

@@ -667,8 +667,10 @@ mod tests {
             fn f() {}
             f()
         ");
+    }
 
-        debug!("simultaneous definitions + expressions are allowed");
+    #[test]
+    fn simultaneous_definition_and_expression() {
         run_program("
             let a = 3; a as u8
         ");

branches/snap-stage3/src/librustpkg/api.rs

@@ -14,10 +14,8 @@ use package_id::*;
 use package_source::*;
 use version::Version;
 
-use std::option::*;
 use std::os;
 use std::hashmap::*;
-use std::path::*;
 
 /// Convenience functions intended for calling from pkg.rs
 

branches/snap-stage3/src/librustpkg/messages.rs

@@ -10,7 +10,6 @@
 
 use extra::term;
 use std::io;
-use std::result::*;
 
 pub fn note(msg: &str) {
     pretty_message(msg, "note: ", term::color::GREEN, io::stdout())

branches/snap-stage3/src/librustpkg/package_source.rs

@@ -11,7 +11,6 @@
 use target::*;
 use package_id::PkgId;
 use std::path::Path;
-use std::option::*;
 use std::{os, run, str};
 use context::*;
 use crate::Crate;