From dbf467183e09cbda5e1096c84012b86cce8a7de0 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Fri, 30 Dec 2022 10:58:04 +0100 Subject: [PATCH] chore: Upgrade to Rust 1.66.0 --- crates/rome_analyze/src/matcher.rs | 2 +- crates/rome_analyze/src/syntax.rs | 2 +- crates/rome_cli/tests/commands/rage.rs | 4 ++-- .../src/analyzers/nursery/use_enum_initializers.rs | 2 +- crates/rome_js_parser/src/lexer/mod.rs | 4 ++-- crates/rome_js_parser/src/syntax/module.rs | 2 +- .../src/syntax/typescript/ts_parse_error.rs | 2 +- crates/rome_json_parser/src/lexer/mod.rs | 2 +- crates/rome_lsp/src/utils.rs | 4 ++-- crates/rome_parser/src/diagnostic.rs | 2 +- crates/rome_parser/src/marker.rs | 2 +- crates/rome_rowan/src/cursor/element.rs | 8 ++------ crates/rome_rowan/src/cursor/node.rs | 4 ++-- crates/tests_macros/src/lib.rs | 4 ++-- rust-toolchain.toml | 2 +- xtask/codegen/src/formatter.rs | 2 +- xtask/codegen/src/generate_analyzer.rs | 5 ++--- xtask/coverage/src/lib.rs | 4 ++-- xtask/coverage/src/ts/ts_microsoft.rs | 2 +- 19 files changed, 27 insertions(+), 32 deletions(-) diff --git a/crates/rome_analyze/src/matcher.rs b/crates/rome_analyze/src/matcher.rs index 17727ab51ce..fd273fe869d 100644 --- a/crates/rome_analyze/src/matcher.rs +++ b/crates/rome_analyze/src/matcher.rs @@ -380,7 +380,7 @@ mod tests { &mut emit_signal, ); - analyzer.add_visitor(Phases::Syntax, Box::new(SyntaxVisitor::default())); + analyzer.add_visitor(Phases::Syntax, Box::>::default()); let ctx: AnalyzerContext = AnalyzerContext { file_id: FileId::zero(), diff --git a/crates/rome_analyze/src/syntax.rs b/crates/rome_analyze/src/syntax.rs index 5b085a0b29e..e072baf31b4 100644 --- a/crates/rome_analyze/src/syntax.rs +++ b/crates/rome_analyze/src/syntax.rs @@ -161,7 +161,7 @@ mod tests { &mut emit_signal, ); - analyzer.add_visitor(Phases::Syntax, Box::new(SyntaxVisitor::default())); + analyzer.add_visitor(Phases::Syntax, Box::>::default()); let ctx: AnalyzerContext = AnalyzerContext { file_id: FileId::zero(), diff --git a/crates/rome_cli/tests/commands/rage.rs b/crates/rome_cli/tests/commands/rage.rs index 6d4818b8ac9..c3f6379a049 100644 --- a/crates/rome_cli/tests/commands/rage.rs +++ b/crates/rome_cli/tests/commands/rage.rs @@ -101,7 +101,7 @@ fn with_server_logs() { let log_dir = TestLogDir::new("rome-test-logs"); fs::create_dir_all(&log_dir.path).expect("Failed to create test log directory"); - fs::write(&log_dir.path.join("server.log.2022-10-14-16"), r#" + fs::write(log_dir.path.join("server.log.2022-10-14-16"), r#" ┐rome_cli::commands::daemon::Running Server{pid=195434} ├─2547ms INFO rome_lsp::server Starting Rome Language Server... ├─15333ms INFO rome_lsp::server Starting Rome Language Server... @@ -135,7 +135,7 @@ INFO rome_cli::commands::daemon Received shutdown signal ).expect("Failed to write log file"); fs::write( - &log_dir.path.join("server.log.2022-10-14-15"), + log_dir.path.join("server.log.2022-10-14-15"), r#" Not most recent log file "#, diff --git a/crates/rome_js_analyze/src/analyzers/nursery/use_enum_initializers.rs b/crates/rome_js_analyze/src/analyzers/nursery/use_enum_initializers.rs index 13269d10f3b..24962f44b06 100644 --- a/crates/rome_js_analyze/src/analyzers/nursery/use_enum_initializers.rs +++ b/crates/rome_js_analyze/src/analyzers/nursery/use_enum_initializers.rs @@ -113,7 +113,7 @@ impl Rule for UseEnumInitializers { AnyJsLiteralExpression::JsNumberLiteralExpression(expr) => { Some(AnyJsLiteralExpression::JsNumberLiteralExpression( make::js_number_literal_expression(make::js_number_literal( - expr.as_number()? + f64::from(count as i32), + expr.as_number()? + f64::from(count), )), )) } diff --git a/crates/rome_js_parser/src/lexer/mod.rs b/crates/rome_js_parser/src/lexer/mod.rs index c25bcc440b1..12e78281548 100644 --- a/crates/rome_js_parser/src/lexer/mod.rs +++ b/crates/rome_js_parser/src/lexer/mod.rs @@ -776,7 +776,7 @@ impl<'src> Lexer<'src> { self.diagnostics.push(diagnostic); return false; } - Some(b) if !(b as u8).is_ascii_hexdigit() => { + Some(b) if !b.is_ascii_hexdigit() => { self.diagnostics.push(diagnostic); return false; } @@ -1975,7 +1975,7 @@ impl<'src> Lexer<'src> { } else { let err = ParseDiagnostic::new( self.file_id, - format!("Unexpected token `{}`", chr as char), + format!("Unexpected token `{}`", chr), start..self.position + 1, ); self.diagnostics.push(err); diff --git a/crates/rome_js_parser/src/syntax/module.rs b/crates/rome_js_parser/src/syntax/module.rs index 32143a71eac..584e771f5aa 100644 --- a/crates/rome_js_parser/src/syntax/module.rs +++ b/crates/rome_js_parser/src/syntax/module.rs @@ -1128,7 +1128,7 @@ fn parse_export_default_clause(p: &mut JsParser) -> ParsedSyntax { ) .detail(clause.range(p), "multiple default exports are erroneous") .detail( - &existing_default_item.range.to_owned(), + existing_default_item.range.to_owned(), "the module's default export is first defined here", ); diff --git a/crates/rome_js_parser/src/syntax/typescript/ts_parse_error.rs b/crates/rome_js_parser/src/syntax/typescript/ts_parse_error.rs index 7ccff633970..18f0fcae650 100644 --- a/crates/rome_js_parser/src/syntax/typescript/ts_parse_error.rs +++ b/crates/rome_js_parser/src/syntax/typescript/ts_parse_error.rs @@ -26,7 +26,7 @@ pub(crate) fn ts_member_cannot_be( modifier_name: &str, ) -> ParseDiagnostic { let msg = format!("{} members cannot be {}", member_type_name, modifier_name); - p.err_builder(&msg, range) + p.err_builder(msg, range) } pub(crate) fn ts_modifier_cannot_appear_on_a_constructor_declaration( diff --git a/crates/rome_json_parser/src/lexer/mod.rs b/crates/rome_json_parser/src/lexer/mod.rs index e74b8c3b471..022cbbc56f2 100644 --- a/crates/rome_json_parser/src/lexer/mod.rs +++ b/crates/rome_json_parser/src/lexer/mod.rs @@ -517,7 +517,7 @@ impl<'src> Lexer<'src> { ParseDiagnostic::new( self.file_id, "Invalid escape sequence", - escape_start..self.text_position() + (c as char).text_len(), + escape_start..self.text_position() + c.text_len(), ) .hint(r#"Valid escape sequences are: `\\`, `\/`, `/"`, `\b\`, `\f`, `\n`, `\r`, `\t` or any unicode escape sequence `\uXXXX` where X is hexedecimal number. "#), ); diff --git a/crates/rome_lsp/src/utils.rs b/crates/rome_lsp/src/utils.rs index 540f0846168..9e37f85424e 100644 --- a/crates/rome_lsp/src/utils.rs +++ b/crates/rome_lsp/src/utils.rs @@ -38,8 +38,8 @@ pub(crate) fn range(line_index: &LineIndex, range: TextRange) -> Result Result { let line_col = LineCol { - line: position.line as u32, - col: position.character as u32, + line: position.line, + col: position.character, }; line_index diff --git a/crates/rome_parser/src/diagnostic.rs b/crates/rome_parser/src/diagnostic.rs index fc4569725d2..cd0cfa1e95d 100644 --- a/crates/rome_parser/src/diagnostic.rs +++ b/crates/rome_parser/src/diagnostic.rs @@ -392,7 +392,7 @@ impl ToDiagnostic

for ExpectedNodeDiagnosticBuilder { ) }; - let diag = p.err_builder(&msg, self.range); + let diag = p.err_builder(msg, self.range); diag.detail(self.range, format!("Expected {} here", self.names)) } } diff --git a/crates/rome_parser/src/marker.rs b/crates/rome_parser/src/marker.rs index e6168444db2..1abcea26b8f 100644 --- a/crates/rome_parser/src/marker.rs +++ b/crates/rome_parser/src/marker.rs @@ -209,7 +209,7 @@ impl CompletedMarker { } new_pos.child_idx = Some(self.start_pos as usize); new_pos.start = self.offset; - new_pos.old_start(self.old_start as u32) + new_pos.old_start(self.old_start) } /// Undo this completion and turns into a `Marker` diff --git a/crates/rome_rowan/src/cursor/element.rs b/crates/rome_rowan/src/cursor/element.rs index 0a56274013e..eb55da437bb 100644 --- a/crates/rome_rowan/src/cursor/element.rs +++ b/crates/rome_rowan/src/cursor/element.rs @@ -14,12 +14,8 @@ impl SyntaxElement { offset: TextSize, ) -> SyntaxElement { match element { - NodeOrToken::Node(node) => { - SyntaxNode::new_child(node, parent, slot as u32, offset).into() - } - NodeOrToken::Token(token) => { - SyntaxToken::new(token, parent, slot as u32, offset).into() - } + NodeOrToken::Node(node) => SyntaxNode::new_child(node, parent, slot, offset).into(), + NodeOrToken::Token(token) => SyntaxToken::new(token, parent, slot, offset).into(), } } diff --git a/crates/rome_rowan/src/cursor/node.rs b/crates/rome_rowan/src/cursor/node.rs index 7722fc08a94..3846e2a0a26 100644 --- a/crates/rome_rowan/src/cursor/node.rs +++ b/crates/rome_rowan/src/cursor/node.rs @@ -182,7 +182,7 @@ impl SyntaxNode { SyntaxToken::new( token, self.clone(), - child.slot() as u32, + child.slot(), self.offset() + child.rel_offset(), ) }) @@ -195,7 +195,7 @@ impl SyntaxNode { SyntaxNode::new_child( green, self.clone(), - child.slot() as u32, + child.slot(), self.offset() + child.rel_offset(), ) }) diff --git a/crates/tests_macros/src/lib.rs b/crates/tests_macros/src/lib.rs index d239e69ebca..3fd6210c5c1 100644 --- a/crates/tests_macros/src/lib.rs +++ b/crates/tests_macros/src/lib.rs @@ -159,7 +159,7 @@ impl Arguments { syn::Lit::Str(v) => v.value(), _ => return Err("Only string literals supported"), }; - let walker = GlobWalkerBuilder::new(base, &glob) + let walker = GlobWalkerBuilder::new(base, glob) .build() .map_err(|_| "Cannot walk the requested glob")?; @@ -210,7 +210,7 @@ impl Arguments { test_full_path, test_expected_fullpath, test_directory, - } = Arguments::get_variables(&file).ok_or("Cannot generate variables for this file")?; + } = Arguments::get_variables(file).ok_or("Cannot generate variables for this file")?; let test_name = transform_file_name(&test_name); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 2dfd5e72d91..207bfd8479f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,4 +2,4 @@ # The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. # https://rust-lang.github.io/rustup/concepts/profiles.html profile = "default" -channel = "1.65.0" +channel = "1.66.0" diff --git a/xtask/codegen/src/formatter.rs b/xtask/codegen/src/formatter.rs index f4e6a0f8ed2..aadcff4ff78 100644 --- a/xtask/codegen/src/formatter.rs +++ b/xtask/codegen/src/formatter.rs @@ -625,7 +625,7 @@ impl NodeModuleInformation { .join("src") .join(self.dialect.as_str()) .join(self.concept.as_str()) - .join(&format!("{}.rs", self.name)) + .join(format!("{}.rs", self.name)) } } diff --git a/xtask/codegen/src/generate_analyzer.rs b/xtask/codegen/src/generate_analyzer.rs index a11813f53dd..1202229c946 100644 --- a/xtask/codegen/src/generate_analyzer.rs +++ b/xtask/codegen/src/generate_analyzer.rs @@ -89,7 +89,7 @@ fn generate_category( }, ); - let (modules, paths): (Vec<_>, Vec<_>) = groups.into_iter().map(|(_, tokens)| tokens).unzip(); + let (modules, paths): (Vec<_>, Vec<_>) = groups.into_values().unzip(); let tokens = xtask::reformat(quote! { #( #modules )* ::rome_analyze::declare_category! { @@ -148,8 +148,7 @@ fn generate_group(category: &'static str, group: &str) -> Result<()> { let group_name = format_ident!("{}", to_camel_case(group)?); - let (rule_imports, rule_names): (Vec<_>, Vec<_>) = - rules.into_iter().map(|(_, tokens)| tokens).unzip(); + let (rule_imports, rule_names): (Vec<_>, Vec<_>) = rules.into_values().unzip(); let tokens = xtask::reformat(quote! { use rome_analyze::declare_group; diff --git a/xtask/coverage/src/lib.rs b/xtask/coverage/src/lib.rs index 0af40aad6c4..f7fa7a4de7b 100644 --- a/xtask/coverage/src/lib.rs +++ b/xtask/coverage/src/lib.rs @@ -124,10 +124,10 @@ pub fn run( json: bool, detail_level: SummaryDetailLevel, ) { - let mut reporters = MulticastTestReporter::new(Box::new(DefaultReporter::default())); + let mut reporters = MulticastTestReporter::new(Box::::default()); let output_target = if json { - reporters.add(Box::new(JsonReporter::default())); + reporters.add(Box::::default()); OutputTarget::stderr() } else { OutputTarget::stdout() diff --git a/xtask/coverage/src/ts/ts_microsoft.rs b/xtask/coverage/src/ts/ts_microsoft.rs index 5c3d0582675..2120169eba5 100644 --- a/xtask/coverage/src/ts/ts_microsoft.rs +++ b/xtask/coverage/src/ts/ts_microsoft.rs @@ -221,7 +221,7 @@ fn should_error(name: &str, run_options: &[String]) -> bool { .map(|name| format!("{name}({option}).errors.txt")) .unwrap(); - let path = Path::new(REFERENCE_PATH).join(&errors_file_name); + let path = Path::new(REFERENCE_PATH).join(errors_file_name); path.exists() })