chore(rust): upgrade + fix unstable changes

Author: wmertens

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "packages/qwik/src/optimizer/core",
 ]
 exclude = ["packages/qwik/src/wasm"]
+resolver = "2"
 
 [profile.release]
 debug = 0

packages/qwik/src/optimizer/core/src/clean_side_effects.rs

@@ -38,7 +38,7 @@ impl VisitMut for CleanMarker {
 
 impl VisitMut for CleanSideEffects {
     fn visit_mut_module(&mut self, node: &mut ast::Module) {
-        node.body.drain_filter(|item| {
+        let it = node.body.extract_if(|item| {
             if item.span().has_mark(self.mark) {
                 return false;
             }
@@ -53,5 +53,7 @@ impl VisitMut for CleanSideEffects {
                 _ => false,
             }
         });
+        // Consume the iterator to force the extraction.
+        for _ in it {}
     }
 }

packages/qwik/src/optimizer/core/src/collector.rs

@@ -374,10 +374,10 @@ impl Visit for IdentCollector {
     }
 
     fn visit_ident(&mut self, node: &ast::Ident) {
-        if let Some(ExprOrSkip::Expr) = self.expr_ctxt.last() {
-            if node.span.ctxt() != SyntaxContext::empty() {
-                self.local_idents.insert(id!(node));
-            }
+        if matches!(self.expr_ctxt.last(), Some(ExprOrSkip::Expr))
+            && node.span.ctxt() != SyntaxContext::empty()
+        {
+            self.local_idents.insert(id!(node));
         }
     }
 

packages/qwik/src/optimizer/core/src/entry_strategy.rs

@@ -183,7 +183,7 @@ pub fn parse_entry_strategy(
     manual_chunks: Option<HashMap<String, JsWord>>,
 ) -> Box<dyn EntryPolicy> {
     match strategy {
-        EntryStrategy::Inline | EntryStrategy::Hoist => Box::new(InlineStrategy::default()),
+        EntryStrategy::Inline | EntryStrategy::Hoist => Box::<InlineStrategy>::default(),
         EntryStrategy::Hook => Box::new(PerHookStrategy::new(manual_chunks)),
         EntryStrategy::Single => Box::new(SingleStrategy::new(manual_chunks)),
         EntryStrategy::Component => Box::new(PerComponentStrategy::new(manual_chunks)),

packages/qwik/src/optimizer/core/src/lib.rs

@@ -5,7 +5,7 @@
 #![feature(box_patterns)]
 #![allow(clippy::option_if_let_else)]
 #![allow(clippy::iter_with_drain)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #[cfg(test)]
 mod test;
 

packages/qwik/src/optimizer/core/src/transform.rs

@@ -317,7 +317,8 @@ impl<'a> QwikTransform<'a> {
             display_name += "s_";
         }
         display_name = escape_sym(&display_name);
-        if display_name.starts_with(|c| matches!(c, '0'..='9')) {
+        let first_char = display_name.chars().next();
+        if first_char.map_or(false, |c| c.is_ascii_digit()) {
             display_name = format!("_{}", display_name);
         }
         let index = match self.hooks_names.get_mut(&display_name) {
@@ -1745,7 +1746,6 @@ impl<'a> Fold for QwikTransform<'a> {
                 {
                     self.hooks
                         .drain(..)
-                        .into_iter()
                         .map(|hook| {
                             let id = (hook.name.clone(), SyntaxContext::from_u32(hook.hash as u32));
                             ast::ModuleItem::Stmt(ast::Stmt::Decl(ast::Decl::Var(Box::new(
@@ -2170,12 +2170,11 @@ impl<'a> Fold for QwikTransform<'a> {
                     } else {
                         let new_specifier =
                             convert_signal_word(&ident.sym).expect("Specifier ends with $");
-                        let new_local = global_collect
+                        global_collect
                             .exports
                             .keys()
-                            .find(|id| id.0 == new_specifier);
-
-                        new_local.map_or_else(
+                            .find(|id| id.0 == new_specifier)
+                            .map_or_else(
                                 || {
                                     HANDLER.with(|handler| {
                                         handler

rust-toolchain

@@ -1 +1 @@
-nightly-2022-09-23
+nightly-2023-06-23