---

yaml
---
r: 95317
b: refs/heads/dist-snap
c: b509f79
h: refs/heads/master
i:
  95315: 6df8d75
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 34d123db4eb03c1b2378b6248ebea5f0f40f2a4f
+refs/heads/dist-snap: b509f7905a578663d57121973b4a9a6b619341c2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/base64.rs

@@ -64,11 +64,11 @@ impl<'self> ToBase64 for &'self [u8] {
      *
      * ```rust
      * extern mod extra;
-     * use extra::base64::{ToBase64, STANDARD};
+     * use extra::base64::{ToBase64, standard};
      *
      * fn main () {
-     *     let str = [52,32].to_base64(STANDARD);
-     *     println!("base 64 output: {}", str);
+     *     let str = [52,32].to_base64(standard);
+     *     println!("{}", str);
      * }
      * ```
      */
@@ -172,19 +172,16 @@ impl<'self> FromBase64 for &'self str {
      *
      * ```rust
      * extern mod extra;
-     * use extra::base64::{ToBase64, FromBase64, STANDARD};
+     * use extra::base64::{ToBase64, FromBase64, standard};
      * use std::str;
      *
      * fn main () {
-     *     let hello_str = bytes!("Hello, World").to_base64(STANDARD);
-     *     println!("base64 output: {}", hello_str);
-     *     let res = hello_str.from_base64();
-     *     if res.is_ok() {
-     *       let optBytes = str::from_utf8_opt(res.unwrap());
-     *       if optBytes.is_some() {
-     *         println!("decoded from base64: {}", optBytes.unwrap());
-     *       }
-     *     }
+     *     let hello_str = "Hello, World".to_base64(standard);
+     *     println!("{}", hello_str);
+     *     let bytes = hello_str.from_base64();
+     *     println!("{:?}", bytes);
+     *     let result_str = str::from_utf8(bytes);
+     *     println!("{}", result_str);
      * }
      * ```
      */

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

@@ -11,14 +11,19 @@
 //! Enforces the Rust effect system. Currently there is just one effect,
 /// `unsafe`.
 
+use middle::ty::{ty_bare_fn, ty_closure, ty_ptr};
 use middle::ty;
 use middle::typeck::method_map;
 use util::ppaux;
 
+use syntax::ast::{UnDeref, ExprCall, ExprInlineAsm, ExprMethodCall};
+use syntax::ast::{ExprUnary, unsafe_fn, ExprPath};
 use syntax::ast;
 use syntax::codemap::Span;
+use syntax::visit::{fk_item_fn, fk_method};
 use syntax::visit;
-use syntax::visit::Visitor;
+use syntax::visit::{Visitor,fn_kind};
+use syntax::ast::{fn_decl,Block,NodeId,Expr};
 
 #[deriving(Eq)]
 enum UnsafeContext {
@@ -27,26 +32,29 @@ enum UnsafeContext {
     UnsafeBlock(ast::NodeId),
 }
 
+struct Context {
+    /// The method map.
+    method_map: method_map,
+    /// Whether we're in an unsafe context.
+    unsafe_context: UnsafeContext,
+}
+
 fn type_is_unsafe_function(ty: ty::t) -> bool {
     match ty::get(ty).sty {
-        ty::ty_bare_fn(ref f) => f.purity == ast::unsafe_fn,
-        ty::ty_closure(ref f) => f.purity == ast::unsafe_fn,
+        ty_bare_fn(ref f) => f.purity == unsafe_fn,
+        ty_closure(ref f) => f.purity == unsafe_fn,
         _ => false,
     }
 }
 
 struct EffectCheckVisitor {
     tcx: ty::ctxt,
-
-    /// The method map.
-    method_map: method_map,
-    /// Whether we're in an unsafe context.
-    unsafe_context: UnsafeContext,
+    context: @mut Context,
 }
 
 impl EffectCheckVisitor {
     fn require_unsafe(&mut self, span: Span, description: &str) {
-        match self.unsafe_context {
+        match self.context.unsafe_context {
             SafeContext => {
                 // Report an error.
                 self.tcx.sess.span_err(span,
@@ -61,125 +69,113 @@ impl EffectCheckVisitor {
             UnsafeFn => {}
         }
     }
-
-    fn check_str_index(&mut self, e: @ast::Expr) {
-        let base_type = match e.node {
-            ast::ExprIndex(_, base, _) => ty::node_id_to_type(self.tcx, base.id),
-            _ => return
-        };
-        debug2!("effect: checking index with base type {}",
-                ppaux::ty_to_str(self.tcx, base_type));
-        match ty::get(base_type).sty {
-            ty::ty_estr(*) => {
-                self.tcx.sess.span_err(e.span,
-                    "modification of string types is not allowed");
-            }
-            _ => {}
-        }
-    }
 }
 
 impl Visitor<()> for EffectCheckVisitor {
-    fn visit_fn(&mut self, fn_kind: &visit::fn_kind, fn_decl: &ast::fn_decl,
-                block: &ast::Block, span: Span, node_id: ast::NodeId, _:()) {
-
-        let (is_item_fn, is_unsafe_fn) = match *fn_kind {
-            visit::fk_item_fn(_, _, purity, _) =>
-                (true, purity == ast::unsafe_fn),
-            visit::fk_method(_, _, method) =>
-                (true, method.purity == ast::unsafe_fn),
-            _ => (false, false),
-        };
-
-        let old_unsafe_context = self.unsafe_context;
-        if is_unsafe_fn {
-            self.unsafe_context = UnsafeFn
-        } else if is_item_fn {
-            self.unsafe_context = SafeContext
-        }
+    fn visit_fn(&mut self, fn_kind:&fn_kind, fn_decl:&fn_decl,
+                block:&Block, span:Span, node_id:NodeId, _:()) {
+
+            let (is_item_fn, is_unsafe_fn) = match *fn_kind {
+                fk_item_fn(_, _, purity, _) => (true, purity == unsafe_fn),
+                fk_method(_, _, method) => (true, method.purity == unsafe_fn),
+                _ => (false, false),
+            };
+
+            let old_unsafe_context = self.context.unsafe_context;
+            if is_unsafe_fn {
+                self.context.unsafe_context = UnsafeFn
+            } else if is_item_fn {
+                self.context.unsafe_context = SafeContext
+            }
 
-        visit::walk_fn(self, fn_kind, fn_decl, block, span, node_id, ());
+            visit::walk_fn(self,
+                           fn_kind,
+                            fn_decl,
+                            block,
+                            span,
+                            node_id,
+                            ());
 
-        self.unsafe_context = old_unsafe_context
+            self.context.unsafe_context = old_unsafe_context
     }
 
-    fn visit_block(&mut self, block: &ast::Block, _:()) {
-        let old_unsafe_context = self.unsafe_context;
-        let is_unsafe = match block.rules {
-            ast::UnsafeBlock(*) => true, ast::DefaultBlock => false
-        };
-        if is_unsafe && self.unsafe_context == SafeContext {
-            self.unsafe_context = UnsafeBlock(block.id)
-        }
+    fn visit_block(&mut self, block:&Block, _:()) {
+
+            let old_unsafe_context = self.context.unsafe_context;
+            let is_unsafe = match block.rules {
+                ast::UnsafeBlock(*) => true, ast::DefaultBlock => false
+            };
+            if is_unsafe && self.context.unsafe_context == SafeContext {
+                self.context.unsafe_context = UnsafeBlock(block.id)
+            }
 
-        visit::walk_block(self, block, ());
+            visit::walk_block(self, block, ());
 
-        self.unsafe_context = old_unsafe_context
+            self.context.unsafe_context = old_unsafe_context
     }
 
-    fn visit_expr(&mut self, expr: @ast::Expr, _:()) {
-        match expr.node {
-            ast::ExprMethodCall(callee_id, _, _, _, _, _) => {
-                let base_type = ty::node_id_to_type(self.tcx, callee_id);
-                debug2!("effect: method call case, base type is {}",
-                       ppaux::ty_to_str(self.tcx, base_type));
-                if type_is_unsafe_function(base_type) {
-                    self.require_unsafe(expr.span,
-                                        "invocation of unsafe method")
+    fn visit_expr(&mut self, expr:@Expr, _:()) {
+
+            match expr.node {
+                ExprMethodCall(callee_id, _, _, _, _, _) => {
+                    let base_type = ty::node_id_to_type(self.tcx, callee_id);
+                    debug2!("effect: method call case, base type is {}",
+                           ppaux::ty_to_str(self.tcx, base_type));
+                    if type_is_unsafe_function(base_type) {
+                        self.require_unsafe(expr.span,
+                                       "invocation of unsafe method")
+                    }
                 }
-            }
-            ast::ExprCall(base, _, _) => {
-                let base_type = ty::node_id_to_type(self.tcx, base.id);
-                debug2!("effect: call case, base type is {}",
-                       ppaux::ty_to_str(self.tcx, base_type));
-                if type_is_unsafe_function(base_type) {
-                    self.require_unsafe(expr.span, "call to unsafe function")
+                ExprCall(base, _, _) => {
+                    let base_type = ty::node_id_to_type(self.tcx, base.id);
+                    debug2!("effect: call case, base type is {}",
+                           ppaux::ty_to_str(self.tcx, base_type));
+                    if type_is_unsafe_function(base_type) {
+                        self.require_unsafe(expr.span, "call to unsafe function")
+                    }
                 }
-            }
-            ast::ExprUnary(_, ast::UnDeref, base) => {
-                let base_type = ty::node_id_to_type(self.tcx, base.id);
-                debug2!("effect: unary case, base type is {}",
-                        ppaux::ty_to_str(self.tcx, base_type));
-                match ty::get(base_type).sty {
-                    ty::ty_ptr(_) => {
-                        self.require_unsafe(expr.span,
-                                            "dereference of unsafe pointer")
+                ExprUnary(_, UnDeref, base) => {
+                    let base_type = ty::node_id_to_type(self.tcx, base.id);
+                    debug2!("effect: unary case, base type is {}",
+                           ppaux::ty_to_str(self.tcx, base_type));
+                    match ty::get(base_type).sty {
+                        ty_ptr(_) => {
+                            self.require_unsafe(expr.span,
+                                           "dereference of unsafe pointer")
+                        }
+                        _ => {}
                     }
-                    _ => {}
                 }
-            }
-            ast::ExprAssign(base, _) | ast::ExprAssignOp(_, _, base, _) => {
-                self.check_str_index(base);
-            }
-            ast::ExprAddrOf(ast::MutMutable, base) => {
-                self.check_str_index(base);
-            }
-            ast::ExprInlineAsm(*) => {
-                self.require_unsafe(expr.span, "use of inline assembly")
-            }
-            ast::ExprPath(*) => {
-                match ty::resolve_expr(self.tcx, expr) {
-                    ast::DefStatic(_, true) => {
-                        self.require_unsafe(expr.span, "use of mutable static")
+                ExprInlineAsm(*) => {
+                    self.require_unsafe(expr.span, "use of inline assembly")
+                }
+                ExprPath(*) => {
+                    match ty::resolve_expr(self.tcx, expr) {
+                        ast::DefStatic(_, true) => {
+                            self.require_unsafe(expr.span, "use of mutable static")
+                        }
+                        _ => {}
                     }
-                    _ => {}
                 }
+                _ => {}
             }
-            _ => {}
-        }
 
-        visit::walk_expr(self, expr, ());
+            visit::walk_expr(self, expr, ());
     }
 }
 
 pub fn check_crate(tcx: ty::ctxt,
                    method_map: method_map,
                    crate: &ast::Crate) {
-    let mut visitor = EffectCheckVisitor {
-        tcx: tcx,
+    let context = @mut Context {
         method_map: method_map,
         unsafe_context: SafeContext,
     };
 
+    let mut visitor = EffectCheckVisitor {
+        tcx: tcx,
+        context: context,
+    };
+
     visit::walk_crate(&mut visitor, crate, ());
 }

branches/dist-snap/src/libstd/macros.rs

@@ -42,3 +42,41 @@ macro_rules! rtabort(
         ::rt::util::abort(format!($($msg)*));
     } )
 )
+
+macro_rules! assert_once_ever(
+    ($($msg:tt)+) => ( {
+        // FIXME(#8472) extra function should not be needed to hide unsafe
+        fn assert_once_ever() {
+            unsafe {
+                static mut already_happened: int = 0;
+                // Double-check lock to avoid a swap in the common case.
+                if already_happened != 0 ||
+                    ::unstable::intrinsics::atomic_xchg_relaxed(&mut already_happened, 1) != 0 {
+                        fail2!("assert_once_ever happened twice: {}",
+                               format!($($msg)+));
+                }
+            }
+        }
+        assert_once_ever();
+    } )
+)
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_assert_once_ever_ok() {
+        assert_once_ever!("help i'm stuck in an");
+        assert_once_ever!("assertion error message");
+    }
+
+    #[test] #[ignore(cfg(windows))] #[should_fail]
+    fn test_assert_once_ever_fail() {
+        use task;
+
+        fn f() { assert_once_ever!("if you're seeing this... good!") }
+
+        // linked & watched, naturally
+        task::spawn(f);
+        task::spawn(f);
+    }
+}

branches/dist-snap/src/libstd/num/num.rs

@@ -567,8 +567,9 @@ macro_rules! impl_to_primitive_float_to_float(
             Some(*self as $DstT)
         } else {
             let n = *self as f64;
+            let min_value: $SrcT = Bounded::min_value();
             let max_value: $SrcT = Bounded::max_value();
-            if -max_value as f64 <= n && n <= max_value as f64 {
+            if min_value as f64 <= n && n <= max_value as f64 {
                 Some(*self as $DstT)
             } else {
                 None

branches/dist-snap/src/libstd/rt/io/mod.rs

@@ -297,7 +297,7 @@ pub mod flate;
 pub mod comm_adapters;
 
 /// Extension traits
-pub mod extensions;
+mod extensions;
 
 /// Non-I/O things needed by the I/O module
 // XXX: shouldn this really be pub?