---

yaml
---
r: 145375
b: refs/heads/try2
c: a47cdc0
h: refs/heads/master
i:
  145373: 250278c
  145371: c5d4fc3
  145367: 7d1080a
  145359: 7f9cd7a
  145343: fab5c5c
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 97053995046636c0e11d23c4f0523d278a4210c9
+refs/heads/try2: a47cdc0f87162083a5ba22262826f90b05a1e096
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/RELEASES.txt

@@ -31,7 +31,6 @@ Version 0.8 (October 2013)
       * `ref` bindings in irrefutable patterns work correctly now.
       * `char` is now prevented from containing invalid code points.
       * Casting to `bool` is no longer allowed.
-      * `\0` is now accepted as an escape in chars and strings.
       * `yield` is a reserved keyword.
       * `typeof` is a reserved keyword.
       * Crates may be imported by URL with `extern mod foo = "url";`.
@@ -112,9 +111,6 @@ Version 0.8 (October 2013)
         the `MutableSet` and `MutableMap` traits. `Container::is_empty`,
         `Map::contains_key`, `MutableMap::insert`, and `MutableMap::remove` have
         default implementations.
-      * std: Various `from_str` functions were removed in favor of a generic
-        `from_str` which is available in the prelude.
-      * std: `util::unreachable` removed in favor of the `unreachable!` macro.
       * extra: `dlist`, the doubly-linked list was modernized.
       * extra: Added a `hex` module with `ToHex` and `FromHex` traits.
       * extra: Added `glob` module, replacing `std::os::glob`.
@@ -129,9 +125,6 @@ Version 0.8 (October 2013)
       * extra: `semver` updated to SemVer 2.0.0.
       * extra: `term` handles more terminals correctly.
       * extra: `dbg` module removed.
-      * extra: `par` module removed.
-      * extra: `future` was cleaned up, with some method renames.
-      * extra: Most free functions in `getopts` were converted to methods.
 
    * Other
       * rustc's debug info generation (`-Z debug-info`) is greatly improved.
@@ -212,7 +205,6 @@ Version 0.7 (July 2013)
       * std: Many old internal vector and string iterators,
         incl. `any`, `all`. removed.
       * std: The `finalize` method of `Drop` renamed to `drop`.
-      * std: The `drop` method now takes `&mut self` instead of `&self`.
       * std: The prelude no longer reexports any modules, only types and traits.
       * std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
         `Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.

branches/try2/src/librustc/middle/trans/base.rs

@@ -2416,6 +2416,11 @@ pub fn create_entry_wrapper(ccx: @mut CrateContext,
         unsafe {
             llvm::LLVMPositionBuilderAtEnd(bld, llbb);
 
+            let crate_map = ccx.crate_map;
+            let opaque_crate_map = do "crate_map".with_c_str |buf| {
+                llvm::LLVMBuildPointerCast(bld, crate_map, Type::i8p().to_ref(), buf)
+            };
+
             let (start_fn, args) = if use_start_lang_item {
                 let start_def_id = match ccx.tcx.lang_items.require(StartFnLangItem) {
                     Ok(id) => id,
@@ -2438,7 +2443,8 @@ pub fn create_entry_wrapper(ccx: @mut CrateContext,
                         C_null(Type::opaque_box(ccx).ptr_to()),
                         opaque_rust_main,
                         llvm::LLVMGetParam(llfn, 0),
-                        llvm::LLVMGetParam(llfn, 1)
+                        llvm::LLVMGetParam(llfn, 1),
+                        opaque_crate_map
                      ]
                 };
                 (start_fn, args)
@@ -2447,7 +2453,8 @@ pub fn create_entry_wrapper(ccx: @mut CrateContext,
                 let args = ~[
                     C_null(Type::opaque_box(ccx).ptr_to()),
                     llvm::LLVMGetParam(llfn, 0 as c_uint),
-                    llvm::LLVMGetParam(llfn, 1 as c_uint)
+                    llvm::LLVMGetParam(llfn, 1 as c_uint),
+                    opaque_crate_map
                 ];
 
                 (rust_main, args)
@@ -2628,16 +2635,13 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef {
                         }
                         ast::foreign_item_static(*) => {
                             let ident = foreign::link_name(ccx, ni);
-                            unsafe {
-                                let g = do ident.with_c_str |buf| {
+                            let g = do ident.with_c_str |buf| {
+                                unsafe {
                                     let ty = type_of(ccx, ty);
                                     llvm::LLVMAddGlobal(ccx.llmod, ty.to_ref(), buf)
-                                };
-                                if attr::contains_name(ni.attrs, "weak_linkage") {
-                                    lib::llvm::SetLinkage(g, lib::llvm::ExternalWeakLinkage);
                                 }
-                                g
-                            }
+                            };
+                            g
                         }
                     }
                 }
@@ -2955,14 +2959,7 @@ pub fn decl_crate_map(sess: session::Session, mapmeta: LinkMeta,
             llvm::LLVMAddGlobal(llmod, maptype.to_ref(), buf)
         }
     };
-    // On windows we'd like to export the toplevel cratemap
-    // such that we can find it from libstd.
-    if targ_cfg.os == session::OsWin32 && "toplevel" == mapname {
-        lib::llvm::SetLinkage(map, lib::llvm::DLLExportLinkage);
-    } else {
-        lib::llvm::SetLinkage(map, lib::llvm::ExternalLinkage);
-    }
-
+    lib::llvm::SetLinkage(map, lib::llvm::ExternalLinkage);
     return map;
 }
 
@@ -3117,26 +3114,6 @@ pub fn trans_crate(sess: session::Session,
 
     decl_gc_metadata(ccx, llmod_id);
     fill_crate_map(ccx, ccx.crate_map);
-
-    // NOTE win32: wart with exporting crate_map symbol
-    // We set the crate map (_rust_crate_map_toplevel) to use dll_export
-    // linkage but that ends up causing the linker to look for a
-    // __rust_crate_map_toplevel symbol (extra underscore) which it will
-    // subsequently fail to find. So to mitigate that we just introduce
-    // an alias from the symbol it expects to the one that actually exists.
-    if ccx.sess.targ_cfg.os == session::OsWin32 &&
-       !*ccx.sess.building_library {
-
-        let maptype = val_ty(ccx.crate_map).to_ref();
-
-        do "__rust_crate_map_toplevel".with_c_str |buf| {
-            unsafe {
-                llvm::LLVMAddAlias(ccx.llmod, maptype,
-                                   ccx.crate_map, buf);
-            }
-        }
-    }
-
     glue::emit_tydescs(ccx);
     write_abi_version(ccx);
     if ccx.sess.opts.debuginfo {

branches/try2/src/librustc/middle/typeck/mod.rs

@@ -402,7 +402,8 @@ fn check_start_fn_ty(ccx: &CrateCtxt,
                     bound_lifetime_names: opt_vec::Empty,
                     inputs: ~[
                         ty::mk_int(),
-                        ty::mk_imm_ptr(tcx, ty::mk_imm_ptr(tcx, ty::mk_u8()))
+                        ty::mk_imm_ptr(tcx, ty::mk_imm_ptr(tcx, ty::mk_u8())),
+                        ty::mk_imm_ptr(tcx, ty::mk_u8())
                     ],
                     output: ty::mk_int()
                 }

branches/try2/src/librustpkg/tests.rs

@@ -985,6 +985,7 @@ fn no_rebuilding_dep() {
 }
 
 #[test]
+#[ignore]
 fn do_rebuild_dep_dates_change() {
     let p_id = PkgId::new("foo");
     let dep_id = PkgId::new("bar");
@@ -1001,6 +1002,7 @@ fn do_rebuild_dep_dates_change() {
 }
 
 #[test]
+#[ignore]
 fn do_rebuild_dep_only_contents_change() {
     let p_id = PkgId::new("foo");
     let dep_id = PkgId::new("bar");

branches/try2/src/libstd/rt/crate_map.rs

@@ -16,21 +16,7 @@ use vec;
 use hashmap::HashSet;
 use container::MutableSet;
 
-// Need to tell the linker on OS X to not barf on undefined symbols
-// and instead look them up at runtime, which we need to resolve
-// the crate_map properly.
-#[cfg(target_os = "macos")]
-#[link_args = "-undefined dynamic_lookup"]
-extern {}
-
-#[cfg(not(stage0), not(windows))]
-extern {
-    #[weak_linkage]
-    #[link_name = "_rust_crate_map_toplevel"]
-    static CRATE_MAP: CrateMap;
-}
-
-pub struct ModEntry {
+pub struct ModEntry{
     name: *c_char,
     log_level: *mut u32
 }
@@ -48,30 +34,6 @@ struct CrateMap {
     children: [*CrateMap, ..1]
 }
 
-#[cfg(not(stage0), not(windows))]
-pub fn get_crate_map() -> *CrateMap {
-    &'static CRATE_MAP as *CrateMap
-}
-
-#[cfg(not(stage0), windows)]
-#[fixed_stack_segment]
-#[inline(never)]
-pub fn get_crate_map() -> *CrateMap {
-    use c_str::ToCStr;
-    use unstable::dynamic_lib::dl;
-
-    let sym = unsafe {
-        let module = dl::open_internal();
-        let sym = do "__rust_crate_map_toplevel".with_c_str |buf| {
-            dl::symbol(module, buf)
-        };
-        dl::close(module);
-        sym
-    };
-
-    sym as *CrateMap
-}
-
 unsafe fn version(crate_map: *CrateMap) -> i32 {
     match (*crate_map).version {
         1 => return 1,

branches/try2/src/libstd/rt/logging.rs

@@ -12,7 +12,6 @@ use libc::{uintptr_t, exit, STDERR_FILENO};
 use option::{Some, None, Option};
 use rt::util::dumb_println;
 use rt::crate_map::{ModEntry, iter_crate_map};
-#[cfg(not(stage0))] use rt::crate_map::get_crate_map;
 use str::StrSlice;
 use str::raw::from_c_str;
 use u32;
@@ -212,7 +211,6 @@ impl Logger for StdErrLogger {
 /// Configure logging by traversing the crate map and setting the
 /// per-module global logging flags based on the logging spec
 #[fixed_stack_segment] #[inline(never)]
-#[cfg(stage0)]
 pub fn init(crate_map: *u8) {
     use os;
 
@@ -226,22 +224,6 @@ pub fn init(crate_map: *u8) {
         }
     }
 }
-#[cfg(not(stage0))]
-pub fn init() {
-    use os;
-
-    let crate_map = get_crate_map() as *u8;
-
-    let log_spec = os::getenv("RUST_LOG");
-    match log_spec {
-        Some(spec) => {
-            update_log_settings(crate_map, spec);
-        }
-        None => {
-            update_log_settings(crate_map, ~"");
-        }
-    }
-}
 
 #[fixed_stack_segment] #[inline(never)]
 pub fn console_on() { unsafe { rust_log_console_on() } }

branches/try2/src/libstd/rt/mod.rs

@@ -172,11 +172,11 @@ pub mod borrowck;
 ///
 /// * `argc` & `argv` - The argument vector. On Unix this information is used
 ///   by os::args.
+/// * `crate_map` - Runtime information about the executing crate, mostly for logging
 ///
 /// # Return value
 ///
 /// The return value is used as the process return code. 0 on success, 101 on error.
-#[cfg(stage0)]
 pub fn start(argc: int, argv: **u8, crate_map: *u8, main: ~fn()) -> int {
 
     init(argc, argv, crate_map);
@@ -185,44 +185,25 @@ pub fn start(argc: int, argv: **u8, crate_map: *u8, main: ~fn()) -> int {
 
     return exit_code;
 }
-#[cfg(not(stage0))]
-pub fn start(argc: int, argv: **u8, main: ~fn()) -> int {
-
-    init(argc, argv);
-    let exit_code = run(main);
-    cleanup();
-
-    return exit_code;
-}
 
 /// Like `start` but creates an additional scheduler on the current thread,
 /// which in most cases will be the 'main' thread, and pins the main task to it.
 ///
 /// This is appropriate for running code that must execute on the main thread,
 /// such as the platform event loop and GUI.
-#[cfg(stage0)]
 pub fn start_on_main_thread(argc: int, argv: **u8, crate_map: *u8, main: ~fn()) -> int {
     init(argc, argv, crate_map);
     let exit_code = run_on_main_thread(main);
     cleanup();
 
     return exit_code;
 }
-#[cfg(not(stage0))]
-pub fn start_on_main_thread(argc: int, argv: **u8, main: ~fn()) -> int {
-    init(argc, argv);
-    let exit_code = run_on_main_thread(main);
-    cleanup();
-
-    return exit_code;
-}
 
 /// One-time runtime initialization.
 ///
 /// Initializes global state, including frobbing
 /// the crate's logging flags, registering GC
 /// metadata, and storing the process arguments.
-#[cfg(stage0)]
 pub fn init(argc: int, argv: **u8, crate_map: *u8) {
     // XXX: Derefing these pointers is not safe.
     // Need to propagate the unsafety to `start`.
@@ -232,16 +213,6 @@ pub fn init(argc: int, argv: **u8, crate_map: *u8) {
         logging::init(crate_map);
     }
 }
-#[cfg(not(stage0))]
-pub fn init(argc: int, argv: **u8) {
-    // XXX: Derefing these pointers is not safe.
-    // Need to propagate the unsafety to `start`.
-    unsafe {
-        args::init(argc, argv);
-        env::init();
-        logging::init();
-    }
-}
 
 /// One-time runtime cleanup.
 pub fn cleanup() {

branches/try2/src/libstd/unstable/dynamic_lib.rs

@@ -138,7 +138,7 @@ mod test {
 #[cfg(target_os = "android")]
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
-pub mod dl {
+mod dl {
     use c_str::ToCStr;
     use libc;
     use path;
@@ -207,7 +207,7 @@ pub mod dl {
 }
 
 #[cfg(target_os = "win32")]
-pub mod dl {
+mod dl {
     use os;
     use libc;
     use path;

branches/try2/src/libstd/unstable/lang.rs

@@ -93,7 +93,6 @@ pub unsafe fn check_not_borrowed(a: *u8,
     borrowck::check_not_borrowed(a, file, line)
 }
 
-#[cfg(stage0)]
 #[lang="start"]
 pub fn start(main: *u8, argc: int, argv: **c_char,
              crate_map: *u8) -> int {
@@ -106,16 +105,3 @@ pub fn start(main: *u8, argc: int, argv: **c_char,
         };
     }
 }
-
-#[cfg(not(stage0))]
-#[lang="start"]
-pub fn start(main: *u8, argc: int, argv: **c_char) -> int {
-    use rt;
-
-    unsafe {
-        return do rt::start(argc, argv as **u8) {
-            let main: extern "Rust" fn() = transmute(main);
-            main();
-        };
-    }
-}

branches/try2/src/test/run-pass/attr-start.rs

@@ -11,12 +11,6 @@
 //xfail-fast
 
 #[start]
-#[cfg(stage0)]
 fn start(_argc: int, _argv: **u8, _crate_map: *u8) -> int {
     return 0;
 }
-#[start]
-#[cfg(not(stage0))]
-fn start(_argc: int, _argv: **u8) -> int {
-    return 0;
-}