---

yaml
---
r: 209486
b: refs/heads/try
c: 4991c7a
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 1014ac44f6271a55249b0488a2ce1cc49deed338
+refs/heads/try: 4991c7acad6e030120a2ca352ccd3ed71c5f7aa7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/compiletest/compiletest.rs

@@ -12,16 +12,16 @@
 
 #![feature(box_syntax)]
 #![feature(collections)]
+#![feature(old_io)]
 #![feature(rustc_private)]
+#![feature(unboxed_closures)]
 #![feature(std_misc)]
 #![feature(test)]
 #![feature(path_ext)]
 #![feature(str_char)]
-#![feature(libc)]
 
 #![deny(warnings)]
 
-extern crate libc;
 extern crate test;
 extern crate getopts;
 
@@ -42,7 +42,6 @@ pub mod header;
 pub mod runtest;
 pub mod common;
 pub mod errors;
-mod raise_fd_limit;
 
 pub fn main() {
     let config = parse_config(env::args().collect());
@@ -246,7 +245,11 @@ pub fn run_tests(config: &Config) {
     // sadly osx needs some file descriptor limits raised for running tests in
     // parallel (especially when we have lots and lots of child processes).
     // For context, see #8904
-    unsafe { raise_fd_limit::raise_fd_limit(); }
+    #[allow(deprecated)]
+    fn raise_fd_limit() {
+        std::old_io::test::raise_fd_limit();
+    }
+    raise_fd_limit();
     // Prevent issue #21352 UAC blocking .exe containing 'patch' etc. on Windows
     // If #11207 is resolved (adding manifest to .exe) this becomes unnecessary
     env::set_var("__COMPAT_LAYER", "RunAsInvoker");
@@ -368,7 +371,7 @@ pub fn make_metrics_test_closure(config: &Config, testfile: &Path) -> test::Test
 fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> {
     match full_version_line {
         Some(ref full_version_line)
-          if !full_version_line.trim().is_empty() => {
+          if full_version_line.trim().len() > 0 => {
             let full_version_line = full_version_line.trim();
 
             // used to be a regex "(^|[^0-9])([0-9]\.[0-9])([^0-9]|$)"
@@ -408,7 +411,7 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> {
 
     match full_version_line {
         Some(ref full_version_line)
-          if !full_version_line.trim().is_empty() => {
+          if full_version_line.trim().len() > 0 => {
             let full_version_line = full_version_line.trim();
 
             for (pos, l) in full_version_line.char_indices() {
@@ -426,7 +429,7 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> {
                 let vers = full_version_line[pos + 5..].chars().take_while(|c| {
                     c.is_digit(10)
                 }).collect::<String>();
-                if !vers.is_empty() { return Some(vers) }
+                if vers.len() > 0 { return Some(vers) }
             }
             println!("Could not extract LLDB version from line '{}'",
                      full_version_line);

branches/try/src/compiletest/raise_fd_limit.rs

@@ -29,6 +29,7 @@ use std::net::TcpStream;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output, ExitStatus};
 use std::str;
+use std::time::Duration;
 use test::MetricMap;
 
 pub fn run(config: Config, testfile: &Path) {
@@ -451,7 +452,11 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
                 .expect(&format!("failed to exec `{:?}`", config.adb_path));
             loop {
                 //waiting 1 second for gdbserver start
-                ::std::thread::sleep_ms(1000);
+                #[allow(deprecated)]
+                fn sleep() {
+                    ::std::old_io::timer::sleep(Duration::milliseconds(1000));
+                }
+                sleep();
                 if TcpStream::connect("127.0.0.1:5039").is_ok() {
                     break
                 }
@@ -864,7 +869,7 @@ fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String])
                 }
                 first = false;
             }
-            if !failed && rest.is_empty() {
+            if !failed && rest.len() == 0 {
                 i += 1;
             }
             if i == num_check_lines {
@@ -1662,7 +1667,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
 // codegen tests (vs. clang)
 
 fn append_suffix_to_stem(p: &Path, suffix: &str) -> PathBuf {
-    if suffix.is_empty() {
+    if suffix.len() == 0 {
         p.to_path_buf()
     } else {
         let mut stem = p.file_stem().unwrap().to_os_string();

branches/try/src/compiletest/runtest.rs

@@ -15,12 +15,6 @@ Rust, its syntax, and its concepts. Upon completing the book, you'll be an
 intermediate Rust developer, and will have a good grasp of the fundamental
 ideas behind Rust.
 
-[Rust By Example][rbe] was originally a community resource, but was then
-donated to the Rust project. As the name implies, it teaches you Rust through a
-series of small examples.
-
-[rbe]: http://rustbyexample.com/
-
 # Community & Getting Help
 
 If you need help with something, or just want to talk about Rust with others,
@@ -82,3 +76,17 @@ We have [API documentation for the entire standard
 library](std/index.html). There's a list of crates on the left with more
 specific sections, or you can use the search bar at the top to search for
 something if you know its name.
+
+# External documentation
+
+*Note: While these are great resources for learning Rust, they may track a
+particular version of Rust that is likely not exactly the same as that for
+which this documentation was generated.*
+
+* [Rust by Example] - Short examples of common tasks in Rust (tracks the master
+  branch).
+* [Rust for Rubyists] - The first community tutorial for Rust. Tracks the last
+  stable release. Not just for Ruby programmers.
+
+[Rust by Example]: http://rustbyexample.com/
+[Rust for Rubyists]: http://www.rustforrubyists.com/

branches/try/src/doc/index.md

@@ -389,7 +389,6 @@ safe concurrent programs.
 Here's an example of a concurrent Rust program:
 
 ```{rust}
-# #![feature(scoped)]
 use std::thread;
 
 fn main() {
@@ -422,7 +421,6 @@ problem.
 Let's see an example. This Rust code will not compile:
 
 ```{rust,ignore}
-# #![feature(scoped)]
 use std::thread;
 
 fn main() {
@@ -469,7 +467,6 @@ that our mutation doesn't cause a data race.
 Here's what using a Mutex looks like:
 
 ```{rust}
-# #![feature(scoped)]
 use std::thread;
 use std::sync::Mutex;
 
@@ -530,7 +527,6 @@ As an example, Rust's ownership system is _entirely_ at compile time. The
 safety check that makes this an error about moved values:
 
 ```{rust,ignore}
-# #![feature(scoped)]
 use std::thread;
 
 fn main() {

branches/try/src/doc/intro.md

@@ -3788,7 +3788,7 @@ its type parameters are types:
 
 ```ignore
 fn map<A: Clone, B: Clone>(f: |A| -> B, xs: &[A]) -> Vec<B> {
-    if xs.is_empty() {
+    if xs.len() == 0 {
        return vec![];
     }
     let first: B = f(xs[0].clone());

branches/try/src/doc/reference.md

@@ -1,45 +1,47 @@
 % Comments
 
-Now that we have some functions, it’s a good idea to learn about comments.
+Now that we have some functions, it's a good idea to learn about comments.
 Comments are notes that you leave to other programmers to help explain things
 about your code. The compiler mostly ignores them.
 
 Rust has two kinds of comments that you should care about: *line comments*
 and *doc comments*.
 
-```rust
-// Line comments are anything after ‘//’ and extend to the end of the line.
+```{rust}
+// Line comments are anything after '//' and extend to the end of the line.
 
 let x = 5; // this is also a line comment.
 
 // If you have a long explanation for something, you can put line comments next
-// to each other. Put a space between the // and your comment so that it’s
+// to each other. Put a space between the // and your comment so that it's
 // more readable.
 ```
 
 The other kind of comment is a doc comment. Doc comments use `///` instead of
 `//`, and support Markdown notation inside:
 
-```rust
-/// Adds one to the number given.
+```{rust}
+/// `hello` is a function that prints a greeting that is personalized based on
+/// the name given.
 ///
-/// # Examples
+/// # Arguments
 ///
-/// ```
-/// let five = 5;
+/// * `name` - The name of the person you'd like to greet.
+///
+/// # Examples
 ///
-/// assert_eq!(6, add_one(5));
+/// ```rust
+/// let name = "Steve";
+/// hello(name); // prints "Hello, Steve!"
 /// ```
-fn add_one(x: i32) -> i32 {
-    x + 1
+fn hello(name: &str) {
+    println!("Hello, {}!", name);
 }
 ```
 
-When writing doc comments, providing some examples of usage is very, very
-helpful. You’ll notice we’ve used a new macro here: `assert_eq!`. This compares
-two values, and `panic!`s if they’re not equal to each other. It’s very helpful
-in documentation. There’s another macro, `assert!`, which `panic!`s if the
-value passed to it is `false`.
+When writing doc comments, adding sections for any arguments, return values,
+and providing some examples of usage is very, very helpful. Don't worry about
+the `&str`, we'll get to it soon.
 
 You can use the [`rustdoc`](documentation.html) tool to generate HTML documentation
-from these doc comments, and also to run the code examples as tests!
+from these doc comments.