diff --git a/.cargo/config.toml b/.cargo/config.toml index 5a6b5e28dcda25..5fef0dd0b68c34 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -7,6 +7,7 @@ rustflags = [ # This is a workaround to configure lints for the entire workspace, pending the ability to configure this via TOML. # See: `https://github.com/rust-lang/cargo/issues/5034` # `https://github.com/EmbarkStudios/rust-ecosystem/issues/22#issuecomment-947011395` + "-Dunsafe_code", "-Wclippy::pedantic", # Allowed pedantic lints "-Wclippy::char_lit_as_u8", diff --git a/Cargo.lock b/Cargo.lock index 1d3ec6008fd204..4fabd1f0f92fdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -158,21 +149,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base64" version = "0.13.1" @@ -650,7 +626,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] @@ -1084,12 +1060,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "gimli" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" - [[package]] name = "glob" version = "0.3.1" @@ -1491,7 +1461,7 @@ dependencies = [ "itertools", "lalrpop-util", "petgraph", - "pico-args 0.4.2", + "pico-args", "regex", "regex-syntax", "string_cache", @@ -1688,15 +1658,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -1917,15 +1878,6 @@ dependencies = [ "syn", ] -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.17.0" @@ -2137,12 +2089,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - [[package]] name = "pin-project" version = "1.0.12" @@ -2504,109 +2450,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rome_console" -version = "0.0.0" -dependencies = [ - "atty", - "rome_markup", - "rome_text_size", - "schemars", - "serde", - "termcolor", - "unicode-width", -] - -[[package]] -name = "rome_diagnostics" -version = "0.0.0" -dependencies = [ - "backtrace", - "bitflags", - "pico-args 0.5.0", - "rome_console", - "rome_diagnostics_categories", - "rome_diagnostics_macros", - "rome_rowan", - "rome_text_edit", - "rome_text_size", - "serde", - "termcolor", - "unicode-width", -] - -[[package]] -name = "rome_diagnostics_categories" -version = "0.0.0" -dependencies = [ - "quote", - "serde", -] - -[[package]] -name = "rome_diagnostics_macros" -version = "0.0.0" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "rome_formatter" -version = "0.0.0" -dependencies = [ - "cfg-if", - "countme", - "drop_bomb", - "indexmap", - "rome_console", - "rome_diagnostics", - "rome_rowan", - "rustc-hash", - "tracing", - "unicode-width", -] - -[[package]] -name = "rome_markup" -version = "0.0.0" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -] - -[[package]] -name = "rome_rowan" -version = "0.0.0" -dependencies = [ - "countme", - "hashbrown", - "memoffset 0.6.5", - "rome_text_edit", - "rome_text_size", - "rustc-hash", - "tracing", -] - -[[package]] -name = "rome_text_edit" -version = "0.0.0" -dependencies = [ - "rome_text_size", - "serde", - "similar", -] - -[[package]] -name = "rome_text_size" -version = "0.0.0" -dependencies = [ - "serde", -] - [[package]] name = "ruff" version = "0.0.246" @@ -2770,8 +2613,8 @@ dependencies = [ "clap 4.1.4", "insta", "once_cell", - "rome_formatter", - "rome_text_size", + "ruff_formatter", + "ruff_text_size", "rustc-hash", "rustpython-common", "rustpython-parser", @@ -2798,12 +2641,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -3126,10 +2963,6 @@ name = "similar" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" -dependencies = [ - "bstr 0.2.17", - "unicode-segmentation", -] [[package]] name = "siphasher" @@ -3749,12 +3582,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.10" diff --git a/crates/ruff_python_formatter/Cargo.toml b/crates/ruff_python_formatter/Cargo.toml index efd1d079ef968e..f140529b8b26d2 100644 --- a/crates/ruff_python_formatter/Cargo.toml +++ b/crates/ruff_python_formatter/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" anyhow = "1.0.68" clap = { version = "4.0.1", features = ["derive"] } once_cell = "1.17.0" -rome_formatter = { path = "../../../tools/crates/rome_formatter" } -rome_text_size = { path = "../../../tools/crates/rome_text_size" } +ruff_formatter = { path = "../ruff_formatter" } +ruff_text_size = { path = "../ruff_text_size" } rustc-hash = "1.1.0" rustpython-common = { workspace = true } rustpython-parser = { workspace = true } diff --git a/crates/ruff_python_formatter/src/builders.rs b/crates/ruff_python_formatter/src/builders.rs index 431f899df5f84e..bea38cf88226de 100644 --- a/crates/ruff_python_formatter/src/builders.rs +++ b/crates/ruff_python_formatter/src/builders.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::{write, Format}; +use ruff_formatter::prelude::*; +use ruff_formatter::{write, Format}; use crate::context::ASTFormatContext; use crate::core::types::Range; @@ -13,7 +13,7 @@ pub struct Literal { impl Format> for Literal { fn fmt(&self, f: &mut Formatter>) -> FormatResult<()> { let (text, start, end) = f.context().locator().slice(self.range); - f.write_element(FormatElement::Text { text, start, end }) + f.write_element(FormatElement::StaticTextSlice { text, start, end }) } } diff --git a/crates/ruff_python_formatter/src/context.rs b/crates/ruff_python_formatter/src/context.rs index 8a10c331ba4e8d..75adddeaa517fc 100644 --- a/crates/ruff_python_formatter/src/context.rs +++ b/crates/ruff_python_formatter/src/context.rs @@ -1,4 +1,4 @@ -use rome_formatter::{FormatContext, SimpleFormatOptions, TransformSourceMap}; +use ruff_formatter::{FormatContext, SimpleFormatOptions}; use crate::core::locator::Locator; @@ -19,10 +19,6 @@ impl FormatContext for ASTFormatContext<'_> { fn options(&self) -> &Self::Options { &self.options } - - fn source_map(&self) -> Option<&TransformSourceMap> { - None - } } impl<'a> ASTFormatContext<'a> { diff --git a/crates/ruff_python_formatter/src/format/alias.rs b/crates/ruff_python_formatter/src/format/alias.rs index 72bc5c61764513..5ed0b47d08b7b7 100644 --- a/crates/ruff_python_formatter/src/format/alias.rs +++ b/crates/ruff_python_formatter/src/format/alias.rs @@ -1,6 +1,6 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; -use rome_text_size::TextSize; +use ruff_formatter::prelude::*; +use ruff_formatter::write; +use ruff_text_size::TextSize; use crate::context::ASTFormatContext; use crate::cst::Alias; diff --git a/crates/ruff_python_formatter/src/format/arg.rs b/crates/ruff_python_formatter/src/format/arg.rs index b4d31687a59d6e..b0357ce9d0538c 100644 --- a/crates/ruff_python_formatter/src/format/arg.rs +++ b/crates/ruff_python_formatter/src/format/arg.rs @@ -1,6 +1,6 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; -use rome_text_size::TextSize; +use ruff_formatter::prelude::*; +use ruff_formatter::write; +use ruff_text_size::TextSize; use crate::context::ASTFormatContext; use crate::cst::Arg; diff --git a/crates/ruff_python_formatter/src/format/arguments.rs b/crates/ruff_python_formatter/src/format/arguments.rs index 204bf36d849b81..d2a83f7d880b38 100644 --- a/crates/ruff_python_formatter/src/format/arguments.rs +++ b/crates/ruff_python_formatter/src/format/arguments.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::{format_args, write, Format}; +use ruff_formatter::prelude::*; +use ruff_formatter::{format_args, write, Format}; use crate::context::ASTFormatContext; use crate::cst::Arguments; diff --git a/crates/ruff_python_formatter/src/format/boolop.rs b/crates/ruff_python_formatter/src/format/boolop.rs index 20fc65752a40b4..7c09e2e1f52526 100644 --- a/crates/ruff_python_formatter/src/format/boolop.rs +++ b/crates/ruff_python_formatter/src/format/boolop.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Boolop; diff --git a/crates/ruff_python_formatter/src/format/builders.rs b/crates/ruff_python_formatter/src/format/builders.rs index 0c8ab67b9ca80d..2f72837a5f1596 100644 --- a/crates/ruff_python_formatter/src/format/builders.rs +++ b/crates/ruff_python_formatter/src/format/builders.rs @@ -1,6 +1,6 @@ -use rome_formatter::prelude::*; -use rome_formatter::{write, Format}; -use rome_text_size::TextSize; +use ruff_formatter::prelude::*; +use ruff_formatter::{write, Format}; +use ruff_text_size::TextSize; use crate::context::ASTFormatContext; use crate::cst::Stmt; diff --git a/crates/ruff_python_formatter/src/format/cmpop.rs b/crates/ruff_python_formatter/src/format/cmpop.rs index be11f54c5d06a0..28ad432ce86620 100644 --- a/crates/ruff_python_formatter/src/format/cmpop.rs +++ b/crates/ruff_python_formatter/src/format/cmpop.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Cmpop; diff --git a/crates/ruff_python_formatter/src/format/comprehension.rs b/crates/ruff_python_formatter/src/format/comprehension.rs index 711c11b953e978..b8b159342dfc4c 100644 --- a/crates/ruff_python_formatter/src/format/comprehension.rs +++ b/crates/ruff_python_formatter/src/format/comprehension.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Comprehension; diff --git a/crates/ruff_python_formatter/src/format/expr.rs b/crates/ruff_python_formatter/src/format/expr.rs index f9d8d7b16dc918..bdb9de589f1e26 100644 --- a/crates/ruff_python_formatter/src/format/expr.rs +++ b/crates/ruff_python_formatter/src/format/expr.rs @@ -1,8 +1,8 @@ #![allow(unused_variables, clippy::too_many_arguments)] -use rome_formatter::prelude::*; -use rome_formatter::{format_args, write}; -use rome_text_size::TextSize; +use ruff_formatter::prelude::*; +use ruff_formatter::{format_args, write}; +use ruff_text_size::TextSize; use rustpython_parser::ast::Constant; use crate::builders::literal; diff --git a/crates/ruff_python_formatter/src/format/operator.rs b/crates/ruff_python_formatter/src/format/operator.rs index 0fc7dab3b0f953..95d9c47fbd2072 100644 --- a/crates/ruff_python_formatter/src/format/operator.rs +++ b/crates/ruff_python_formatter/src/format/operator.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Operator; diff --git a/crates/ruff_python_formatter/src/format/stmt.rs b/crates/ruff_python_formatter/src/format/stmt.rs index 82c888246b0b26..9cc2593474d701 100644 --- a/crates/ruff_python_formatter/src/format/stmt.rs +++ b/crates/ruff_python_formatter/src/format/stmt.rs @@ -1,8 +1,8 @@ #![allow(unused_variables, clippy::too_many_arguments)] -use rome_formatter::prelude::*; -use rome_formatter::{format_args, write}; -use rome_text_size::TextSize; +use ruff_formatter::prelude::*; +use ruff_formatter::{format_args, write}; +use ruff_text_size::TextSize; use crate::builders::literal; use crate::context::ASTFormatContext; diff --git a/crates/ruff_python_formatter/src/format/unaryop.rs b/crates/ruff_python_formatter/src/format/unaryop.rs index 16b886e7e55d64..9ed9abc607648f 100644 --- a/crates/ruff_python_formatter/src/format/unaryop.rs +++ b/crates/ruff_python_formatter/src/format/unaryop.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Unaryop; diff --git a/crates/ruff_python_formatter/src/format/withitem.rs b/crates/ruff_python_formatter/src/format/withitem.rs index 5e5d86517f41dd..50c309f86d576f 100644 --- a/crates/ruff_python_formatter/src/format/withitem.rs +++ b/crates/ruff_python_formatter/src/format/withitem.rs @@ -1,5 +1,5 @@ -use rome_formatter::prelude::*; -use rome_formatter::write; +use ruff_formatter::prelude::*; +use ruff_formatter::write; use crate::context::ASTFormatContext; use crate::cst::Withitem; diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs index 0d2a038fd0a0ef..2d24a367912b29 100644 --- a/crates/ruff_python_formatter/src/lib.rs +++ b/crates/ruff_python_formatter/src/lib.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use rome_formatter::{format, Formatted, IndentStyle, SimpleFormatOptions}; +use ruff_formatter::{format, Formatted, IndentStyle, SimpleFormatOptions}; use rustpython_parser::lexer::LexResult; use crate::attachment::attach; diff --git a/crates/ruff_python_formatter/src/shared_traits.rs b/crates/ruff_python_formatter/src/shared_traits.rs index 65fe527fa32f6a..ff2fbf0c0c9277 100644 --- a/crates/ruff_python_formatter/src/shared_traits.rs +++ b/crates/ruff_python_formatter/src/shared_traits.rs @@ -2,7 +2,7 @@ /// Used to get an object that knows how to format this object. pub trait AsFormat { - type Format<'a>: rome_formatter::Format + type Format<'a>: ruff_formatter::Format where Self: 'a; @@ -41,7 +41,7 @@ where /// /// The difference to [`AsFormat`] is that this trait takes ownership of `self`. pub trait IntoFormat { - type Format: rome_formatter::Format; + type Format: ruff_formatter::Format; fn into_format(self) -> Self::Format; }