Remove ast::Location export

Author: MichaReiser

compiler/ast/src/lib.rs

@@ -6,6 +6,4 @@ mod impls;
 
 pub use ast_gen::*;
 
-pub use ruff_text_size::TextSize as Location;
-
 pub type Suite<U = ()> = Vec<Stmt<U>>;

compiler/parser/python.lalrpop

@@ -1721,7 +1721,7 @@ ArgumentList: ArgumentList = {
     }
 };
 
-FunctionArgument: (Option<(ast::Location, ast::Location, Option<String>)>, ast::Expr) = {
+FunctionArgument: (Option<(crate::Location, crate::Location, Option<String>)>, ast::Expr) = {
     <location:@L> <e:NamedExpressionTest> <c:CompFor?> <end_location:@R> => {
         let expr = match c {
             Some(c) => ast::Expr::new(
@@ -1776,7 +1776,7 @@ Identifier: String = <s:name> => s;
 
 // Hook external lexer:
 extern {
-    type Location = ast::Location;
+    type Location = crate::Location;
     type Error = LexicalError;
 
     enum token::Tok {

compiler/parser/src/function.rs

@@ -4,6 +4,7 @@ use crate::{
     ast,
     lexer::{LexicalError, LexicalErrorType},
 };
+use ruff_text_size::TextSize;
 use rustc_hash::FxHashSet;
 
 pub(crate) struct ArgumentList {
@@ -83,10 +84,7 @@ pub(crate) fn parse_params(
     Ok((pos_only, names, defaults))
 }
 
-type FunctionArgument = (
-    Option<(ast::Location, ast::Location, Option<String>)>,
-    ast::Expr,
-);
+type FunctionArgument = (Option<(TextSize, TextSize, Option<String>)>, ast::Expr);
 
 // Parse arguments as supplied during a function/lambda *call*.
 pub(crate) fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, LexicalError> {

compiler/parser/src/lib.rs

@@ -127,10 +127,13 @@ mod context;
 mod soft_keywords;
 mod token;
 
+type Location = TextSize;
+
 pub use mode::Mode;
 pub use parser::{
     parse, parse_expression, parse_expression_located, parse_located, parse_program, parse_tokens,
     ParseError, ParseErrorType,
 };
+use ruff_text_size::TextSize;
 pub use string::FStringErrorType;
 pub use token::{StringKind, Tok};

compiler/parser/src/parser.rs

@@ -13,11 +13,12 @@
 //! [`Mode`]: crate::mode
 
 use crate::{
-    ast::{self, Location},
+    ast::{self},
     lexer::{self, LexResult, LexicalError, LexicalErrorType},
     mode::Mode,
     python,
     token::Tok,
+    Location,
 };
 use itertools::Itertools;
 use std::iter;
@@ -224,6 +225,7 @@ fn parse_error_from_lalrpop(
     source_path: &str,
 ) -> ParseError {
     let source_path = source_path.to_owned();
+
     match err {
         // TODO: Are there cases where this isn't an EOF?
         LalrpopError::InvalidToken { location } => ParseError {

compiler/parser/src/string.rs

@@ -4,10 +4,11 @@
 // regular strings. Since the parser has no definition of f-string formats (Pending PEP 701)
 // we have to do the parsing here, manually.
 use crate::{
-    ast::{Constant, Expr, ExprKind, Location},
+    ast::{Constant, Expr, ExprKind},
     lexer::{LexicalError, LexicalErrorType},
     parser::{parse_expression_located, LalrpopError, ParseError, ParseErrorType},
     token::{StringKind, Tok},
+    Location,
 };
 use itertools::Itertools;
 use ruff_text_size::{TextLen, TextSize};

ruff_text_size/src/size.rs

@@ -42,7 +42,7 @@ impl TextSize {
     /// assert_eq!(TextSize::from(4), TextSize::new(4));
     /// ```
     pub const fn new(offset: u32) -> Self {
-        Self { raw: offset}
+        Self { raw: offset }
     }
 
     /// The text size of some primitive text-like object.