style: Sort imports

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

lutra/bindings/python/src/lib.rs

@@ -1,9 +1,9 @@
 #![cfg(not(target_family = "wasm"))]
 
-use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
-use itertools::Itertools;
 use std::str::FromStr;
 
+use arrow::{pyarrow::PyArrowType, record_batch::RecordBatch};
+use itertools::Itertools;
 use pyo3::prelude::*;
 
 #[pymodule]

prqlc/bindings/java/src/lib.rs

@@ -1,8 +1,9 @@
+use std::str::FromStr;
+
 use jni::objects::{JClass, JString};
 use jni::sys::{jboolean, jstring};
 use jni::JNIEnv;
 use prqlc::{json, pl_to_prql, prql_to_pl, ErrorMessages, Options, Target};
-use std::str::FromStr;
 
 #[no_mangle]
 #[allow(non_snake_case)]

prqlc/bindings/prqlc-c/src/lib.rs

@@ -2,13 +2,14 @@
 
 extern crate libc;
 
-use libc::{c_char, size_t};
-use prqlc::ErrorMessages;
-use prqlc::Target;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::str::FromStr;
 
+use libc::{c_char, size_t};
+use prqlc::ErrorMessages;
+use prqlc::Target;
+
 /// Compile a PRQL string into a SQL string.
 ///
 /// This is a wrapper for: `prql_to_pl`, `pl_to_rq` and `rq_to_sql` without converting to JSON

prqlc/bindings/prqlc-python/src/lib.rs

@@ -134,9 +134,10 @@ pub fn get_targets() -> Vec<String> {
 #[cfg(not(feature = "extension-module"))]
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn parse_for_python() {
  let opts = Some(CompileOptions {

prqlc/prqlc-ast/src/error.rs

@@ -191,9 +191,10 @@ impl<T, E: WithErrorInfo> WithErrorInfo for Result<T, E> {
 
 #[cfg(test)]
 mod tests {
- use super::*;
  use insta::{assert_debug_snapshot, assert_snapshot};
 
+ use super::*;
+
  // Helper function to create a simple Error object
  fn create_simple_error() -> Error {
  Error::new_simple("A simple error message")

prqlc/prqlc-ast/src/expr.rs

@@ -3,15 +3,14 @@ mod ident;
 mod literal;
 mod ops;
 
-pub use ident::Ident;
-pub use literal::{Literal, ValueAndUnit};
-pub use ops::{BinOp, UnOp};
-
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 
+pub use self::ident::Ident;
+pub use self::literal::{Literal, ValueAndUnit};
+pub use self::ops::{BinOp, UnOp};
 use crate::{Span, Ty};
 
 impl Expr {

prqlc/prqlc-ast/src/span.rs

@@ -1,8 +1,9 @@
-use serde::de::Visitor;
-use serde::{Deserialize, Serialize};
 use std::fmt::{self, Debug, Formatter};
 use std::ops::Range;
 
+use serde::de::Visitor;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct Span {
  pub start: usize,

prqlc/prqlc-ast/src/types.rs

@@ -2,9 +2,8 @@ use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 use strum::AsRefStr;
 
-use crate::{Ident, Span};
-
 use super::Literal;
+use crate::{Ident, Span};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Ty {

prqlc/prqlc-parser/src/expr.rs

@@ -1,16 +1,14 @@
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-
 use prqlc_ast::expr::*;
 use prqlc_ast::Span;
 
-use crate::types::type_expr;
-
 use super::common::*;
 use super::interpolation;
 use super::lexer::TokenKind;
 use super::span::ParserSpan;
+use crate::types::type_expr;
 
 pub fn expr_call() -> impl Parser<TokenKind, Expr, Error = PError> {
  let expr = expr();

prqlc/prqlc-parser/src/interpolation.rs

@@ -2,11 +2,10 @@ use chumsky::{error::Cheap, prelude::*};
 use itertools::Itertools;
 use prqlc_ast::expr::*;
 
-use crate::Span;
-
 use super::common::{into_expr, PError};
 use super::lexer::*;
 use super::span::ParserSpan;
+use crate::Span;
 
 /// Parses interpolated strings
 pub fn parse(string: String, span_base: ParserSpan) -> Result<Vec<InterpolateItem>, Vec<PError>> {

prqlc/prqlc-parser/src/lexer.rs

@@ -3,7 +3,6 @@ use chumsky::{
  prelude::*,
  text::{newline, Character},
 };
-
 use prqlc_ast::expr::*;
 use serde::{Deserialize, Serialize};
 
@@ -594,10 +593,11 @@ pub struct TokenVec(pub Vec<Token>);
 
 #[cfg(test)]
 mod test {
- use super::*;
  use insta::assert_debug_snapshot;
  use insta::assert_snapshot;
 
+ use super::*;
+
  #[test]
  fn line_wrap() {
  assert_debug_snapshot!(TokenVec(lexer().parse(r"5 +

prqlc/prqlc-parser/src/lib.rs

@@ -9,14 +9,13 @@ mod types;
 
 use chumsky::error::SimpleReason;
 use chumsky::{prelude::*, Stream};
-
 use prqlc_ast::error::{Error, Reason, WithErrorInfo};
 use prqlc_ast::stmt::*;
 use prqlc_ast::Span;
 
-use lexer::Token;
-pub use lexer::{TokenKind, TokenVec};
-use span::ParserSpan;
+use self::lexer::Token;
+pub use self::lexer::{TokenKind, TokenVec};
+use self::span::ParserSpan;
 
 /// Build PRQL AST from a PRQL query string.
 pub fn parse_source(source: &str, source_id: u16) -> Result<Vec<Stmt>, Vec<Error>> {
@@ -70,12 +69,12 @@ pub fn lex_source(source: &str) -> Result<TokenVec, Vec<Error>> {
 
 mod common {
  use chumsky::prelude::*;
+ use prqlc_ast::expr::*;
+ use prqlc_ast::stmt::*;
  use prqlc_ast::Ty;
  use prqlc_ast::TyKind;
 
  use super::{lexer::TokenKind, span::ParserSpan};
- use prqlc_ast::expr::*;
- use prqlc_ast::stmt::*;
 
  pub type PError = Simple<TokenKind, ParserSpan>;
 

prqlc/prqlc-parser/src/stmt.rs

@@ -1,17 +1,15 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 
 use chumsky::prelude::*;
-use semver::VersionReq;
-
+use itertools::Itertools;
 use prqlc_ast::expr::*;
 use prqlc_ast::stmt::*;
-
-use crate::types::type_expr;
+use semver::VersionReq;
 
 use super::common::*;
 use super::expr::*;
 use super::lexer::TokenKind;
+use crate::types::type_expr;
 
 pub fn source() -> impl Parser<TokenKind, Vec<Stmt>, Error = PError> {
  query_def()

prqlc/prqlc-parser/src/types.rs

@@ -1,11 +1,9 @@
 use chumsky::prelude::*;
-
 use prqlc_ast::*;
 
-use crate::expr::ident;
-
 use super::common::*;
 use super::lexer::TokenKind;
+use crate::expr::ident;
 
 pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
  recursive(|nested_type_expr| {

prqlc/prqlc/examples/compile-files/build.rs

@@ -1,6 +1,7 @@
-use prqlc::{compile, Options};
 use std::{env, fs, path::Path};
 
+use prqlc::{compile, Options};
+
 fn main() {
  // we expect queries to reside in `queries/` dir
  let paths = fs::read_dir("./queries").unwrap();

prqlc/prqlc/src/cli/docs_generator.rs

@@ -311,9 +311,10 @@ Generated with [prqlc](https://prql-lang.org/) {}.
 
 #[cfg(test)]
 mod tests {
+ use std::process::Command;
+
  use insta_cmd::assert_cmd_snapshot;
  use insta_cmd::get_cargo_bin;
- use std::process::Command;
 
  #[test]
  fn generate_markdown_docs() {

prqlc/prqlc/src/cli/mod.rs

@@ -19,7 +19,6 @@ use clio::has_extension;
 use clio::Output;
 use is_terminal::IsTerminal;
 use itertools::Itertools;
-
 use prqlc::semantic;
 use prqlc::semantic::reporting::{collect_frames, label_references};
 use prqlc::semantic::NS_DEFAULT_DB;

prqlc/prqlc/src/codegen/ast.rs

@@ -1,13 +1,11 @@
 use std::collections::HashSet;
 
 use once_cell::sync::Lazy;
-
-use crate::ast::*;
 use regex::Regex;
 
-use crate::codegen::SeparatedExprs;
-
 use super::{WriteOpt, WriteSource};
+use crate::ast::*;
+use crate::codegen::SeparatedExprs;
 
 pub(crate) fn write_expr(expr: &Expr) -> String {
  expr.write(WriteOpt::new_width(u16::MAX)).unwrap()

prqlc/prqlc/src/codegen/mod.rs

@@ -203,9 +203,10 @@ impl<'a, T: WriteSource> SeparatedExprs<'a, T> {
 
 #[cfg(test)]
 mod test {
+ use insta::assert_snapshot;
+
  use super::*;
  use crate::ast::{Expr, ExprKind, Literal};
- use insta::assert_snapshot;
 
  #[test]
  fn test_string_quoting() {

prqlc/prqlc/src/codegen/types.rs

@@ -1,8 +1,7 @@
+use super::{WriteOpt, WriteSource};
 use crate::ast::*;
 use crate::codegen::SeparatedExprs;
 
-use super::{WriteOpt, WriteSource};
-
 pub(crate) fn write_ty(ty: &Ty) -> String {
  ty.write(WriteOpt::new_width(u16::MAX)).unwrap()
 }

prqlc/prqlc/src/error_message.rs

@@ -1,17 +1,15 @@
-use anstream::adapter::strip_str;
-
-use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
-use serde::Serialize;
-
 use std::error::Error as StdError;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Range;
 use std::path::PathBuf;
 use std::{collections::HashMap, io::stderr};
 
-use crate::{Error, Errors, MessageKind, SourceTree};
+use anstream::adapter::strip_str;
+use ariadne::{Cache, Config, Label, Report, ReportKind, Source};
+use serde::Serialize;
 
 pub use crate::ir::Span;
+use crate::{Error, Errors, MessageKind, SourceTree};
 
 #[derive(Clone, Serialize)]
 pub struct ErrorMessage {

prqlc/prqlc/src/ir/constant.rs

@@ -1,6 +1,7 @@
-use crate::ast::{Literal, Span};
 use serde::{Deserialize, Serialize};
 
+use crate::ast::{Literal, Span};
+
 /// A subset of PL expressions that are constant.
 #[derive(Serialize, Deserialize)]
 pub struct ConstExpr {

prqlc/prqlc/src/ir/decl.rs

@@ -1,8 +1,9 @@
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use enum_as_inner::EnumAsInner;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fmt::Debug;
 
 use crate::ast::{Span, Ty};
 use crate::codegen::write_ty;

prqlc/prqlc/src/ir/pl/expr.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use enum_as_inner::EnumAsInner;
-
 use serde::{Deserialize, Serialize};
 
+use super::{Lineage, TransformCall};
 use crate::ast::generic;
 use crate::ast::{GenericTypeParam, Ident, Literal, Span, Ty};
-
 use crate::codegen::write_ty;
 
-use super::{Lineage, TransformCall};
-
 // The following code is tested by the tests_misc crate to match expr.rs in prqlc_ast.
 
 /// Expr is anything that has a value and thus a type.

prqlc/prqlc/src/ir/pl/fold.rs

@@ -3,11 +3,10 @@
 /// type.
 use itertools::Itertools;
 
+use super::*;
 use crate::ast::{Ty, TyFunc, TyKind, TyTupleField};
 use crate::Result;
 
-use super::*;
-
 // Fold pattern:
 // - https://rust-unofficial.github.io/patterns/patterns/creational/fold.html
 // Good discussions on the visitor / fold pattern:

prqlc/prqlc/src/ir/pl/mod.rs

@@ -24,13 +24,13 @@ pub use self::utils::*;
 pub use crate::ast::{BinOp, BinaryExpr, Ident, Literal, UnOp, UnaryExpr, ValueAndUnit};
 
 pub fn print_mem_sizes() {
+ use std::mem::size_of;
+
  use crate::ast::{PrimitiveSet, Ty, TyFunc, TyKind, TyTupleField};
  use crate::ir::{decl, generic, pl, rq};
  use crate::sql::internal::SqlTransform;
  use crate::{ErrorMessage, ErrorMessages, SourceTree, Span};
 
- use std::mem::size_of;
-
  println!("{:16}= {}", "Annotation", size_of::<Annotation>());
  println!("{:16}= {}", "BinaryExpr", size_of::<BinaryExpr>());
  println!("{:16}= {}", "BinOp", size_of::<BinOp>());

prqlc/prqlc/src/ir/pl/stmt.rs

@@ -2,11 +2,10 @@ use enum_as_inner::EnumAsInner;
 use prqlc_ast::Ident;
 use serde::{Deserialize, Serialize};
 
+use super::expr::Expr;
 pub use crate::ast::stmt::QueryDef;
 use crate::ast::{Span, Ty};
 
-use super::expr::Expr;
-
 // The following code is tested by the tests_misc crate to match stmt.rs in prqlc_ast.
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]