---

yaml
---
r: 129263
b: refs/heads/master
c: 673c555
h: refs/heads/master
i:
  129261: 4e68610
  129259: 5fbde74
  129255: a97b4f7
  129247: 72d9624
v: v3

Author: flugsio

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 80b45ddbd351f0a4a939c3a3c4e20b4defec4b35
+refs/heads/master: 673c5554437fe50d8c45f71ad8f97e769591b038
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
 refs/heads/try: 8af051e3f9a2f2b4bf3233bb26abae2a533e736e

trunk/README.md

@@ -71,7 +71,7 @@ To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/ms
 3. With that now start `mingw32_shell.bat` from where you installed MSYS2 (i.e. `C:\msys`).
 4. From there just navigate to where you have Rust's source code, configure and build it:
 
-        $ ./configure
+        $ ./configure --build=i686-pc-mingw32
         $ make && make install
 
 [repo]: https://github.com/rust-lang/rust

trunk/configure

@@ -299,19 +299,13 @@ case $CFG_OSTYPE in
         CFG_OSTYPE=apple-darwin
         ;;
 
-    MINGW*)
-        # msys' `uname` does not print gcc configuration, but prints msys
-        # configuration. so we cannot believe `uname -m`:
-        # msys1 is always i686 and msys2 is always x86_64.
-        # instead, msys defines $MSYSTEM which is MINGW32 on i686 and
-        # MINGW64 on x86_64.
-        CFG_CPUTYPE=i686
+    MINGW32*)
         CFG_OSTYPE=pc-mingw32
-        if [ "$MSYSTEM" = MINGW64 ]
-        then
-            CFG_CPUTYPE=x86_64
-            CFG_OSTYPE=w64-mingw32
-        fi
+        ;;
+
+    MINGW64*)
+        # msys2, MSYSTEM=MINGW64
+        CFG_OSTYPE=w64-mingw32
         ;;
 
 # Thad's Cygwin identifers below

trunk/src/compiletest/runtest.rs

@@ -17,6 +17,7 @@ use header;
 use procsrv;
 use util::logv;
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 use util;
 
 use std::io::File;
@@ -818,6 +819,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
     }).collect::<Vec<String> >();
 
     #[cfg(target_os = "windows")]
+    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     fn to_lower( s : &str ) -> String {
         let i = s.chars();
         let c : Vec<char> = i.map( |c| {
@@ -831,6 +833,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
     }
 
     #[cfg(target_os = "windows")]
+    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     fn prefix_matches( line : &str, prefix : &str ) -> bool {
         to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
     }
@@ -1248,13 +1251,15 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
 }
 
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
     format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
 }
 
 // Build the LD_LIBRARY_PATH variable as it would be seen on the command line
 // for diagnostic purposes
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 fn lib_path_cmd_prefix(path: &str) -> String {
     format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
 }

trunk/src/compiletest/util.rs

@@ -11,6 +11,7 @@
 use common::Config;
 
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 use std::os::getenv;
 
 /// Conversion table from triple OS name to Rust SYSNAME
@@ -35,6 +36,7 @@ pub fn get_os(triple: &str) -> &'static str {
 }
 
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn make_new_path(path: &str) -> String {
 
     // Windows just uses PATH as the library search path, so we have to
@@ -48,9 +50,11 @@ pub fn make_new_path(path: &str) -> String {
 }
 
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn lib_path_env_var() -> &'static str { "PATH" }
 
 #[cfg(target_os = "windows")]
+#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
 pub fn path_div() -> &'static str { ";" }
 
 pub fn logv(config: &Config, s: String) {

trunk/src/doc/guide.md

@@ -1801,6 +1801,7 @@ Let's try compiling what Cargo gave us:
 ```{bash}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$
 ```
 
 Excellent! Open up your `src/main.rs` again. We'll be writing all of
@@ -1816,6 +1817,7 @@ $ cargo run
    Compiling guessing_game v0.1.0 (file:/home/you/projects/guessing_game)
      Running `target/guessing_game`
 Hello, world!
+$
 ```
 
 Great! The `run` command comes in handy when you need to rapidly iterate on a project.
@@ -1960,6 +1962,7 @@ fn main() {
 ```{notrust,ignore}
 $ cargo build
   Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
+$
 ```
 
 Excellent! Try running our new program a few times:
@@ -2018,7 +2021,7 @@ And trying it out:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ ./target/guessing_game 
 Guess the number!
 The secret number is: 57
 Please input your guess.
@@ -2289,12 +2292,13 @@ print an error message and return. Let's give this a shot:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ ./target/guessing_game 
 Guess the number!
 The secret number is: 17
 Please input your guess.
 5
 Please input a number!
+$
 ```
 
 Uh, what? But we did!
@@ -2354,13 +2358,14 @@ Let's try it!
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ ./target/guessing_game 
 Guess the number!
 The secret number is: 58
 Please input your guess.
-  76
+  76  
 You guessed: 76
 Too big!
+$
 ```
 
 Nice! You can see I even added spaces before my guess, and it still figured
@@ -2431,7 +2436,7 @@ that `return`? If we give a non-number answer, we'll `return` and quit. Observe:
 ```{notrust,ignore}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ ./target/guessing_game 
 Guess the number!
 The secret number is: 59
 Please input your guess.
@@ -2449,6 +2454,7 @@ You win!
 Please input your guess.
 quit
 Please input a number!
+$
 ```
 
 Ha! `quit` actually quits. As does any other non-number input. Well, this is
@@ -2563,7 +2569,7 @@ Now we should be good! Let's try:
 ```{rust,ignore}
 $ cargo build
    Compiling guessing_game v0.0.1 (file:///home/you/projects/guessing_game)
-$ ./target/guessing_game
+$ ./target/guessing_game 
 Guess the number!
 The secret number is: 61
 Please input your guess.
@@ -2765,6 +2771,7 @@ $ cargo run
    Compiling modules v0.0.1 (file:///home/you/projects/modules)
      Running `target/modules`
 Hello, world!
+$
 ```
 
 Nice!
@@ -2916,6 +2923,7 @@ This should all compile as usual:
 ```{notrust,ignore}
 $ cargo build
    Compiling modules v0.0.1 (file:///home/you/projects/modules)
+$
 ```
 
 We've seen how the `::` operator can be used to call into modules, but when
@@ -3089,6 +3097,7 @@ $ cargo run
    Compiling testing v0.0.1 (file:///home/you/projects/testing)
      Running `target/testing`
 Hello, world!
+$
 ```
 
 Great. Rust's infrastructure supports tests in two sorts of places, and they're
@@ -3241,6 +3250,7 @@ running 1 test
 test foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+$
 ```
 
 Nice! Our test passes, as we expected. Let's get rid of that warning for our `main`
@@ -3315,8 +3325,7 @@ To do that, we'll need to make a new module. Make a new file, `src/lib.rs`,
 and put this in it:
 
 ```{rust}
-# fn main() {}
-pub fn add_three_times_four(x: int) -> int {
+fn add_three_times_four(x: int) -> int {
     (x + 3) * 4
 }
 ```
@@ -3708,18 +3717,18 @@ That's a lot to take in. It's also one of the _most_ important concepts in
 all of Rust. Let's see this syntax in action:
 
 ```{rust}
-{
+{ 
     let x = 5i; // x is the owner of this integer, which is memory on the stack.
 
     // other code here...
-
+   
 } // privilege 1: when x goes out of scope, this memory is deallocated
 
 /// this function borrows an integer. It's given back automatically when the
 /// function returns.
-fn foo(x: &int) -> &int { x }
+fn foo(x: &int) -> &int { x } 
 
-{
+{ 
     let x = 5i; // x is the owner of this integer, which is memory on the stack.
 
     // privilege 2: you may lend that resource, to as many borrowers as you'd like
@@ -3729,14 +3738,14 @@ fn foo(x: &int) -> &int { x }
     foo(&x); // functions can borrow too!
 
     let a = &x; // we can do this alllllll day!
-}
+} 
 
-{
+{ 
     let mut x = 5i; // x is the owner of this integer, which is memory on the stack.
 
     let y = &mut x; // privilege 3: you may lend that resource to a single borrower,
                     // mutably
-}
+}   
 ```
 
 If you are a borrower, you get a few privileges as well, but must also obey a
@@ -4525,7 +4534,7 @@ let one_to_one_hundred = range(0i, 100i).collect();
 ```
 
 As you can see, we call `collect()` on our iterator. `collect()` takes
-as many values as the iterator will give it, and returns a collection
+as many values as the iterator will give it, and returns a collection 
 of the results. So why won't this compile? Rust can't determine what
 type of things you want to collect, and so you need to let it know.
 Here's the version that does compile:
@@ -5498,7 +5507,7 @@ fn main() {
 }
 ```
 
-Whew! This isn't too terrible. You can see that we still `let x = 5i`,
+Whew! This isn't too terrible. You can see that we still `let x = 5i`, 
 but then things get a little bit hairy. Three more bindings get set: a
 static format string, an argument vector, and the aruments. We then
 invoke the `println_args` function with the generated arguments.
@@ -5521,9 +5530,9 @@ There are two circumstances where Rust's safety provisions don't work well.
 The first is when interfacing with C code, and the second is when building
 certain kinds of abstractions.
 
-Rust has support for FFI (which you can read about in the [FFI
-Guide](guide-ffi.html)), but can't guarantee that the C code will be safe.
-Therefore, Rust marks such functions with the `unsafe`
+Rust has support for FFI, (which you can read about in the [FFI
+Guide](guide-ffi.html)) but Rust can't guarantee that the C code will be safe,
+like Rust's will. Therefore, Rust marks such functions with the `unsafe`
 keyword, which indicates that the function may not behave properly.
 
 Second, if you'd like to create some sort of shared-memory data structure, Rust

trunk/src/etc/maketest.py

@@ -15,14 +15,13 @@
 # msys1/msys2 automatically converts `/abs/path1:/abs/path2` into
 # `c:\real\abs\path1;c:\real\abs\path2` (semicolons) if shell thinks
 # the value is list of paths.
-# (if there is only one path, it becomes `c:/real/abs/path`.)
 # this causes great confusion and error: shell and Makefile doesn't like
 # windows paths so it is really error-prone. revert it for peace.
 def normalize_path(v):
+    # c:\path -> /c/path
+    if ':\\' in v:
+        v = '/' + v.replace(':\\', '/')
     v = v.replace('\\', '/')
-    # c:/path -> /c/path
-    if ':/' in v:
-        v = '/' + v.replace(':/', '/')
     return v
 
 

trunk/src/etc/mklldeps.py

@@ -68,6 +68,8 @@ def run(args):
     ]
 
     f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
+    if os == "windows": # NOTE: Remove after snapshot
+        f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
 
     version = run([llconfig, '--version']).strip()
 

trunk/src/liballoc/heap.rs

@@ -12,7 +12,6 @@
 // FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias`
 //                and `nonnull`
 
-use core::ptr::RawPtr;
 #[cfg(not(test))] use core::raw;
 #[cfg(not(test))] use util;
 
@@ -70,11 +69,6 @@ pub unsafe fn reallocate_inplace(ptr: *mut u8, size: uint, align: uint,
 /// the value returned by `usable_size` for the requested size.
 #[inline]
 pub unsafe fn deallocate(ptr: *mut u8, size: uint, align: uint) {
-    // FIXME(14395) This is only required for DST ~[T], it should be removed once
-    // we fix that representation to not use null pointers.
-    if ptr.is_null() {
-        return;
-    }
     imp::deallocate(ptr, size, align)
 }
 
@@ -214,7 +208,6 @@ mod imp {
 
 #[cfg(not(jemalloc), unix)]
 mod imp {
-    use core::cmp;
     use core::mem;
     use core::ptr;
     use libc;
@@ -255,7 +248,7 @@ mod imp {
     pub unsafe fn reallocate(ptr: *mut u8, size: uint, align: uint,
                              old_size: uint) -> *mut u8 {
         let new_ptr = allocate(size, align);
-        ptr::copy_memory(new_ptr, ptr as *const u8, cmp::min(size, old_size));
+        ptr::copy_memory(new_ptr, ptr as *const u8, old_size);
         deallocate(ptr, old_size, align);
         return new_ptr;
     }

trunk/src/libcollections/bitv.rs

@@ -2557,7 +2557,7 @@ mod tests {
     }
 
     fn rng() -> rand::IsaacRng {
-        let seed: &[_] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+        let seed = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
         rand::SeedableRng::from_seed(seed)
     }
 

trunk/src/libcollections/dlist.rs

@@ -1088,8 +1088,7 @@ mod tests {
         let n = list_from([1i,2,3]);
         spawn(proc() {
             check_links(&n);
-            let a: &[_] = &[&1,&2,&3];
-            assert_eq!(a, n.iter().collect::<Vec<&int>>().as_slice());
+            assert_eq!(&[&1,&2,&3], n.iter().collect::<Vec<&int>>().as_slice());
         });
     }