---

yaml
---
r: 68567
b: refs/heads/auto
c: 8aa26ad
h: refs/heads/master
i:
  68565: a9a72b7
  68563: c27fbc1
  68559: ee4c5ff
v: v3

Author: sanxiyn

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5183a6cc6c5bcd263ed7a31650351fc64b4412f4
+refs/heads/auto: 8aa26ad4547007996e1c3c0f1aa941ea8689b5a6
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/Makefile.in

@@ -139,7 +139,7 @@ endif
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.7
+CFG_RELEASE = 0.7-pre
 CFG_VERSION = $(CFG_RELEASE)
 # windows exe's need numeric versions - don't use anything but
 # numbers and dots here

branches/auto/RELEASES.txt

@@ -1,56 +1,54 @@
 Version 0.7 (July 2013)
 -----------------------
 
-   * ~2000 changes, numerous bugfixes
+   * ??? changes, numerous bugfixes
 
-   * Language
+   * Syntax changes
       * `impl`s no longer accept a visibility qualifier. Put them on methods
         instead.
+      * `use mod` is no longer valid.
+      * `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
+        argument list.
+      * `Encodable`, `Decodable`, `Ord`, `TotalOrd`, `TotalEq`, `DeepClone`,
+        `Rand`, `Zero` and `ToStr` can all be automatically derived with
+        `#[deriving(...)]`.
+      * The `Durable` trait is replaced with the `'static` bounds.
+      * At long last, 'argument modes' no longer exist.
+      * The `bytes!` macro returns a vector of bytes for string, u8, char,
+        and unsuffixed integer literals.
+      * `#[static_assert]` makes compile-time assertions about static bools.
+
+   * Semantic changes
       * The borrow checker has been rewritten with flow-sensitivity, fixing
         many bugs and inconveniences.
       * The `self` parameter no longer implicitly means `&'self self`,
         and can be explicitly marked with a lifetime.
-      * Overloadable compound operators (`+=`, etc.) have been temporarily
-        removed due to bugs.
+      * Structs with the `#[packed]` attribute have byte alignment and
+        no padding between fields.
       * The `for` loop protocol now requires `for`-iterators to return `bool`
         so they compose better.
-      * The `Durable` trait is replaced with the `'static` bounds.
       * Trait default methods work more often.
-      * Structs with the `#[packed]` attribute have byte alignment and
-        no padding between fields.
       * Type parameters bound by `Copy` must now be copied explicitly with
         the `copy` keyword.
       * It is now illegal to move out of a dereferenced unsafe pointer.
       * `Option<~T>` is now represented as a nullable pointer.
       * `@mut` does dynamic borrow checks correctly.
+      * Macros TODO
       * The `main` function is only detected at the topmost level of the crate.
         The `#[main]` attribute is still valid anywhere.
       * Struct fields may no longer be mutable. Use inherited mutability.
-      * The `#[no_send]` attribute makes a type that would otherwise be
-        `Send`, not.
-      * The `#[no_freeze]` attribute makes a type that would otherwise be
-        `Freeze`, not.
+      * The `#[non_owned]` attribute makes a type that would otherwise be
+        `Owned`, not. TODO this may change to non_send before 0.7
+      * The `#[mutable]` attribute makes a type that would otherwise be
+        `Const`, note. TODO this may change to non_freeze before 0.7
       * Unbounded recursion will abort the process after reaching the limit
         specified by the `RUST_MAX_STACK` environment variable (default: 1GB).
       * The `vecs_implicitly_copyable` lint mode has been removed. Vectors
         are never implicitly copyable.
-      * `#[static_assert]` makes compile-time assertions about static bools.
-      * At long last, 'argument modes' no longer exist.
-      * The rarely used `use mod` statement no longer exists.
-
-   * Syntax extensions
-      * `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
-        argument list.
-      * `Encodable`, `Decodable`, `Ord`, `TotalOrd`, `TotalEq`, `DeepClone`,
-        `Rand`, `Zero` and `ToStr` can all be automatically derived with
-        `#[deriving(...)]`.
-      * The `bytes!` macro returns a vector of bytes for string, u8, char,
-        and unsuffixed integer literals.
 
    * Libraries
       * The `core` crate was renamed to `std`.
       * The `std` crate was renamed to `extra`.
-      * More and improved documentation.
       * std: `iterator` module for external iterator objects.
       * Many old-style (internal, higher-order function) iterators replaced by
         implementations of `Iterator`.
@@ -93,16 +91,8 @@ Version 0.7 (July 2013)
       * extra: Implementation of fixed output size variations of SHA-2.
 
    * Tooling
-      * `unused_variable`  lint mode for unused variables (default: warn).
-      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks
-        (default: warn).
-      * `unused_mut` lint mode for identifying unused `mut` qualifiers
-        (default: warn).
-      * `dead_assignment` lint mode for unread variables (default: warn).
-      * `unnecessary_allocation` lint mode detects some heap allocations that are
-        immediately borrowed so could be written without allocating (default: warn).
-      * `missing_doc` lint mode (default: allow).
-      * `unreachable_code` lint mode (default: warn).
+      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.
+      * `unused_mut` lint mode for identifying unused `mut` qualifiers.
       * The `rusti` command has been rewritten and a number of bugs addressed.
       * rustc outputs in color on more terminals.
       * rustc accepts a `--link-args` flag to pass arguments to the linker.
@@ -111,7 +101,12 @@ Version 0.7 (July 2013)
         dynamic borrowcheck failures for debugging.
       * rustdoc has a nicer stylesheet.
       * Various improvements to rustdoc.
-      * Improvements to rustpkg (see the detailed release notes).
+      * Improvements to rustpkg (see the detailed release notes)
+
+   * Other
+      * More and improved library documentation.
+      * Various improvements on ARM and Android.
+      * Various improvements to MIPS backend.
 
 Version 0.6 (April 2013)
 ------------------------

branches/auto/src/compiletest/compiletest.rs

@@ -15,8 +15,8 @@
 #[no_core]; // XXX: Remove after snapshot
 #[no_std];
 
-extern mod core(name = "std", vers = "0.7");
-extern mod extra(name = "extra", vers = "0.7");
+extern mod core(name = "std", vers = "0.7-pre");
+extern mod extra(name = "extra", vers = "0.7-pre");
 
 use core::prelude::*;
 use core::*;

branches/auto/src/driver/driver.rs

@@ -11,7 +11,7 @@
 #[no_core];
 #[no_std];
 
-extern mod core(name = "std", vers = "0.7");
+extern mod core(name = "std", vers = "0.7-pre");
 
 #[cfg(rustpkg)]
 extern mod this(name = "rustpkg");

branches/auto/src/etc/kate/rust.xml

@@ -7,7 +7,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="0.7" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.7-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/auto/src/libextra/extra.rs

@@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
 */
 
 #[link(name = "extra",
-       vers = "0.7",
+       vers = "0.7-pre",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 

branches/auto/src/librust/rust.rs

@@ -13,7 +13,7 @@
 // FIXME #2238 Make run only accept source that emits an executable
 
 #[link(name = "rust",
-       vers = "0.7",
+       vers = "0.7-pre",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 

branches/auto/src/librustc/front/std_inject.rs

@@ -18,7 +18,7 @@ use syntax::codemap::dummy_sp;
 use syntax::codemap;
 use syntax::fold;
 
-static STD_VERSION: &'static str = "0.7";
+static STD_VERSION: &'static str = "0.7-pre";
 
 pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::crate)
                                -> @ast::crate {

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

@@ -271,7 +271,7 @@ mod __test {
 */
 
 fn mk_std(cx: &TestCtxt) -> @ast::view_item {
-    let vers = ast::lit_str(@"0.7");
+    let vers = ast::lit_str(@"0.7-pre");
     let vers = nospan(vers);
     let mi = ast::meta_name_value(@"vers", vers);
     let mi = nospan(mi);

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

@@ -996,13 +996,13 @@ pub fn do_spill_noroot(cx: block, v: ValueRef) -> ValueRef {
 
 pub fn spill_if_immediate(cx: block, v: ValueRef, t: ty::t) -> ValueRef {
     let _icx = push_ctxt("spill_if_immediate");
-    if ty::type_is_immediate(t) { return do_spill(cx, v, t); }
+    if ty::type_is_immediate(cx.tcx(), t) { return do_spill(cx, v, t); }
     return v;
 }
 
 pub fn load_if_immediate(cx: block, v: ValueRef, t: ty::t) -> ValueRef {
     let _icx = push_ctxt("load_if_immediate");
-    if ty::type_is_immediate(t) { return Load(cx, v); }
+    if ty::type_is_immediate(cx.tcx(), t) { return Load(cx, v); }
     return v;
 }
 
@@ -1527,7 +1527,7 @@ pub fn mk_standard_basic_blocks(llfn: ValueRef) -> BasicBlocks {
 // slot where the return value of the function must go.
 pub fn make_return_pointer(fcx: fn_ctxt, output_type: ty::t) -> ValueRef {
     unsafe {
-        if !ty::type_is_immediate(output_type) {
+        if !ty::type_is_immediate(fcx.ccx.tcx, output_type) {
             llvm::LLVMGetParam(fcx.llfn, 0)
         } else {
             let lloutputtype = type_of::type_of(fcx.ccx, output_type);
@@ -1566,7 +1566,7 @@ pub fn new_fn_ctxt_w_id(ccx: @mut CrateContext,
             ty::subst_tps(ccx.tcx, substs.tys, substs.self_ty, output_type)
         }
     };
-    let is_immediate = ty::type_is_immediate(substd_output_type);
+    let is_immediate = ty::type_is_immediate(ccx.tcx, substd_output_type);
     let fcx = @mut fn_ctxt_ {
           llfn: llfndecl,
           llenv: unsafe {
@@ -1672,7 +1672,7 @@ pub fn copy_args_to_allocas(fcx: fn_ctxt,
     match fcx.llself {
         Some(slf) => {
             let self_val = if slf.is_copy
-                    && datum::appropriate_mode(slf.t).is_by_value() {
+                    && datum::appropriate_mode(bcx.tcx(), slf.t).is_by_value() {
                 let tmp = BitCast(bcx, slf.v, type_of(bcx.ccx(), slf.t));
                 let alloc = alloc_ty(bcx, slf.t);
                 Store(bcx, tmp, alloc);
@@ -1700,7 +1700,7 @@ pub fn copy_args_to_allocas(fcx: fn_ctxt,
         // This alloca should be optimized away by LLVM's mem-to-reg pass in
         // the event it's not truly needed.
         // only by value if immediate:
-        let llarg = if datum::appropriate_mode(arg_ty).is_by_value() {
+        let llarg = if datum::appropriate_mode(bcx.tcx(), arg_ty).is_by_value() {
             let alloc = alloc_ty(bcx, arg_ty);
             Store(bcx, raw_llarg, alloc);
             alloc
@@ -2883,10 +2883,6 @@ pub fn trans_crate(sess: session::Session,
                    reachable_map: @mut HashSet<ast::node_id>,
                    maps: astencode::Maps)
                    -> (ContextRef, ModuleRef, LinkMeta) {
-    // Before we touch LLVM, make sure that multithreading is enabled.
-    if unsafe { !llvm::LLVMRustStartMultithreading() } {
-        sess.bug("couldn't enable multi-threaded LLVM");
-    }
 
     let mut symbol_hasher = hash::default_state();
     let link_meta = link::build_link_meta(sess, crate, output, &mut symbol_hasher);
@@ -2901,6 +2897,12 @@ pub fn trans_crate(sess: session::Session,
     // 1. http://llvm.org/bugs/show_bug.cgi?id=11479
     let llmod_id = link_meta.name.to_owned() + ".rc";
 
+    // FIXME(#6511): get LLVM building with --enable-threads so this
+    //               function can be called
+    // if !llvm::LLVMRustStartMultithreading() {
+    //     sess.bug("couldn't enable multi-threaded LLVM");
+    // }
+
     let ccx = @mut CrateContext::new(sess,
                                      llmod_id,
                                      tcx,

branches/auto/src/librustc/middle/trans/callee.rs

@@ -633,7 +633,7 @@ pub fn trans_call_inner(in_cx: block,
 
         let mut llargs = ~[];
 
-        if !ty::type_is_immediate(ret_ty) {
+        if !ty::type_is_immediate(bcx.tcx(), ret_ty) {
             llargs.push(llretslot);
         }
 
@@ -680,7 +680,7 @@ pub fn trans_call_inner(in_cx: block,
                             // case to ignore instead of invoking the Store
                             // below into a scratch pointer of a mismatched
                             // type.
-                        } else if ty::type_is_immediate(ret_ty) {
+                        } else if ty::type_is_immediate(bcx.tcx(), ret_ty) {
                             let llscratchptr = alloc_ty(bcx, ret_ty);
                             Store(bcx, llresult, llscratchptr);
                             bcx = glue::drop_ty(bcx, llscratchptr, ret_ty);
@@ -694,7 +694,7 @@ pub fn trans_call_inner(in_cx: block,
                 // If this is an immediate, store into the result location.
                 // (If this was not an immediate, the result will already be
                 // directly written into the output slot.)
-                if ty::type_is_immediate(ret_ty) {
+                if ty::type_is_immediate(bcx.tcx(), ret_ty) {
                     Store(bcx, llresult, lldest);
                 }
             }
@@ -898,7 +898,7 @@ pub fn trans_arg_expr(bcx: block,
                     }
                     ty::ByCopy => {
                         if ty::type_needs_drop(bcx.tcx(), arg_datum.ty) ||
-                                arg_datum.appropriate_mode().is_by_ref() {
+                                arg_datum.appropriate_mode(bcx.tcx()).is_by_ref() {
                             debug!("by copy arg with type %s, storing to scratch",
                                    bcx.ty_to_str(arg_datum.ty));
                             let scratch = scratch_datum(bcx, arg_datum.ty, false);
@@ -914,7 +914,7 @@ pub fn trans_arg_expr(bcx: block,
                             scratch.add_clean(bcx);
                             temp_cleanups.push(scratch.val);
 
-                            match scratch.appropriate_mode() {
+                            match scratch.appropriate_mode(bcx.tcx()) {
                                 ByValue => val = Load(bcx, scratch.val),
                                 ByRef(_) => val = scratch.val,
                             }