From 0568736b1d94046c706e82ceac98e22dd7a1604f Mon Sep 17 00:00:00 2001 From: Dwlad90 Date: Sun, 2 Feb 2025 00:33:19 +0200 Subject: [PATCH] chore(rust): upgrade to 1.84.1 --- .devcontainer/devcontainer.json | 2 +- clippy.toml | 2 +- crates/stylex-path-resolver/Cargo.toml | 2 +- crates/stylex-shared/Cargo.toml | 2 +- .../src/shared/structures/state_manager.rs | 10 ++++------ .../src/shared/structures/stylex_options.rs | 1 - .../transformers/tests/stylex_create_test.rs | 1 - crates/stylex-shared/src/shared/utils/common.rs | 2 +- .../stylex-shared/src/shared/utils/js/evaluate.rs | 4 ++-- .../shared/utils/log/build_code_frame_error.rs | 2 +- .../stylex-shared/src/shared/utils/validators.rs | 8 ++++---- .../src/transform/fold/fold_module_items.rs | 6 +++--- .../stylex/transform_stylex_create_call.rs | 15 ++++++--------- crates/stylex-test-parser/Cargo.toml | 2 +- crates/stylex-test-parser/src/main.rs | 4 ++-- rust-toolchain.toml | 2 +- 16 files changed, 29 insertions(+), 36 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f18afff..dfba716d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "pnpmVersion": "9.15.4" }, "ghcr.io/devcontainers/features/rust:1": { - "version": "1.82.0", + "version": "1.84.1", "targets": [ "wasm32-wasip1", "x86_64-apple-darwin", diff --git a/clippy.toml b/clippy.toml index 96448b3a..ebf59ad7 100644 --- a/clippy.toml +++ b/clippy.toml @@ -22,5 +22,5 @@ ignore-interior-mutability = [ "swc_atoms::JsWord", "swc_ecma_ast::Id", ] -msrv = "1.82.0" +msrv = "1.84.1" type-complexity-threshold = 25000 diff --git a/crates/stylex-path-resolver/Cargo.toml b/crates/stylex-path-resolver/Cargo.toml index 151bbd81..83cebb79 100644 --- a/crates/stylex-path-resolver/Cargo.toml +++ b/crates/stylex-path-resolver/Cargo.toml @@ -2,7 +2,7 @@ name = "stylex_path_resolver" version = "0.6.4-rc.1" edition = "2021" -rust-version = "1.82.0" +rust-version = "1.84.1" description = "Path resolver for StyleX SWC plugin" license = "MIT" repository = "https://github.com/Dwlad90/stylex-swc-plugin.git" diff --git a/crates/stylex-shared/Cargo.toml b/crates/stylex-shared/Cargo.toml index a077372a..427b7688 100644 --- a/crates/stylex-shared/Cargo.toml +++ b/crates/stylex-shared/Cargo.toml @@ -2,7 +2,7 @@ name = "stylex_shared" version = "0.6.4-rc.1" edition = "2021" -rust-version = "1.82.0" +rust-version = "1.84.1" description = "Shared SWC tranformer for StyleX" license = "MIT" repository = "https://github.com/Dwlad90/stylex-swc-plugin.git" diff --git a/crates/stylex-shared/src/shared/structures/state_manager.rs b/crates/stylex-shared/src/shared/structures/state_manager.rs index 034dc8d7..7c72ea66 100644 --- a/crates/stylex-shared/src/shared/structures/state_manager.rs +++ b/crates/stylex-shared/src/shared/structures/state_manager.rs @@ -283,10 +283,10 @@ impl StateManager { if let Some(package_json_path) = package_json_path { let (package_json, _) = get_package_json(&package_json_path, package_json_seen); // Try to read and parse package.json - return Some(( + Some(( package_json.name, package_json_path.to_string_lossy().into_owned(), - )); + )) } else { // Recursively check parent directory if not at root if folder.parent().is_some() && !folder.as_os_str().is_empty() { @@ -481,8 +481,7 @@ impl StateManager { // Update declarations if let Some(item) = self.declarations.iter_mut().find(|decl| { - decl.init.as_ref().map_or( - false, + decl.init.as_ref().is_some_and( |boxed_expr| matches!(**boxed_expr, Expr::Call(ref existing_call) if existing_call == call), ) }) { @@ -491,8 +490,7 @@ impl StateManager { // Update style_vars if let Some((_, item)) = self.style_vars.iter_mut().find(|(_, decl)| { - decl.init.as_ref().map_or( - false, + decl.init.as_ref().is_some_and( |expr| matches!(**expr, Expr::Call(ref existing_call) if existing_call == call), ) }) { diff --git a/crates/stylex-shared/src/shared/structures/stylex_options.rs b/crates/stylex-shared/src/shared/structures/stylex_options.rs index 2ef05815..a2b523de 100644 --- a/crates/stylex-shared/src/shared/structures/stylex_options.rs +++ b/crates/stylex-shared/src/shared/structures/stylex_options.rs @@ -46,7 +46,6 @@ impl Default for StyleXOptionsParams { #[derive(Deserialize, Debug, Clone, PartialEq)] #[serde(rename_all(deserialize = "kebab-case", serialize = "PascalCase"))] - pub enum StyleResolution { ApplicationOrder, PropertySpecificity, diff --git a/crates/stylex-shared/src/shared/transformers/tests/stylex_create_test.rs b/crates/stylex-shared/src/shared/transformers/tests/stylex_create_test.rs index e4a2a534..301fb7d3 100644 --- a/crates/stylex-shared/src/shared/transformers/tests/stylex_create_test.rs +++ b/crates/stylex-shared/src/shared/transformers/tests/stylex_create_test.rs @@ -869,7 +869,6 @@ mod stylex_create { #[test] #[ignore] - fn transforms_nested_pseudo_classes_within_pseudo_elements_v2() { let before_hover_object = style_multiple_depth_nested_object_factory(&[( "default", diff --git a/crates/stylex-shared/src/shared/utils/common.rs b/crates/stylex-shared/src/shared/utils/common.rs index 31979602..d7e4a8e4 100644 --- a/crates/stylex-shared/src/shared/utils/common.rs +++ b/crates/stylex-shared/src/shared/utils/common.rs @@ -250,7 +250,7 @@ pub(crate) fn _get_var_decl_by_ident_or_member<'a>( .and_then(|call| call.callee.as_expr()) .and_then(|callee| callee.as_member()) .and_then(|member| member.prop.as_ident()) - .map_or(false, |member_ident| member_ident.sym == ident.sym) + .is_some_and(|member_ident| member_ident.sym == ident.sym) }) .cloned() } diff --git a/crates/stylex-shared/src/shared/utils/js/evaluate.rs b/crates/stylex-shared/src/shared/utils/js/evaluate.rs index 40a4910a..df09b3f6 100644 --- a/crates/stylex-shared/src/shared/utils/js/evaluate.rs +++ b/crates/stylex-shared/src/shared/utils/js/evaluate.rs @@ -1692,9 +1692,9 @@ fn _evaluate( ); } _ => { - debug!("Unsupported type of expression: {:?}", path); + warn!("Unsupported type of expression: {:?}. If its not enough, please run in debug mode to see more details", path.get_type()); - warn!("Unsupported type of expression: {:?}", path.get_type()); + debug!("Unsupported type of expression: {:?}", path); return deopt( path, diff --git a/crates/stylex-shared/src/shared/utils/log/build_code_frame_error.rs b/crates/stylex-shared/src/shared/utils/log/build_code_frame_error.rs index 7e636aa5..ce7821cc 100644 --- a/crates/stylex-shared/src/shared/utils/log/build_code_frame_error.rs +++ b/crates/stylex-shared/src/shared/utils/log/build_code_frame_error.rs @@ -165,7 +165,7 @@ impl<'a> ExpressionFinder<'a> { } } -impl<'a> Fold for ExpressionFinder<'a> { +impl Fold for ExpressionFinder<'_> { fn fold_expr(&mut self, expr: Expr) -> Expr { if self.target.eq_ignore_span(&expr) { self.found_expr = Some(expr.clone()); diff --git a/crates/stylex-shared/src/shared/utils/validators.rs b/crates/stylex-shared/src/shared/utils/validators.rs index ce8d1c5a..529f1907 100644 --- a/crates/stylex-shared/src/shared/utils/validators.rs +++ b/crates/stylex-shared/src/shared/utils/validators.rs @@ -281,15 +281,15 @@ pub(crate) fn is_target_call( .callee .as_expr() .and_then(|arg| arg.as_ident()) - .map_or(false, |ident| imports_map.contains(&ident.sym)); + .is_some_and(|ident| imports_map.contains(&ident.sym)); let is_create_member = call .callee .as_expr() .and_then(|expr| expr.as_member()) - .map_or(false, |member| { + .is_some_and(|member| { member.obj.is_ident() - && member.prop.as_ident().map_or(false, |ident| { + && member.prop.as_ident().is_some_and(|ident| { ident.sym == call_name && state.stylex_import_stringified().contains( &member @@ -504,7 +504,7 @@ pub(crate) fn validate_theme_variables( return key_value; } - if !variables.as_expr().map_or(false, |expr| expr.is_object()) { + if !variables.as_expr().is_some_and(|expr| expr.is_object()) { panic!("Can only override variables theme created with stylex.defineVars()."); } diff --git a/crates/stylex-shared/src/transform/fold/fold_module_items.rs b/crates/stylex-shared/src/transform/fold/fold_module_items.rs index 4f0e92ef..693222d5 100644 --- a/crates/stylex-shared/src/transform/fold/fold_module_items.rs +++ b/crates/stylex-shared/src/transform/fold/fold_module_items.rs @@ -81,8 +81,8 @@ where .filter(|decl| { decl .init - .as_ref() // Use as_ref to convert Option to Option<&T> - .map_or(false, |init| init.is_object() || init.is_lit()) + .as_ref() + .is_some_and(|init| init.is_object() || init.is_lit()) }) .cloned() // Clone only the filtered elements .collect::>() @@ -107,7 +107,7 @@ where decl .init .as_ref() - .map_or(false, |init| init.is_object() || init.is_lit()) + .is_some_and(|init| init.is_object() || init.is_lit()) }) .cloned() .collect::>(), diff --git a/crates/stylex-shared/src/transform/stylex/transform_stylex_create_call.rs b/crates/stylex-shared/src/transform/stylex/transform_stylex_create_call.rs index 1db94558..979860cc 100644 --- a/crates/stylex-shared/src/transform/stylex/transform_stylex_create_call.rs +++ b/crates/stylex-shared/src/transform/stylex/transform_stylex_create_call.rs @@ -329,9 +329,8 @@ where let expr = dynamic_match .iter() .find(|dynamic_style| { - orig_class_paths - .get(&cls.to_string()) - .map_or(false, |path| path == &dynamic_style.path) + orig_class_paths.get(&cls.to_string()) + == Some(&dynamic_style.path) }) .map(|dynamic_style| { let expression = &dynamic_style.expression; @@ -354,9 +353,8 @@ where } } else if class_list.iter().any(|cls| { dynamic_match.iter().any(|dynamic_style| { - orig_class_paths - .get(&cls.to_string()) - .map_or(false, |path| path == &dynamic_style.path) + orig_class_paths.get(&cls.to_string()) + == Some(&dynamic_style.path) }) }) { let expr_array: Vec = class_list @@ -366,9 +364,8 @@ where let expr = dynamic_match .iter() .find(|dynamic_style| { - orig_class_paths - .get(&cls.to_string()) - .map_or(false, |path| path == &dynamic_style.path) + orig_class_paths.get(&cls.to_string()) + == Some(&dynamic_style.path) }) .map(|dynamic_style| dynamic_style.expression.clone()); diff --git a/crates/stylex-test-parser/Cargo.toml b/crates/stylex-test-parser/Cargo.toml index 328ddf75..9cac039f 100644 --- a/crates/stylex-test-parser/Cargo.toml +++ b/crates/stylex-test-parser/Cargo.toml @@ -2,7 +2,7 @@ name = "stylex_test_parser" version = "0.6.4-rc.1" edition = "2021" -rust-version = "1.82.0" +rust-version = "1.84.1" description = "Test parser for StyleX" license = "MIT" repository = "https://github.com/Dwlad90/stylex-swc-plugin.git" diff --git a/crates/stylex-test-parser/src/main.rs b/crates/stylex-test-parser/src/main.rs index f2325b7e..ee8b3dcc 100644 --- a/crates/stylex-test-parser/src/main.rs +++ b/crates/stylex-test-parser/src/main.rs @@ -201,6 +201,8 @@ fn main() { let packages = ["babel-plugin", "shared", "stylex", "open-props"]; + let re = Regex::new(r"(test\.js|test\.js\.snap)$").unwrap(); + for package in packages.iter() { let path = format!("{}/{}", stylex_dir, package); let root_path = Path::new(path.as_str()); @@ -213,8 +215,6 @@ fn main() { } }; - let re = Regex::new(r"(test\.js|test\.js\.snap)$").unwrap(); - let file_paths = file_paths .into_iter() .filter(|f| { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d374c3c..d9c2f36d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.82.0" +channel = "1.84.1" components = ["rustfmt", "clippy"] targets = [ "wasm32-wasip1",