auto merge of #20677 : alexcrichton/rust/rollup, r=alexcrichton

1 files changed, 4 insertions, 5 deletions

diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs
index 64cc490f4b1..83bad70e7b1 100644
--- a/src/libgraphviz/lib.rs
+++ b/src/libgraphviz/lib.rs
@@ -271,8 +271,7 @@
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/nightly/")]
-#![feature(globs, slicing_syntax)]
-#![feature(unboxed_closures)]
+#![feature(slicing_syntax)]
 
 use self::LabelText::*;
 
@@ -453,7 +452,7 @@ impl<'a> LabelText<'a> {
     pub fn escape(&self) -> String {
         match self {
             &LabelStr(ref s) => s.escape_default(),
-            &EscStr(ref s) => LabelText::escape_str(s[]),
+            &EscStr(ref s) => LabelText::escape_str(s.index(&FullRange)),
         }
     }
 
@@ -482,7 +481,7 @@ impl<'a> LabelText<'a> {
         let mut prefix = self.pre_escaped_content().into_owned();
         let suffix = suffix.pre_escaped_content();
         prefix.push_str(r"\n\n");
-        prefix.push_str(suffix[]);
+        prefix.push_str(suffix.index(&FullRange));
         EscStr(prefix.into_cow())
     }
 }
@@ -676,7 +675,7 @@ mod tests {
 
     impl<'a> Labeller<'a, Node, &'a Edge> for LabelledGraph {
         fn graph_id(&'a self) -> Id<'a> {
-            Id::new(self.name[]).unwrap()
+            Id::new(self.name.index(&FullRange)).unwrap()
         }
         fn node_id(&'a self, n: &Node) -> Id<'a> {
             id_name(n)