---

yaml
---
r: 190903
b: refs/heads/master
c: 84b14c5
h: refs/heads/master
i:
  190901: 92b3199
  190899: 16db261
  190895: 6392209
v: v3

Author: barosl

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f5782faa0667c0ee64eba8b5d49fc7d94358601e
+refs/heads/master: 84b14c5dc9bceeadb24beaa5ae1b126701b7d932
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c64d671671aea2e44ee7fc6eb00ee75fc30ed7b9
 refs/heads/try: 1c28ab65017d74fc13d003f7c7a73d1a48e5406f

trunk/man/rustc.1

@@ -242,7 +242,7 @@ full debug info with variable and type information.
 \fBopt\-level\fR=\fIVAL\fR
 Optimize with possible levels 0\[en]3
 
-.SH ENVIRONMENT
+.SH ENVIRONMENT VARIABLES
 
 Some of these affect the output of the compiler, while others affect programs
 which link to the standard library.

trunk/src/compiletest/procsrv.rs

@@ -10,10 +10,9 @@
 
 #![allow(deprecated)] // for old path, for dynamic_lib
 
-use std::dynamic_lib::DynamicLibrary;
-use std::io::prelude::*;
-use std::old_path::Path;
 use std::process::{ExitStatus, Command, Child, Output, Stdio};
+use std::io::prelude::*;
+use std::dynamic_lib::DynamicLibrary;
 
 fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
     // Need to be sure to put both the lib_path and the aux path in the dylib

trunk/src/doc/trpl/SUMMARY.md

@@ -1,6 +1,6 @@
 # Summary
 
-* [The Basics](basic.md)
+* [I: The Basics](basic.md)
     * [Installing Rust](installing-rust.md)
     * [Hello, world!](hello-world.md)
     * [Hello, Cargo!](hello-cargo.md)
@@ -14,7 +14,7 @@
     * [Strings](strings.md)
     * [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md)
     * [Standard Input](standard-input.md)
-* [Intermediate Rust](intermediate.md)
+* [II: Intermediate Rust](intermediate.md)
     * [Crates and Modules](crates-and-modules.md)
     * [Testing](testing.md)
     * [Pointers](pointers.md)
@@ -31,7 +31,7 @@
     * [Concurrency](concurrency.md)
     * [Error Handling](error-handling.md)
     * [Documentation](documentation.md)
-* [Advanced Topics](advanced.md)
+* [III: Advanced Topics](advanced.md)
     * [FFI](ffi.md)
     * [Unsafe Code](unsafe.md)
     * [Advanced Macros](advanced-macros.md)

trunk/src/libcollections/btree/map.rs

@@ -24,7 +24,7 @@ use core::default::Default;
 use core::fmt::Debug;
 use core::hash::{Hash, Hasher};
 use core::iter::{Map, FromIterator, IntoIterator};
-use core::ops::{Index};
+use core::ops::{Index, IndexMut};
 use core::{iter, fmt, mem, usize};
 use Bound::{self, Included, Excluded, Unbounded};
 
@@ -925,6 +925,15 @@ impl<K: Ord, Q: ?Sized, V> Index<Q> for BTreeMap<K, V>
     }
 }
 
+#[stable(feature = "rust1", since = "1.0.0")]
+impl<K: Ord, Q: ?Sized, V> IndexMut<Q> for BTreeMap<K, V>
+    where K: Borrow<Q>, Q: Ord
+{
+    fn index_mut(&mut self, key: &Q) -> &mut V {
+        self.get_mut(key).expect("no entry found for key")
+    }
+}
+
 /// Genericises over how to get the correct type of iterator from the correct type
 /// of Node ownership.
 trait Traverse<N> {

trunk/src/libcollections/fmt.rs

@@ -262,7 +262,6 @@
 //!
 //! ```
 //! # #![allow(unused_must_use)]
-//! use std::io::Write;
 //! let mut w = Vec::new();
 //! write!(&mut w, "Hello {}!", "world");
 //! ```
@@ -289,15 +288,15 @@
 //!
 //! ```
 //! use std::fmt;
-//! use std::io::{self, Write};
+//! use std::old_io;
 //!
 //! fmt::format(format_args!("this returns {}", "String"));
 //!
-//! let mut some_writer = io::stdout();
+//! let mut some_writer = old_io::stdout();
 //! write!(&mut some_writer, "{}", format_args!("print with a {}", "macro"));
 //!
 //! fn my_fmt_fn(args: fmt::Arguments) {
-//!     write!(&mut io::stdout(), "{}", args);
+//!     write!(&mut old_io::stdout(), "{}", args);
 //! }
 //! my_fmt_fn(format_args!("or a {} too", "function"));
 //! ```

trunk/src/libcore/macros.rs

@@ -176,7 +176,6 @@ macro_rules! try {
 ///
 /// ```
 /// # #![allow(unused_must_use)]
-/// use std::io::Write;
 ///
 /// let mut w = Vec::new();
 /// write!(&mut w, "test");

trunk/src/libcore/prelude.rs

@@ -29,6 +29,8 @@ pub use marker::{Copy, Send, Sized, Sync};
 pub use ops::{Drop, Fn, FnMut, FnOnce};
 
 // Reexported functions
+#[allow(deprecated)]
+pub use iter::range;
 pub use mem::drop;
 
 // Reexported types and traits

trunk/src/libcore/result.rs

@@ -110,8 +110,7 @@
 //! something like this:
 //!
 //! ```{.ignore}
-//! use std::old_io::*;
-//! use std::old_path::Path;
+//! use std::old_io::{File, Open, Write};
 //!
 //! let mut file = File::open_mode(&Path::new("valuable_data.txt"), Open, Write);
 //! // If `write_line` errors, then we'll never know, because the return
@@ -129,8 +128,7 @@
 //! a marginally useful message indicating why:
 //!
 //! ```{.no_run}
-//! use std::old_io::*;
-//! use std::old_path::Path;
+//! use std::old_io::{File, Open, Write};
 //!
 //! let mut file = File::open_mode(&Path::new("valuable_data.txt"), Open, Write);
 //! file.write_line("important message").ok().expect("failed to write message");
@@ -140,8 +138,7 @@
 //! You might also simply assert success:
 //!
 //! ```{.no_run}
-//! # use std::old_io::*;
-//! # use std::old_path::Path;
+//! # use std::old_io::{File, Open, Write};
 //!
 //! # let mut file = File::open_mode(&Path::new("valuable_data.txt"), Open, Write);
 //! assert!(file.write_line("important message").is_ok());
@@ -151,8 +148,7 @@
 //! Or propagate the error up the call stack with `try!`:
 //!
 //! ```
-//! # use std::old_io::*;
-//! # use std::old_path::Path;
+//! # use std::old_io::{File, Open, Write, IoError};
 //! fn write_message() -> Result<(), IoError> {
 //!     let mut file = File::open_mode(&Path::new("valuable_data.txt"), Open, Write);
 //!     try!(file.write_line("important message"));
@@ -171,8 +167,7 @@
 //! It replaces this:
 //!
 //! ```
-//! use std::old_io::*;
-//! use std::old_path::Path;
+//! use std::old_io::{File, Open, Write, IoError};
 //!
 //! struct Info {
 //!     name: String,
@@ -196,8 +191,7 @@
 //! With this:
 //!
 //! ```
-//! use std::old_io::*;
-//! use std::old_path::Path;
+//! use std::old_io::{File, Open, Write, IoError};
 //!
 //! struct Info {
 //!     name: String,
@@ -452,7 +446,7 @@ impl<T, E> Result<T, E> {
     /// ignoring I/O and parse errors:
     ///
     /// ```
-    /// use std::old_io::*;
+    /// use std::old_io::IoResult;
     ///
     /// let mut buffer: &[u8] = b"1\n2\n3\n4\n";
     /// let mut buffer = &mut buffer;

trunk/src/libcoretest/str.rs

@@ -35,7 +35,7 @@ fn test_bool_from_str() {
 fn check_contains_all_substrings(s: &str) {
     assert!(s.contains(""));
     for i in 0..s.len() {
-        for j in i+1..s.len() + 1 {
+        for j in range(i+1, s.len() + 1) {
             assert!(s.contains(&s[i..j]));
         }
     }