---

yaml
---
r: 83942
b: refs/heads/dist-snap
c: bbfef92
h: refs/heads/master
v: v3

Author: chris-morgan

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 8552a7477544b4bbf6ddd39e011a0e514cfd75d6
+refs/heads/dist-snap: bbfef92e3d2a5e325668e07137dc531aff35a323
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
+	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)):				\
 		$$(DRIVER_CRATE) 							\

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

@@ -8,6 +8,8 @@
 // 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/dist-snap/src/compiletest/compiletest.rs

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

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

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

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

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

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

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

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

@@ -8,6 +8,8 @@
 // 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;
@@ -20,10 +22,10 @@ use procsrv;
 use util;
 use util::logv;
 
-use std::io;
-use std::os;
-use std::uint;
-use std::vec;
+use core::io;
+use core::os;
+use core::uint;
+use core::vec;
 
 pub fn run(config: config, testfile: ~str) {
     if config.verbose {

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

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

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

@@ -8,6 +8,11 @@
 // 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/dist-snap/src/libextra/extra.rs

@@ -40,10 +40,8 @@ pub mod uv_ll;
 
 // General io and system-services modules
 
+#[path = "net/mod.rs"]
 pub mod net;
-pub mod net_ip;
-pub mod net_tcp;
-pub mod net_url;
 
 // libuv modules
 pub mod uv;

branches/dist-snap/src/libextra/net_ip.rs renamed to branches/dist-snap/src/libextra/net/ip.rs

@@ -22,20 +22,20 @@ use std::str;
 use iotask = uv::iotask::IoTask;
 use interact = uv::iotask::interact;
 
-use sockaddr_in = super::uv_ll::sockaddr_in;
-use sockaddr_in6 = super::uv_ll::sockaddr_in6;
-use addrinfo = super::uv_ll::addrinfo;
-use uv_getaddrinfo_t = super::uv_ll::uv_getaddrinfo_t;
-use uv_ip4_name = super::uv_ll::ip4_name;
-use uv_ip4_port = super::uv_ll::ip4_port;
-use uv_ip6_name = super::uv_ll::ip6_name;
-use uv_ip6_port = super::uv_ll::ip6_port;
-use uv_getaddrinfo = super::uv_ll::getaddrinfo;
-use uv_freeaddrinfo = super::uv_ll::freeaddrinfo;
-use create_uv_getaddrinfo_t = super::uv_ll::getaddrinfo_t;
-use set_data_for_req = super::uv_ll::set_data_for_req;
-use get_data_for_req = super::uv_ll::get_data_for_req;
-use ll = super::uv_ll;
+use sockaddr_in = super::super::uv_ll::sockaddr_in;
+use sockaddr_in6 = super::super::uv_ll::sockaddr_in6;
+use addrinfo = super::super::uv_ll::addrinfo;
+use uv_getaddrinfo_t = super::super::uv_ll::uv_getaddrinfo_t;
+use uv_ip4_name = super::super::uv_ll::ip4_name;
+use uv_ip4_port = super::super::uv_ll::ip4_port;
+use uv_ip6_name = super::super::uv_ll::ip6_name;
+use uv_ip6_port = super::super::uv_ll::ip6_port;
+use uv_getaddrinfo = super::super::uv_ll::getaddrinfo;
+use uv_freeaddrinfo = super::super::uv_ll::freeaddrinfo;
+use create_uv_getaddrinfo_t = super::super::uv_ll::getaddrinfo_t;
+use set_data_for_req = super::super::uv_ll::set_data_for_req;
+use get_data_for_req = super::super::uv_ll::get_data_for_req;
+use ll = super::super::uv_ll;
 
 /// An IP address
 pub enum IpAddr {
@@ -363,9 +363,9 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t,
 #[cfg(test)]
 mod test {
 
-    use net_ip::*;
-    use net_ip::v4;
-    use net_ip::v6;
+    use net::ip::*;
+    use net::ip::v4;
+    use net::ip::v6;
     use uv;
 
     use std::result;

branches/dist-snap/src/libextra/net.rs renamed to branches/dist-snap/src/libextra/net/mod.rs

@@ -13,13 +13,13 @@ Top-level module for network-related functionality.
 
 Basically, including this module gives you:
 
-* `net_tcp`
-* `net_ip`
-* `net_url`
+* `tcp`
+* `ip`
+* `url`
 
 See each of those three modules for documentation on what they do.
 */
 
-pub use tcp = net_tcp;
-pub use ip = net_ip;
-pub use url = net_url;
+pub mod tcp;
+pub mod ip;
+pub mod url;

branches/dist-snap/src/libextra/net_tcp.rs renamed to branches/dist-snap/src/libextra/net/tcp.rs

@@ -16,7 +16,7 @@
 
 use future;
 use future_spawn = future::spawn;
-use ip = net_ip;
+use ip = net::ip;
 use uv;
 use uv::iotask;
 use uv::iotask::IoTask;

branches/dist-snap/src/libextra/net_url.rs renamed to branches/dist-snap/src/libextra/net/url.rs

@@ -800,7 +800,7 @@ fn test_get_path() {
 #[cfg(test)]
 mod tests {
 
-    use net_url::*;
+    use net::url::*;
 
     use std::hashmap::HashMap;
 

branches/dist-snap/src/librustc/middle/privacy.rs

@@ -245,6 +245,14 @@ pub fn check_crate<'mm>(tcx: ty::ctxt,
                                  method_id: def_id,
                                  name: &ident) =
             |span, method_id, name| {
+        // If the method is a default method, we need to use the def_id of
+        // the default implementation.
+        // Having to do this this is really unfortunate.
+        let method_id = match tcx.provided_method_sources.find(&method_id) {
+            None => method_id,
+            Some(source) => source.method_id
+        };
+
         if method_id.crate == local_crate {
             let is_private = method_is_private(span, method_id.node);
             let container_id = local_method_container_id(span,

branches/dist-snap/src/librustc/middle/trans/meth.rs

@@ -641,16 +641,18 @@ pub fn vtable_id(ccx: @mut CrateContext,
               -> mono_id {
     match origin {
         &typeck::vtable_static(impl_id, ref substs, sub_vtables) => {
+            let psubsts = param_substs {
+                tys: copy *substs,
+                vtables: Some(sub_vtables),
+                self_ty: None,
+                self_vtable: None
+            };
+
             monomorphize::make_mono_id(
                 ccx,
                 impl_id,
-                *substs,
-                if sub_vtables.is_empty() {
-                    None
-                } else {
-                    Some(sub_vtables)
-                },
                 None,
+                &psubsts,
                 None)
         }