Update to latest nightly rustc

This requires fixing some nightly APIs that have been changed in the latest nightly compiler. For reference, the PR in rustc for the API change in rustc crate: rust-lang/rust#107753 The tracking issue for the 'drain_filter' which is renamed to 'extract_if': rust-lang/rust#43244 Fixes servo#29467 Signed-off-by: Mukilan Thiyagarajan <[email protected]>
mukilan · Jul 14, 2023 · 6ca3b0b · 6ca3b0b
1 parent c86faae
commit 6ca3b0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
@@ -441,7 +441,7 @@ impl EventTarget {
 
         let listener = EventListenerType::Additive(listener.clone());
         if let Some(entries) = handlers.get_mut(ty) {
-            entries.drain_filter(|e| e.listener == listener && e.once);
+            entries.retain(|e| e.listener != listener || !e.once);
         }
     }
 

diff --git a/components/script/lib.rs b/components/script/lib.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #![feature(core_intrinsics)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(plugin)]
 #![feature(register_tool)]
 #![deny(unsafe_code)]

diff --git a/components/script/task_queue.rs b/components/script/task_queue.rs
@@ -119,7 +119,7 @@ impl<T: QueuedTaskConversion> TaskQueue<T> {
 
         // 4. Filter tasks from non-priority task-sources.
         let to_be_throttled: Vec<T> = incoming
-            .drain_filter(|msg| {
+            .extract_if(|msg| {
                 let task_source = match msg.task_source_name() {
                     Some(task_source) => task_source,
                     None => return false,

diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
@@ -216,7 +216,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
         }
         if let hir::ItemKind::Struct(def, ..) = &item.kind {
             for ref field in def.fields() {
-                let field_type = cx.tcx.type_of(field.def_id);
+                let field_type = cx.tcx.type_of(field.def_id).skip_binder();
                 if is_unrooted_ty(&self.symbols, cx, field_type, false) {
                     cx.lint(
                         UNROOTED_MUST_ROOT,
@@ -239,7 +239,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
             match var.data {
                 hir::VariantData::Tuple(fields, ..) => {
                     for field in fields {
-                        let field_type = cx.tcx.type_of(field.def_id);
+                        let field_type = cx.tcx.type_of(field.def_id).skip_binder();
                         if is_unrooted_ty(&self.symbols, cx, field_type, false) {
                             cx.lint(
                                 UNROOTED_MUST_ROOT,
@@ -273,7 +273,8 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
         };
 
         if !in_derive_expn(span) {
-            let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
+            let fn_type = cx.tcx.type_of(def_id).skip_binder();
+            let sig = fn_type.fn_sig(cx.tcx);
 
             for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
                 if is_unrooted_ty(&self.symbols, cx, *ty, false) {

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-02-01
+nightly-2023-07-12