---

yaml
---
r: 56771
b: refs/heads/try
c: 7ebe577
h: refs/heads/master
i:
  56769: 801e378
  56767: 245e3d3
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: 1edfed7914f458172f182c13a2451a0120334092
+refs/heads/try: 7ebe5779b6965dc06e1204fe7eb2676792c8cb22
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/configure

@@ -533,7 +533,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-	(3.2svn|3.2|3.1svn|3.1|3.0svn|3.0)
+	(3.3|3.3svn|3.2|3.2svn)
 	    msg "found ok version of LLVM: $LLVM_VERSION"
 	    ;;
 	(*)

branches/try/src/compiletest/compiletest.rc

@@ -17,8 +17,8 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
+extern mod core(vers = "0.7-rc");
+extern mod std(vers = "0.7-rc");
 
 use core::*;
 

branches/try/src/driver/driver.rs

@@ -9,24 +9,24 @@
 // except according to those terms.
 
 #[no_core];
-extern mod core(vers = "0.6");
+extern mod core(vers = "0.7-rc");
 
 #[cfg(rustpkg)]
-extern mod this(name = "rustpkg", vers = "0.6");
+extern mod this(name = "rustpkg", vers = "0.7-rc");
 
 #[cfg(fuzzer)]
-extern mod this(name = "fuzzer", vers = "0.6");
+extern mod this(name = "fuzzer", vers = "0.7-rc");
 
 #[cfg(rustdoc)]
-extern mod this(name = "rustdoc", vers = "0.6");
+extern mod this(name = "rustdoc", vers = "0.7-rc");
 
 #[cfg(rusti)]
-extern mod this(name = "rusti", vers = "0.6");
+extern mod this(name = "rusti", vers = "0.7-rc");
 
 #[cfg(rust)]
-extern mod this(name = "rust", vers = "0.6");
+extern mod this(name = "rust", vers = "0.7-rc");
 
 #[cfg(rustc)]
-extern mod this(name = "rustc", vers = "0.6");
+extern mod this(name = "rustc", vers = "0.7-rc");
 
 fn main() { this::main() }

branches/try/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.6" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.7-rc" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/try/src/etc/vim/syntax/rust.vim

@@ -110,11 +110,11 @@ syn match     rustFloat       display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9
 syn match     rustLifetime    display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
 syn match   rustCharacter   "'\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'"
 
-syn region    rustCommentDoc  start="/\*\*" end="\*/"
-syn region    rustCommentDoc  start="///" skip="\\$" end="$" keepend
+syn region    rustCommentDoc  start="/\*[\*!]" end="\*/"
+syn region    rustCommentDoc  start="//[/!]" skip="\\$" end="$" keepend
 syn match     rustComment     "/\*\*/"
-syn region    rustComment     start="/\*\([^\*]\|$\)" end="\*/" contains=rustTodo
-syn region    rustComment     start="//\([^/]\|$\)" skip="\\$" end="$" contains=rustTodo keepend
+syn region    rustComment     start="/\*\([^\*!]\|$\)" end="\*/" contains=rustTodo
+syn region    rustComment     start="//\([^/!]\|$\)" skip="\\$" end="$" contains=rustTodo keepend
 
 syn keyword rustTodo contained TODO FIXME XXX NB
 

branches/try/src/libcore/cmp.rs

@@ -64,14 +64,32 @@ totaleq_impl!(i64)
 totaleq_impl!(int)
 totaleq_impl!(uint)
 
-#[deriving(Eq)]
-pub enum Ordering { Less, Equal, Greater }
+#[deriving(Clone, Eq)]
+pub enum Ordering { Less = -1, Equal = 0, Greater = 1 }
 
 /// Trait for types that form a total order
 pub trait TotalOrd: TotalEq {
     fn cmp(&self, other: &Self) -> Ordering;
 }
 
+impl TotalOrd for Ordering {
+    #[inline(always)]
+    fn cmp(&self, other: &Ordering) -> Ordering {
+        (*self as int).cmp(&(*other as int))
+    }
+}
+
+impl Ord for Ordering {
+    #[inline(always)]
+    fn lt(&self, other: &Ordering) -> bool { (*self as int) < (*other as int) }
+    #[inline(always)]
+    fn le(&self, other: &Ordering) -> bool { (*self as int) <= (*other as int) }
+    #[inline(always)]
+    fn gt(&self, other: &Ordering) -> bool { (*self as int) > (*other as int) }
+    #[inline(always)]
+    fn ge(&self, other: &Ordering) -> bool { (*self as int) >= (*other as int) }
+}
+
 macro_rules! totalord_impl(
     ($t:ty) => {
         impl TotalOrd for $t {
@@ -180,4 +198,10 @@ mod test {
         assert!(5.equals(&5));
         assert!(!2.equals(&17));
     }
+
+    #[test]
+    fn test_ordering_order() {
+        assert!(Less < Equal);
+        assert_eq!(Greater.cmp(&Less), Greater);
+    }
 }

branches/try/src/libcore/core.rc

@@ -48,7 +48,7 @@ they contained the following prologue:
 
 
 #[link(name = "core",
-       vers = "0.6",
+       vers = "0.7-rc",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
 
@@ -66,7 +66,7 @@ they contained the following prologue:
 #[allow(deprecated_drop)];
 
 // Make core testable by not duplicating lang items. See #2912
-#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
+#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-rc");
 #[cfg(test)] pub use kinds = realcore::kinds;
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;

branches/try/src/libcore/task/mod.rs

@@ -42,6 +42,7 @@ use result;
 use task::rt::{task_id, sched_id, rust_task};
 use util;
 use util::replace;
+use unstable::finally::Finally;
 
 #[cfg(test)] use comm::SharedChan;
 
@@ -565,51 +566,27 @@ pub fn get_scheduler() -> Scheduler {
  * ~~~
  */
 pub unsafe fn unkillable<U>(f: &fn() -> U) -> U {
-    struct AllowFailure {
-        t: *rust_task,
-        drop {
-            unsafe {
-                rt::rust_task_allow_kill(self.t);
-            }
-        }
-    }
-
-    fn AllowFailure(t: *rust_task) -> AllowFailure{
-        AllowFailure {
-            t: t
-        }
-    }
-
     unsafe {
         let t = rt::rust_get_task();
-        let _allow_failure = AllowFailure(t);
         rt::rust_task_inhibit_kill(t);
-        f()
+        do (|| {
+            f()
+        }).finally {
+            rt::rust_task_allow_kill(t);
+        }
     }
 }
 
 /// The inverse of unkillable. Only ever to be used nested in unkillable().
 pub unsafe fn rekillable<U>(f: &fn() -> U) -> U {
-    struct DisallowFailure {
-        t: *rust_task,
-        drop {
-            unsafe {
-                rt::rust_task_inhibit_kill(self.t);
-            }
-        }
-    }
-
-    fn DisallowFailure(t: *rust_task) -> DisallowFailure {
-        DisallowFailure {
-            t: t
-        }
-    }
-
     unsafe {
         let t = rt::rust_get_task();
-        let _allow_failure = DisallowFailure(t);
         rt::rust_task_allow_kill(t);
-        f()
+        do (|| {
+            f()
+        }).finally {
+            rt::rust_task_inhibit_kill(t);
+        }
     }
 }
 
@@ -618,28 +595,16 @@ pub unsafe fn rekillable<U>(f: &fn() -> U) -> U {
  * For use with exclusive ARCs, which use pthread mutexes directly.
  */
 pub unsafe fn atomically<U>(f: &fn() -> U) -> U {
-    struct DeferInterrupts {
-        t: *rust_task,
-        drop {
-            unsafe {
-                rt::rust_task_allow_yield(self.t);
-                rt::rust_task_allow_kill(self.t);
-            }
-        }
-    }
-
-    fn DeferInterrupts(t: *rust_task) -> DeferInterrupts {
-        DeferInterrupts {
-            t: t
-        }
-    }
-
     unsafe {
         let t = rt::rust_get_task();
-        let _interrupts = DeferInterrupts(t);
         rt::rust_task_inhibit_kill(t);
         rt::rust_task_inhibit_yield(t);
-        f()
+        do (|| {
+            f()
+        }).finally {
+            rt::rust_task_allow_yield(t);
+            rt::rust_task_allow_kill(t);
+        }
     }
 }
 

branches/try/src/libcore/unstable.rs

@@ -16,6 +16,7 @@ use comm::{GenericChan, GenericPort};
 use prelude::*;
 use task;
 use task::atomically;
+use self::finally::Finally;
 
 #[path = "unstable/at_exit.rs"]
 pub mod at_exit;
@@ -229,25 +230,13 @@ fn LittleLock() -> LittleLock {
 pub impl LittleLock {
     #[inline(always)]
     unsafe fn lock<T>(&self, f: &fn() -> T) -> T {
-        struct Unlock {
-            l: rust_little_lock,
-            drop {
-                unsafe {
-                    rustrt::rust_unlock_little_lock(self.l);
-                }
-            }
-        }
-
-        fn Unlock(l: rust_little_lock) -> Unlock {
-            Unlock {
-                l: l
-            }
-        }
-
         do atomically {
             rustrt::rust_lock_little_lock(self.l);
-            let _r = Unlock(self.l);
-            f()
+            do (|| {
+                f()
+            }).finally {
+                rustrt::rust_unlock_little_lock(self.l);
+            }
         }
     }
 }

branches/try/src/libfuzzer/fuzzer.rc

@@ -10,7 +10,7 @@
 
 
 #[link(name = "fuzzer",
-       vers = "0.6",
+       vers = "0.7-rc",
        uuid = "d6418797-2736-4833-bd82-d3c684b7c1b0",
        url = "https://github.com/mozilla/rust/tree/master/src/libfuzzer")];
 
@@ -26,9 +26,9 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
-extern mod syntax(vers = "0.6");
+extern mod core(vers = "0.7-rc");
+extern mod std(vers = "0.7-rc");
+extern mod syntax(vers = "0.7-rc");
 
 use core::*;
 use core::io::WriterUtil;

branches/try/src/librust/rust.rc

@@ -13,14 +13,14 @@
 // FIXME #2238 Make run only accept source that emits an executable
 
 #[link(name = "rust",
-       vers = "0.6",
+       vers = "0.7-rc",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-extern mod core(vers = "0.6");
+extern mod core(vers = "0.7-rc");
 
 use core::run;
 

branches/try/src/librustc/driver/driver.rs

@@ -698,8 +698,7 @@ pub fn build_session_(sopts: @session::options,
         parse_sess: p_s,
         codemap: cm,
         // For a library crate, this is always none
-        entry_fn: @mut None,
-        entry_type: @mut None,
+        main_fn: @mut None,
         span_diagnostic: span_diagnostic_handler,
         filesearch: filesearch,
         building_library: @mut false,

branches/try/src/librustc/driver/session.rs

@@ -144,25 +144,14 @@ pub struct crate_metadata {
     data: ~[u8]
 }
 
-// The type of entry function, so
-// users can have their own entry
-// functions that don't start a
-// scheduler
-#[deriving(Eq)]
-pub enum EntryFnType {
-    EntryMain,
-    EntryStart
-}
-
 pub struct Session_ {
     targ_cfg: @config,
     opts: @options,
     cstore: @mut metadata::cstore::CStore,
     parse_sess: @mut ParseSess,
     codemap: @codemap::CodeMap,
     // For a library crate, this is always none
-    entry_fn: @mut Option<(node_id, codemap::span)>,
-    entry_type: @mut Option<EntryFnType>,
+    main_fn: @mut Option<(node_id, codemap::span)>,
     span_diagnostic: @diagnostic::span_handler,
     filesearch: @filesearch::FileSearch,
     building_library: @mut bool,

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

@@ -19,7 +19,7 @@ use syntax::codemap;
 use syntax::codemap::dummy_sp;
 use syntax::fold;
 
-static CORE_VERSION: &'static str = "0.6";
+static CORE_VERSION: &'static str = "0.7-rc";
 
 pub fn maybe_inject_libcore_ref(sess: Session,
                                 crate: @ast::crate) -> @ast::crate {

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

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

branches/try/src/librustc/metadata/common.rs

@@ -127,7 +127,7 @@ pub enum astencode_tag { // Reserves 0x50 -- 0x6f
     tag_table_node_type_subst = 0x58,
     tag_table_freevars = 0x59,
     tag_table_tcache = 0x5a,
-    tag_table_param_bounds = 0x5b,
+    tag_table_param_defs = 0x5b,
     tag_table_inferred_modes = 0x5c,
     tag_table_mutbl = 0x5d,
     tag_table_last_use = 0x5e,