about summary refs log tree commit diff
path: root/src/rustbook
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-18 15:48:40 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-18 15:48:40 -0800
commit231eeaa35b3a7700cfd05dcb30f01cd7a36313b8 (patch)
tree83644afe1c67870e2f015abfc834307aa532dec7 /src/rustbook
parent2cdbd288ac0606902885434e1ccd8d8bde68913d (diff)
parent9ea84aeed4ed3006eddb6a7b24e9714f2844cd22 (diff)
downloadrust-231eeaa35b3a7700cfd05dcb30f01cd7a36313b8.tar.gz
rust-231eeaa35b3a7700cfd05dcb30f01cd7a36313b8.zip
rollup merge of #22502: nikomatsakis/deprecate-bracket-bracket
Conflicts:
	src/libcollections/slice.rs
	src/libcollections/str.rs
	src/librustc/middle/lang_items.rs
	src/librustc_back/rpath.rs
	src/librustc_typeck/check/regionck.rs
	src/libstd/ffi/os_str.rs
	src/libsyntax/diagnostic.rs
	src/libsyntax/parse/parser.rs
	src/libsyntax/util/interner.rs
	src/test/run-pass/regions-refcell.rs
Diffstat (limited to 'src/rustbook')
-rw-r--r--src/rustbook/build.rs2
-rw-r--r--src/rustbook/error.rs4
-rw-r--r--src/rustbook/test.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs
index 6f5fc5c1969..224f1ef1a8b 100644
--- a/src/rustbook/build.rs
+++ b/src/rustbook/build.rs
@@ -92,7 +92,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
         {
             let urls = markdown_data.replace(".md)", ".html)");
             try!(File::create(&preprocessed_path)
-                      .write_str(&urls[]));
+                      .write_str(&urls[..]));
         }
 
         // write the prelude to a temporary HTML file for rustdoc inclusion
diff --git a/src/rustbook/error.rs b/src/rustbook/error.rs
index 1c10a270acc..43c882c7d5b 100644
--- a/src/rustbook/error.rs
+++ b/src/rustbook/error.rs
@@ -52,7 +52,7 @@ impl<'a> Error for &'a str {
 
 impl Error for String {
     fn description<'a>(&'a self) -> &'a str {
-        &self[]
+        &self[..]
     }
 }
 
@@ -75,7 +75,7 @@ impl Error for IoError {
         self.desc
     }
     fn detail(&self) -> Option<&str> {
-        self.detail.as_ref().map(|s| &s[])
+        self.detail.as_ref().map(|s| &s[..])
     }
 }
 
diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs
index d3cb8a7316e..c5d4875423a 100644
--- a/src/rustbook/test.rs
+++ b/src/rustbook/test.rs
@@ -65,7 +65,7 @@ impl Subcommand for Test {
             }
             Err(errors) => {
                 for err in errors {
-                    term.err(&err[]);
+                    term.err(&err[..]);
                 }
                 return Err(box "There was an error." as Box<Error>);
             }