From 0917dc4e8703b7b40db3ce895d475aa56031f861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Willenb=C3=BCcher?= <willenbuecher@xq-tec.com>
Date: Thu, 10 Jun 2021 20:56:41 +0200
Subject: [PATCH] Replaced ref_slice::ref_slice with std::slice::from_ref
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ref_slice::ref_slice is deprecated in ref_slice-1.2.1,
because it's redundant with std since rust 1.28.

Signed-off-by: Adrian Willenbücher <willenbuecher@xq-tec.com>
---
 Cargo.lock                        |  7 -------
 components/script/Cargo.toml      |  1 -
 components/script/dom/document.rs |  4 ++--
 components/script/dom/node.rs     | 10 +++++-----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d11847ca1a8..32e35c126d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4948,12 +4948,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed"
 
-[[package]]
-name = "ref_slice"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1b7878800220a76a08f32c057829511440f65528b63b940f2f2bc145d7ac68"
-
 [[package]]
 name = "regex"
 version = "1.4.5"
@@ -5162,7 +5156,6 @@ dependencies = [
  "pixels",
  "profile_traits",
  "ref_filter_map",
- "ref_slice",
  "regex",
  "script_layout_interface",
  "script_plugins",
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index a09ccf8f257..e3f86b85d35 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -85,7 +85,6 @@ phf = "0.8"
 pixels = { path = "../pixels" }
 profile_traits = { path = "../profile_traits" }
 ref_filter_map = "1.0.1"
-ref_slice = "1.0"
 regex = "1.1"
 script_layout_interface = { path = "../script_layout_interface" }
 script_plugins = { path = "../script_plugins" }
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index a28b82218ce..28b820f8919 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -140,7 +140,6 @@ use num_traits::ToPrimitive;
 use percent_encoding::percent_decode;
 use profile_traits::ipc as profile_ipc;
 use profile_traits::time::{TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType};
-use ref_slice::ref_slice;
 use script_layout_interface::message::{Msg, PendingRestyle, ReflowGoal};
 use script_layout_interface::TrustedNodeAddress;
 use script_traits::{AnimationState, DocumentActivity, MouseButton, MouseEventType};
@@ -161,6 +160,7 @@ use std::default::Default;
 use std::mem;
 use std::ptr::NonNull;
 use std::rc::Rc;
+use std::slice::from_ref;
 use std::time::{Duration, Instant};
 use style::attr::AttrValue;
 use style::context::QuirksMode;
@@ -1708,7 +1708,7 @@ impl Document {
             Some(window),
             0i32,
             &touches,
-            &TouchList::new(window, ref_slice(&&*touch)),
+            &TouchList::new(window, from_ref(&&*touch)),
             &TouchList::new(window, target_touches.r()),
             // FIXME: modifier keys
             false,
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 3ad3e656518..62f340fb215 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -74,7 +74,6 @@ use libc::{self, c_void, uintptr_t};
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use msg::constellation_msg::{BrowsingContextId, PipelineId};
 use net_traits::image::base::{Image, ImageMetadata};
-use ref_slice::ref_slice;
 use script_layout_interface::message::QueryMsg;
 use script_layout_interface::{HTMLCanvasData, HTMLMediaData, LayoutElementType, LayoutNodeType};
 use script_layout_interface::{SVGSVGData, StyleAndOpaqueLayoutData, TrustedNodeAddress};
@@ -93,6 +92,7 @@ use std::default::Default;
 use std::iter;
 use std::mem;
 use std::ops::Range;
+use std::slice::from_ref;
 use std::sync::Arc as StdArc;
 use style::context::QuirksMode;
 use style::dom::OpaqueNode;
@@ -2061,7 +2061,7 @@ impl Node {
             new_nodes.r()
         } else {
             // Step 3.
-            ref_slice(&node)
+            from_ref(&node)
         };
         // Step 6.
         let previous_sibling = match suppress_observers {
@@ -2130,7 +2130,7 @@ impl Node {
                 added_nodes.extend(node.children().map(|child| Dom::from_ref(&*child)));
                 added_nodes.r()
             } else {
-                ref_slice(node)
+                from_ref(node)
             }
         } else {
             &[] as &[&Node]
@@ -2750,7 +2750,7 @@ impl NodeMethods for Node {
             nodes.extend(node.children().map(|node| Dom::from_ref(&*node)));
             nodes.r()
         } else {
-            ref_slice(&node)
+            from_ref(&node)
         };
 
         // Step 13.
@@ -3273,7 +3273,7 @@ impl<'a> ChildrenMutation<'a> {
         if let Some(ref removed) = *removed {
             if let (None, None) = (prev, next) {
                 ChildrenMutation::ReplaceAll {
-                    removed: ref_slice(removed),
+                    removed: from_ref(removed),
                     added: added,
                 }
             } else {