Point to local crates

astral-sh · Feb 14, 2023 · ddd458a · ddd458a
1 parent 9886f33
commit ddd458a
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 219 deletions.
diff --git 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
diff --git 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
@@ -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<ASTFormatContext<'_>> for Literal {
  fn fmt(&self, f: &mut Formatter<ASTFormatContext<'_>>) -> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;