---

yaml
---
r: 81915
b: refs/heads/master
c: 964da1c
h: refs/heads/master
i:
  81913: 83d9ebd
  81911: d9e73dd
v: v3

Author: steveklabnik

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c4866341182503b1343934e2663f2b0cc1d7c5ac
+refs/heads/master: 964da1c9fd4ee0563cdcc7ff66cf60a3972127ee
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libextra/bitv.rs

@@ -523,7 +523,7 @@ impl Bitv {
  * with the most significant bits of each byte coming first. Each
  * bit becomes true if equal to 1 or false if equal to 0.
  */
-pub fn from_bytes(bytes: &[u8]) -> Bitv {
+pub fn from_utf8(bytes: &[u8]) -> Bitv {
     from_fn(bytes.len() * 8, |i| {
         let b = bytes[i / 8] as uint;
         let offset = i % 8;
@@ -1275,8 +1275,8 @@ mod tests {
     }
 
     #[test]
-    fn test_from_bytes() {
-        let bitv = from_bytes([0b10110110, 0b00000000, 0b11111111]);
+    fn test_from_utf8() {
+        let bitv = from_utf8([0b10110110, 0b00000000, 0b11111111]);
         let str = ~"10110110" + "00000000" + "11111111";
         assert_eq!(bitv.to_str(), str);
     }
@@ -1302,7 +1302,7 @@ mod tests {
     #[test]
     fn test_to_bools() {
         let bools = ~[false, false, true, false, false, true, true, false];
-        assert_eq!(from_bytes([0b00100110]).to_bools(), bools);
+        assert_eq!(from_utf8([0b00100110]).to_bools(), bools);
     }
 
     #[test]

trunk/src/libextra/crypto/md5.rs

@@ -156,7 +156,7 @@ static C4: [u32, ..16] = [
 
 
 /// The MD5 Digest algorithm
-pub struct Md5 {
+struct Md5 {
     priv length_bytes: u64,
     priv buffer: FixedBuffer64,
     priv state: Md5State,

trunk/src/libextra/crypto/sha2.rs

@@ -230,8 +230,7 @@ impl Engine512 {
 }
 
 
-/// The SHA-512 hash algorithm
-pub struct Sha512 {
+struct Sha512 {
     priv engine: Engine512
 }
 
@@ -283,8 +282,7 @@ static H512: [u64, ..8] = [
 ];
 
 
-/// The SHA-384 hash algorithm
-pub struct Sha384 {
+struct Sha384 {
     priv engine: Engine512
 }
 
@@ -334,8 +332,7 @@ static H384: [u64, ..8] = [
 ];
 
 
-/// The SHA-512 hash algorithm with digest truncated to 256 bits
-pub struct Sha512Trunc256 {
+struct Sha512Trunc256 {
     priv engine: Engine512
 }
 
@@ -383,8 +380,7 @@ static H512_TRUNC_256: [u64, ..8] = [
 ];
 
 
-/// The SHA-512 hash algorithm with digest truncated to 224 bits
-pub struct Sha512Trunc224 {
+struct Sha512Trunc224 {
     priv engine: Engine512
 }
 
@@ -639,8 +635,7 @@ impl Engine256 {
 }
 
 
-/// The SHA-256 hash algorithm
-pub struct Sha256 {
+struct Sha256 {
     priv engine: Engine256
 }
 
@@ -692,8 +687,7 @@ static H256: [u32, ..8] = [
 ];
 
 
-/// The SHA-224 hash algorithm
-pub struct Sha224 {
+struct Sha224 {
     priv engine: Engine256
 }
 

trunk/src/libextra/url.rs

@@ -21,7 +21,7 @@ use std::to_bytes;
 use std::uint;
 
 #[deriving(Clone, Eq)]
-pub struct Url {
+struct Url {
     scheme: ~str,
     user: Option<UserInfo>,
     host: ~str,
@@ -32,7 +32,7 @@ pub struct Url {
 }
 
 #[deriving(Clone, Eq)]
-pub struct UserInfo {
+struct UserInfo {
     user: ~str,
     pass: Option<~str>
 }

trunk/src/librustc/middle/typeck/check/method.rs

@@ -372,7 +372,7 @@ impl<'self> LookupContext<'self> {
     // to a trait and its supertraits.
     fn get_method_index(&self,
                         trait_ref: @TraitRef,
-                        subtrait: @TraitRef,
+                        subtrait_id: ast::DefId,
                         n_method: uint) -> uint {
         let tcx = self.tcx();
 
@@ -382,14 +382,15 @@ impl<'self> LookupContext<'self> {
         // we find the trait the method came from, counting up the
         // methods from them.
         let mut method_count = 0;
-        do ty::each_bound_trait_and_supertraits(tcx, &[subtrait])
+        do ty::each_bound_trait_and_supertraits(tcx, &[trait_ref])
             |bound_ref| {
-            if bound_ref.def_id == trait_ref.def_id { false }
+            if bound_ref.def_id == subtrait_id { false }
                 else {
                 method_count += ty::trait_methods(tcx, bound_ref.def_id).len();
                 true
             }
         };
+
         return method_count + n_method;
     }
 
@@ -417,9 +418,9 @@ impl<'self> LookupContext<'self> {
         let trait_ref = @TraitRef { def_id: did, substs: rcvr_substs.clone() };
 
         do self.push_inherent_candidates_from_bounds_inner(&[trait_ref])
-            |new_trait_ref, m, method_num, _bound_num| {
+            |trait_ref, m, method_num, _bound_num| {
             let vtable_index =
-                self.get_method_index(new_trait_ref, trait_ref, method_num);
+                self.get_method_index(trait_ref, trait_ref.def_id, method_num);
             // We need to fix up the transformed self type.
             let transformed_self_ty =
                 self.construct_transformed_self_ty_for_object(

trunk/src/libstd/libc.rs

@@ -3224,14 +3224,14 @@ pub mod funcs {
         #[nolink]
         #[abi = "cdecl"]
         pub mod glob {
+            use libc::types::common::c95::{c_void};
             use libc::types::os::arch::c95::{c_char, c_int};
             use libc::types::os::common::posix01::{glob_t};
-            use option::Option;
 
             extern {
                 pub fn glob(pattern: *c_char,
                             flags: c_int,
-                            errfunc: Option<extern "C" fn(epath: *c_char, errno: int) -> int>,
+                            errfunc: *c_void, // XXX callback
                             pglob: *mut glob_t);
                 pub fn globfree(pglob: *mut glob_t);
             }