From da1f83fe328fdee19d792f5fb03e3a360868c340 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Wed, 8 Mar 2023 14:11:39 -0500
Subject: [PATCH] Remove `core` module from `ruff_python_formatter` (#3373)

---
 crates/ruff_python_formatter/src/attachment.rs            | 4 ++--
 crates/ruff_python_formatter/src/core/mod.rs              | 2 --
 crates/ruff_python_formatter/src/{core => cst}/helpers.rs | 0
 crates/ruff_python_formatter/src/{cst.rs => cst/mod.rs}   | 5 ++++-
 crates/ruff_python_formatter/src/{core => cst}/visitor.rs | 0
 crates/ruff_python_formatter/src/lib.rs                   | 1 -
 crates/ruff_python_formatter/src/newlines.rs              | 4 ++--
 crates/ruff_python_formatter/src/parentheses.rs           | 6 +++---
 8 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 crates/ruff_python_formatter/src/core/mod.rs
 rename crates/ruff_python_formatter/src/{core => cst}/helpers.rs (100%)
 rename crates/ruff_python_formatter/src/{cst.rs => cst/mod.rs} (99%)
 rename crates/ruff_python_formatter/src/{core => cst}/visitor.rs (100%)

diff --git a/crates/ruff_python_formatter/src/attachment.rs b/crates/ruff_python_formatter/src/attachment.rs
index 7754b99a97..55d6072a96 100644
--- a/crates/ruff_python_formatter/src/attachment.rs
+++ b/crates/ruff_python_formatter/src/attachment.rs
@@ -1,5 +1,5 @@
-use crate::core::visitor;
-use crate::core::visitor::Visitor;
+use crate::cst::visitor;
+use crate::cst::visitor::Visitor;
 use crate::cst::{
     Alias, Arg, Body, BoolOp, CmpOp, Excepthandler, Expr, Keyword, Operator, Pattern, SliceIndex,
     Stmt, UnaryOp,
diff --git a/crates/ruff_python_formatter/src/core/mod.rs b/crates/ruff_python_formatter/src/core/mod.rs
deleted file mode 100644
index 8e6e8a0b73..0000000000
--- a/crates/ruff_python_formatter/src/core/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod helpers;
-pub mod visitor;
diff --git a/crates/ruff_python_formatter/src/core/helpers.rs b/crates/ruff_python_formatter/src/cst/helpers.rs
similarity index 100%
rename from crates/ruff_python_formatter/src/core/helpers.rs
rename to crates/ruff_python_formatter/src/cst/helpers.rs
diff --git a/crates/ruff_python_formatter/src/cst.rs b/crates/ruff_python_formatter/src/cst/mod.rs
similarity index 99%
rename from crates/ruff_python_formatter/src/cst.rs
rename to crates/ruff_python_formatter/src/cst/mod.rs
index c304a1799a..7c5f41999e 100644
--- a/crates/ruff_python_formatter/src/cst.rs
+++ b/crates/ruff_python_formatter/src/cst/mod.rs
@@ -9,9 +9,12 @@ use rustpython_parser::Mode;
 use ruff_python_ast::source_code::Locator;
 use ruff_python_ast::types::Range;
 
-use crate::core::helpers::{expand_indented_block, find_tok, is_elif};
+use crate::cst::helpers::{expand_indented_block, find_tok, is_elif};
 use crate::trivia::{Parenthesize, Trivia};
 
+pub mod helpers;
+pub mod visitor;
+
 type Ident = String;
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/crates/ruff_python_formatter/src/core/visitor.rs b/crates/ruff_python_formatter/src/cst/visitor.rs
similarity index 100%
rename from crates/ruff_python_formatter/src/core/visitor.rs
rename to crates/ruff_python_formatter/src/cst/visitor.rs
diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs
index 89434db479..9211c77f34 100644
--- a/crates/ruff_python_formatter/src/lib.rs
+++ b/crates/ruff_python_formatter/src/lib.rs
@@ -13,7 +13,6 @@ use crate::parentheses::normalize_parentheses;
 mod attachment;
 pub mod cli;
 pub mod context;
-mod core;
 mod cst;
 mod format;
 mod newlines;
diff --git a/crates/ruff_python_formatter/src/newlines.rs b/crates/ruff_python_formatter/src/newlines.rs
index 6c3179b162..29164bec1e 100644
--- a/crates/ruff_python_formatter/src/newlines.rs
+++ b/crates/ruff_python_formatter/src/newlines.rs
@@ -1,7 +1,7 @@
 use rustpython_parser::ast::Constant;
 
-use crate::core::visitor;
-use crate::core::visitor::Visitor;
+use crate::cst::visitor;
+use crate::cst::visitor::Visitor;
 use crate::cst::{
     Alias, Arg, BoolOp, CmpOp, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword, Operator,
     Pattern, SliceIndex, Stmt, StmtKind, UnaryOp,
diff --git a/crates/ruff_python_formatter/src/parentheses.rs b/crates/ruff_python_formatter/src/parentheses.rs
index 22c2432a10..5ad1e15250 100644
--- a/crates/ruff_python_formatter/src/parentheses.rs
+++ b/crates/ruff_python_formatter/src/parentheses.rs
@@ -2,9 +2,9 @@ use rustpython_parser::ast::Constant;
 
 use ruff_python_ast::source_code::Locator;
 
-use crate::core::helpers::is_radix_literal;
-use crate::core::visitor;
-use crate::core::visitor::Visitor;
+use crate::cst::helpers::is_radix_literal;
+use crate::cst::visitor;
+use crate::cst::visitor::Visitor;
 use crate::cst::{Expr, ExprKind, Stmt, StmtKind};
 use crate::trivia::Parenthesize;