---

yaml
---
r: 137705
b: refs/heads/auto
c: 0b51711
h: refs/heads/master
i:
  137703: 4d1fcec
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ 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: a3e8f41212a04b702596f4261b89f2c3254338d7
+refs/heads/auto: 0b517117b3ac9c4981bbe00a529e48e4019554d1
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libnative/io/c_windows.rs

@@ -17,7 +17,7 @@ use libc;
 pub const WSADESCRIPTION_LEN: uint = 256;
 pub const WSASYS_STATUS_LEN: uint = 128;
 pub const FIONBIO: libc::c_long = 0x8004667e;
-static FD_SETSIZE: uint = 64;
+pub const FD_SETSIZE: uint = 64;
 pub const MSG_DONTWAIT: libc::c_int = 0;
 pub const ERROR_ILLEGAL_CHARACTER: libc::c_int = 582;
 pub const ENABLE_ECHO_INPUT: libc::DWORD = 0x4;

branches/auto/src/librustrt/mutex.rs

@@ -364,20 +364,20 @@ mod imp {
         use libc;
 
         #[cfg(target_arch = "x86_64")]
-        static __PTHREAD_MUTEX_SIZE__: uint = 56;
+        const __PTHREAD_MUTEX_SIZE__: uint = 56;
         #[cfg(target_arch = "x86_64")]
-        static __PTHREAD_COND_SIZE__: uint = 40;
+        const __PTHREAD_COND_SIZE__: uint = 40;
         #[cfg(target_arch = "x86")]
-        static __PTHREAD_MUTEX_SIZE__: uint = 40;
+        const __PTHREAD_MUTEX_SIZE__: uint = 40;
         #[cfg(target_arch = "x86")]
-        static __PTHREAD_COND_SIZE__: uint = 24;
+        const __PTHREAD_COND_SIZE__: uint = 24;
         #[cfg(target_arch = "arm")]
-        static __PTHREAD_MUTEX_SIZE__: uint = 40;
+        const __PTHREAD_MUTEX_SIZE__: uint = 40;
         #[cfg(target_arch = "arm")]
-        static __PTHREAD_COND_SIZE__: uint = 24;
+        const __PTHREAD_COND_SIZE__: uint = 24;
 
-        static _PTHREAD_MUTEX_SIG_INIT: libc::c_long = 0x32AAABA7;
-        static _PTHREAD_COND_SIG_INIT: libc::c_long = 0x3CB0B1BB;
+        const _PTHREAD_MUTEX_SIG_INIT: libc::c_long = 0x32AAABA7;
+        const _PTHREAD_COND_SIG_INIT: libc::c_long = 0x3CB0B1BB;
 
         #[repr(C)]
         pub struct pthread_mutex_t {

branches/auto/src/libstd/rt/backtrace.rs

@@ -45,8 +45,8 @@ pub fn log_enabled() -> bool {
     val == 2
 }
 
-#[cfg(target_word_size = "64")] static HEX_WIDTH: uint = 18;
-#[cfg(target_word_size = "32")] static HEX_WIDTH: uint = 10;
+#[cfg(target_word_size = "64")] const HEX_WIDTH: uint = 18;
+#[cfg(target_word_size = "32")] const HEX_WIDTH: uint = 10;
 
 // All rust symbols are in theory lists of "::"-separated identifiers. Some
 // assemblers, however, can't handle these characters in symbol names. To get
@@ -273,7 +273,7 @@ mod imp {
 
         try!(writeln!(w, "stack backtrace:"));
         // 100 lines should be enough
-        static SIZE: uint = 100;
+        const SIZE: uint = 100;
         let mut buf: [*mut libc::c_void, ..SIZE] = unsafe {mem::zeroed()};
         let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint};
 
@@ -697,10 +697,10 @@ mod imp {
                            *mut libc::c_void, *mut libc::c_void,
                            *mut libc::c_void, *mut libc::c_void) -> libc::BOOL;
 
-    static MAX_SYM_NAME: uint = 2000;
-    static IMAGE_FILE_MACHINE_I386: libc::DWORD = 0x014c;
-    static IMAGE_FILE_MACHINE_IA64: libc::DWORD = 0x0200;
-    static IMAGE_FILE_MACHINE_AMD64: libc::DWORD = 0x8664;
+    const MAX_SYM_NAME: uint = 2000;
+    const IMAGE_FILE_MACHINE_I386: libc::DWORD = 0x014c;
+    const IMAGE_FILE_MACHINE_IA64: libc::DWORD = 0x0200;
+    const IMAGE_FILE_MACHINE_AMD64: libc::DWORD = 0x8664;
 
     #[repr(C)]
     struct SYMBOL_INFO {
@@ -772,7 +772,7 @@ mod imp {
     mod arch {
         use libc;
 
-        static MAXIMUM_SUPPORTED_EXTENSION: uint = 512;
+        const MAXIMUM_SUPPORTED_EXTENSION: uint = 512;
 
         #[repr(C)]
         pub struct CONTEXT {