avoid [..]

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index c88912c83d78695a8d457841ee345111953f5c01..0c90e8ade0d26f0cac1dfbf586a53fad3019fe04 100644 (file)
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -201,7 +201,7 @@ fn setup(ask_user: bool) {
     // Let's see if it is already installed.
     if std::env::var("XARGO_RUST_SRC").is_err() {
         let sysroot = Command::new("rustc").args(&["--print", "sysroot"]).output().unwrap().stdout;
-        let sysroot = std::str::from_utf8(&sysroot[..]).unwrap();
+        let sysroot = std::str::from_utf8(&sysroot).unwrap();
         let src = Path::new(sysroot.trim_end_matches('\n')).join("lib").join("rustlib").join("src");
         if !src.exists() {
             if ask_user {
@@ -336,7 +336,7 @@ fn in_cargo_miri() {
         // So after the first `--`, we add `-Zcargo-miri-marker`.
         let mut cmd = Command::new("cargo");
         cmd.arg("rustc");
-        match (subcommand, &kind[..]) {
+        match (subcommand, kind.as_str()) {
             (MiriCommand::Run, "bin") => {
                 // FIXME: we just run all the binaries here.
                 // We should instead support `cargo miri --bin foo`.

diff --git a/src/fn_call.rs b/src/fn_call.rs
index fa8c61e678bebe90f4dfa8615fb023c688856ea9..ce07b04c29c368dc6cf18288675c16ce3fd76201 100644 (file)
--- a/src/fn_call.rs
+++ b/src/fn_call.rs
@@ -60,15 +60,15 @@ fn emulate_foreign_item(
         let this = self.eval_context_mut();
         let attrs = this.tcx.get_attrs(def_id);
         let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {
-            Some(name) => name.as_str(),
-            None => this.tcx.item_name(def_id).as_str(),
+            Some(name) => name.as_str().get(),
+            None => this.tcx.item_name(def_id).as_str().get(),
         };
         // Strip linker suffixes (seen on 32-bit macOS).
         let link_name = link_name.trim_end_matches("$UNIX2003");
         let tcx = &{this.tcx.tcx};
 
         // First: functions that could diverge.
-        match &link_name[..] {
+        match link_name {
             "__rust_start_panic" | "panic_impl" => {
                 return err!(MachineError("the evaluated program panicked".to_string()));
             }
@@ -82,7 +82,7 @@ fn emulate_foreign_item(
         // Next: functions that assume a ret and dest.
         let dest = dest.expect("we already checked for a dest");
         let ret = ret.expect("dest is `Some` but ret is `None`");
-        match &link_name[..] {
+        match link_name {
             "malloc" => {
                 let size = this.read_scalar(args[0])?.to_usize(this)?;
                 if size == 0 {

diff --git a/src/helpers.rs b/src/helpers.rs
index cdef224b3e990e58649ac50340503fa627b2c92a..2e4c955413ab7252f62c8b4fddd513e021272ec9 100644 (file)
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -175,7 +175,7 @@ fn visit_aggregate(
                     layout::FieldPlacement::Arbitrary { .. } => {
                         // Gather the subplaces and sort them before visiting.
                         let mut places = fields.collect::<EvalResult<'tcx, Vec<MPlaceTy<'tcx, Borrow>>>>()?;
-                        places[..].sort_by_key(|place| place.ptr.get_ptr_offset(self.ecx()));
+                        places.sort_by_key(|place| place.ptr.get_ptr_offset(self.ecx()));
                         self.walk_aggregate(place, places.into_iter().map(Ok))
                     }
                     layout::FieldPlacement::Union { .. } => {

diff --git a/src/intrinsic.rs b/src/intrinsic.rs
index 70880c4f7da82cfbd46aeddfeeb377b50f6936fe..5b0f0e99ad84e6d323814a1d6d3931a36b3137cc 100644 (file)
--- a/src/intrinsic.rs
+++ b/src/intrinsic.rs
@@ -27,7 +27,7 @@ fn call_intrinsic(
         // (as opposed to through a place), we have to remember to erase any tag
         // that might still hang around!
 
-        let intrinsic_name = &this.tcx.item_name(instance.def_id()).as_str()[..];
+        let intrinsic_name = this.tcx.item_name(instance.def_id()).as_str().get();
         match intrinsic_name {
             "arith_offset" => {
                 let offset = this.read_scalar(args[1])?.to_isize(this)?;

diff --git a/src/lib.rs b/src/lib.rs
index 31a02a7466e31ad3aa2848e5d963f544f1a8667e..8fc3efd7c23b6bfed862ba1b72557472f34a99fa 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -461,17 +461,17 @@ fn find_foreign_static(
     ) -> EvalResult<'tcx, Cow<'tcx, Allocation<Borrow, Self::AllocExtra>>> {
         let attrs = tcx.get_attrs(def_id);
         let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {
-            Some(name) => name.as_str(),
-            None => tcx.item_name(def_id).as_str(),
+            Some(name) => name.as_str().get(),
+            None => tcx.item_name(def_id).as_str().get(),
         };
 
-        let alloc = match &link_name[..] {
+        let alloc = match link_name {
             "__cxa_thread_atexit_impl" => {
                 // This should be all-zero, pointer-sized.
                 let size = tcx.data_layout.pointer_size;
                 let data = vec![0; size.bytes() as usize];
                 let extra = AllocationExtra::memory_allocated(size, memory_extra);
-                Allocation::from_bytes(&data[..], tcx.data_layout.pointer_align.abi, extra)
+                Allocation::from_bytes(&data, tcx.data_layout.pointer_align.abi, extra)
             }
             _ => return err!(Unimplemented(
                     format!("can't access foreign static: {}", link_name),