---

yaml
---
r: 143932
b: refs/heads/try2
c: b820748
h: refs/heads/master
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: 433fbe8fcf13724445cc57c85cc454352c969429
+refs/heads/try2: b820748ff5a2bc09b58dd7ac511e0f607d55f2e9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/crypto/sha1.rs

@@ -159,7 +159,7 @@ impl Sha1 {
 }
 
 impl Digest for Sha1 {
-    fn reset(&mut self) {
+    pub fn reset(&mut self) {
         self.length_bits = 0;
         self.h[0] = 0x67452301u32;
         self.h[1] = 0xEFCDAB89u32;
@@ -169,9 +169,9 @@ impl Digest for Sha1 {
         self.buffer.reset();
         self.computed = false;
     }
-    fn input(&mut self, msg: &[u8]) { add_input(self, msg); }
-    fn result(&mut self, out: &mut [u8]) { return mk_result(self, out); }
-    fn output_bits(&self) -> uint { 160 }
+    pub fn input(&mut self, msg: &[u8]) { add_input(self, msg); }
+    pub fn result(&mut self, out: &mut [u8]) { return mk_result(self, out); }
+    pub fn output_bits(&self) -> uint { 160 }
 }
 
 #[cfg(test)]

branches/try2/src/libextra/enum_set.rs

@@ -21,9 +21,9 @@ pub struct EnumSet<E> {
 /// An iterface for casting C-like enum to uint and back.
 pub trait CLike {
     /// Converts C-like enum to uint.
-    fn to_uint(&self) -> uint;
+    pub fn to_uint(&self) -> uint;
     /// Converts uint to C-like enum.
-    fn from_uint(uint) -> Self;
+    pub fn from_uint(uint) -> Self;
 }
 
 fn bit<E:CLike>(e: E) -> uint {
@@ -142,11 +142,11 @@ mod test {
     }
 
     impl CLike for Foo {
-        fn to_uint(&self) -> uint {
+        pub fn to_uint(&self) -> uint {
             *self as uint
         }
 
-        fn from_uint(v: uint) -> Foo {
+        pub fn from_uint(v: uint) -> Foo {
             unsafe { cast::transmute(v) }
         }
     }

branches/try2/src/libextra/num/bigint.rs

@@ -537,7 +537,7 @@ impl ToStrRadix for BigUint {
 impl FromStrRadix for BigUint {
     /// Creates and initializes an BigUint.
 
-    fn from_str_radix(s: &str, radix: uint)
+    pub fn from_str_radix(s: &str, radix: uint)
         -> Option<BigUint> {
         BigUint::parse_bytes(s.as_bytes(), radix)
     }

branches/try2/src/libextra/test.rs

@@ -104,7 +104,7 @@ pub struct Metric {
 pub struct MetricMap(TreeMap<~str,Metric>);
 
 impl Clone for MetricMap {
-    fn clone(&self) -> MetricMap {
+    pub fn clone(&self) -> MetricMap {
         MetricMap((**self).clone())
     }
 }

branches/try2/src/libextra/treemap.rs

@@ -853,7 +853,7 @@ impl<K: TotalOrd, V, T: Iterator<(K, V)>> Extendable<(K, V), T> for TreeMap<K, V
 }
 
 impl<T: TotalOrd, Iter: Iterator<T>> FromIterator<T, Iter> for TreeSet<T> {
-    fn from_iterator(iter: &mut Iter) -> TreeSet<T> {
+    pub fn from_iterator(iter: &mut Iter) -> TreeSet<T> {
         let mut set = TreeSet::new();
         set.extend(iter);
         set

branches/try2/src/libextra/url.rs

@@ -701,7 +701,7 @@ pub fn to_str(url: &Url) -> ~str {
 }
 
 impl ToStr for Url {
-    fn to_str(&self) -> ~str {
+    pub fn to_str(&self) -> ~str {
         to_str(self)
     }
 }

branches/try2/src/librustc/middle/privacy.rs

@@ -351,7 +351,6 @@ pub fn check_crate<'mm>(tcx: ty::ctxt,
             // Do not check privacy inside items with the resolve_unexported
             // attribute. This is used for the test runner.
             if !attr::contains_name(item.attrs, "!resolve_unexported") {
-                check_sane_privacy(tcx, item);
                 oldvisit::visit_item(item, (method_map, visitor));
             }
         },
@@ -541,81 +540,3 @@ pub fn check_crate<'mm>(tcx: ty::ctxt,
     });
     oldvisit::visit_crate(crate, (method_map, visitor));
 }
-
-/// Validates all of the visibility qualifers placed on the item given. This
-/// ensures that there are no extraneous qualifiers that don't actually do
-/// anything. In theory these qualifiers wouldn't parse, but that may happen
-/// later on down the road...
-fn check_sane_privacy(tcx: ty::ctxt, item: @ast::item) {
-    match item.node {
-        // implementations of traits don't need visibility qualifiers because
-        // that's controlled by having the trait in scope.
-        ast::item_impl(_, Some(*), _, ref methods) => {
-            for m in methods.iter() {
-                match m.vis {
-                    ast::private | ast::public => {
-                        tcx.sess.span_err(m.span, "unnecessary visibility")
-                    }
-                    ast::inherited => {}
-                }
-            }
-        }
-
-        ast::item_enum(ref def, _) => {
-            for v in def.variants.iter() {
-                match v.node.vis {
-                    ast::public => {
-                        if item.vis == ast::public {
-                            tcx.sess.span_err(v.span, "unnecessary `pub` \
-                                                       visibility");
-                        }
-                    }
-                    ast::private => {
-                        if item.vis != ast::public {
-                            tcx.sess.span_err(v.span, "unnecessary `priv` \
-                                                       visibility");
-                        }
-                    }
-                    ast::inherited => {}
-                }
-            }
-        }
-
-        ast::item_struct(ref def, _) => {
-            for f in def.fields.iter() {
-                match f.node.kind {
-                    ast::named_field(_, ast::public) => {
-                        tcx.sess.span_err(f.span, "unnecessary `pub` \
-                                                   visibility");
-                    }
-                    ast::named_field(_, ast::private) => {
-                        // Fields should really be private by default...
-                    }
-                    ast::named_field(*) | ast::unnamed_field => {}
-                }
-            }
-        }
-
-        ast::item_trait(_, _, ref methods) => {
-            for m in methods.iter() {
-                match *m {
-                    ast::provided(ref m) => {
-                        match m.vis {
-                            ast::private | ast::public => {
-                                tcx.sess.span_err(m.span, "unnecessary \
-                                                           visibility");
-                            }
-                            ast::inherited => {}
-                        }
-                    }
-                    // this is warned about in the parser
-                    ast::required(*) => {}
-                }
-            }
-        }
-
-        ast::item_impl(*) | ast::item_static(*) | ast::item_foreign_mod(*) |
-        ast::item_fn(*) | ast::item_mod(*) | ast::item_ty(*) |
-        ast::item_mac(*) => {}
-    }
-}

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

@@ -214,7 +214,6 @@ use middle::trans::expr;
 use middle::trans::glue;
 use middle::trans::tvec;
 use middle::trans::type_of;
-use middle::trans::debuginfo;
 use middle::ty;
 use util::common::indenter;
 use util::ppaux::{Repr, vec_map_to_str};
@@ -386,7 +385,6 @@ struct BindingInfo {
     llmatch: ValueRef,
     trmode: TransBindingMode,
     id: ast::NodeId,
-    span: span,
     ty: ty::t,
 }
 
@@ -1307,7 +1305,7 @@ fn insert_lllocals(bcx: @mut Block,
         BindArgument => bcx.fcx.llargs
     };
 
-    for (&ident, &binding_info) in bindings_map.iter() {
+    for (_, &binding_info) in bindings_map.iter() {
         let llval = match binding_info.trmode {
             // By value bindings: use the stack slot that we
             // copied/moved the value into
@@ -1327,14 +1325,6 @@ fn insert_lllocals(bcx: @mut Block,
 
         debug!("binding %? to %s", binding_info.id, bcx.val_to_str(llval));
         llmap.insert(binding_info.id, llval);
-
-        if bcx.sess().opts.extra_debuginfo {
-            debuginfo::create_match_binding_metadata(bcx,
-                                                     ident,
-                                                     binding_info.id,
-                                                     binding_info.ty,
-                                                     binding_info.span);
-        }
     }
     return bcx;
 }
@@ -1781,7 +1771,7 @@ fn create_bindings_map(bcx: @mut Block, pat: @ast::pat) -> BindingsMap {
     let ccx = bcx.ccx();
     let tcx = bcx.tcx();
     let mut bindings_map = HashMap::new();
-    do pat_bindings(tcx.def_map, pat) |bm, p_id, span, path| {
+    do pat_bindings(tcx.def_map, pat) |bm, p_id, _s, path| {
         let ident = path_to_ident(path);
         let variable_ty = node_id_type(bcx, p_id);
         let llvariable_ty = type_of::type_of(ccx, variable_ty);
@@ -1803,11 +1793,8 @@ fn create_bindings_map(bcx: @mut Block, pat: @ast::pat) -> BindingsMap {
             }
         };
         bindings_map.insert(ident, BindingInfo {
-            llmatch: llmatch,
-            trmode: trmode,
-            id: p_id,
-            span: span,
-            ty: variable_ty
+            llmatch: llmatch, trmode: trmode,
+            id: p_id, ty: variable_ty
         });
     }
     return bindings_map;

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

@@ -165,7 +165,7 @@ impl<'self> StatRecorder<'self> {
 
 #[unsafe_destructor]
 impl<'self> Drop for StatRecorder<'self> {
-    fn drop(&self) {
+    pub fn drop(&self) {
         if self.ccx.sess.trans_stats() {
             let end = time::precise_time_ns();
             let elapsed = ((end - self.start) / 1_000_000) as uint;
@@ -1103,6 +1103,7 @@ pub fn trans_stmt(cx: @mut Block, s: &ast::stmt) -> @mut Block {
     }
 
     let mut bcx = cx;
+    debuginfo::update_source_pos(cx, s.span);
 
     match s.node {
         ast::stmt_expr(e, _) | ast::stmt_semi(e, _) => {
@@ -1633,8 +1634,7 @@ pub fn new_fn_ctxt_w_id(ccx: @mut CrateContext,
           param_substs: param_substs,
           span: sp,
           path: path,
-          ccx: ccx,
-          debug_context: None,
+          ccx: ccx
     };
     fcx.llenv = unsafe {
           llvm::LLVMGetParam(llfndecl, fcx.env_arg_pos() as c_uint)
@@ -1933,7 +1933,7 @@ pub fn trans_fn(ccx: @mut CrateContext,
                   attrs,
                   output_type,
                   |fcx| {
-                      if ccx.sess.opts.debuginfo
+                      if ccx.sess.opts.extra_debuginfo
                           && fcx_has_nonzero_span(fcx) {
                           debuginfo::create_function_metadata(fcx);
                       }

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

@@ -23,7 +23,6 @@ use middle::trans::build;
 use middle::trans::datum;
 use middle::trans::glue;
 use middle::trans::write_guard;
-use middle::trans::debuginfo;
 use middle::ty::substs;
 use middle::ty;
 use middle::typeck;
@@ -227,10 +226,7 @@ pub struct FunctionContext {
     path: path,
 
     // This function's enclosing crate context.
-    ccx: @mut CrateContext,
-
-    // Used and maintained by the debuginfo module.
-    debug_context: Option<~debuginfo::FunctionDebugContext>
+    ccx: @mut CrateContext
 }
 
 impl FunctionContext {

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

@@ -19,6 +19,7 @@ use middle::trans::base::*;
 use middle::trans::build::*;
 use middle::trans::callee;
 use middle::trans::common::*;
+use middle::trans::debuginfo;
 use middle::trans::expr;
 use middle::trans::type_of::*;
 use middle::ty;
@@ -37,10 +38,12 @@ pub fn trans_block(bcx: @mut Block, b: &ast::Block, dest: expr::Dest) -> @mut Bl
     let _icx = push_ctxt("trans_block");
     let mut bcx = bcx;
     for s in b.stmts.iter() {
+        debuginfo::update_source_pos(bcx, b.span);
         bcx = trans_stmt(bcx, *s);
     }
     match b.expr {
         Some(e) => {
+            debuginfo::update_source_pos(bcx, e.span);
             bcx = expr::trans_into(bcx, e, dest);
         }
         None => {