style: format imports

cli/src/tests/async_context_test.rs

@@ -1,10 +1,14 @@
-use super::helpers::fixtures::get_language;
-use std::future::Future;
-use std::pin::{pin, Pin};
-use std::ptr;
-use std::task::{self, Context, Poll, RawWaker, RawWakerVTable, Waker};
+use std::{
+    future::Future,
+    pin::{pin, Pin},
+    ptr,
+    task::{self, Context, Poll, RawWaker, RawWakerVTable, Waker},
+};
+
 use tree_sitter::Parser;
 
+use super::helpers::fixtures::get_language;
+
 #[test]
 fn test_node_in_fut() {
     let (ret, pended) = tokio_like_spawn(async {

cli/src/tests/corpus_test.rs

@@ -1,3 +1,8 @@
+use std::{collections::HashMap, env, fs};
+
+use tree_sitter::{LogType, Node, Parser, Point, Range, Tree};
+use tree_sitter_proc_macro::test_with_seed;
+
 use super::helpers::{
     allocations,
     edits::{get_random_edit, invert_edit},
@@ -14,9 +19,6 @@ use crate::{
     test::{parse_tests, print_diff, print_diff_key, strip_sexp_fields, TestEntry},
     util,
 };
-use std::{collections::HashMap, env, fs};
-use tree_sitter::{LogType, Node, Parser, Point, Range, Tree};
-use tree_sitter_proc_macro::test_with_seed;
 
 #[test_with_seed(retry=10, seed=*START_SEED, seed_fn=new_seed)]
 fn test_corpus_for_bash(seed: usize) {

cli/src/tests/detect_language.rs

@@ -1,8 +1,9 @@
-use crate::tests::helpers::fixtures::scratch_dir;
+use std::{fs, path::Path};
 
-use std::path::Path;
 use tree_sitter_loader::Loader;
 
+use crate::tests::helpers::fixtures::scratch_dir;
+
 #[test]
 fn detect_language_by_first_line_regex() {
     let strace_dir = tree_sitter_dir(

cli/src/tests/helpers/edits.rs

@@ -1,7 +1,7 @@
+use std::{ops::Range, str};
+
 use super::random::Rand;
 use crate::parse::Edit;
-use std::ops::Range;
-use std::str;
 
 #[derive(Debug)]
 pub struct ReadRecorder<'a> {

cli/src/tests/helpers/fixtures.rs

@@ -1,7 +1,10 @@
+use std::{
+    env, fs,
+    path::{Path, PathBuf},
+};
+
 use anyhow::Context;
 use lazy_static::lazy_static;
-use std::path::{Path, PathBuf};
-use std::{env, fs};
 use tree_sitter::Language;
 use tree_sitter_highlight::HighlightConfiguration;
 use tree_sitter_loader::{CompileConfig, Loader};

cli/src/tests/helpers/mod.rs

@@ -5,9 +5,10 @@ pub(super) mod query_helpers;
 pub(super) mod random;
 pub(super) mod scope_sequence;
 
+use std::env;
+
 use lazy_static::lazy_static;
 use rand::Rng;
-use std::env;
 
 lazy_static! {
     pub static ref LOG_ENABLED: bool = env::var("TREE_SITTER_LOG").is_ok();

cli/src/tests/helpers/query_helpers.rs

@@ -1,5 +1,6 @@
-use rand::prelude::Rng;
 use std::{cmp::Ordering, fmt::Write, ops::Range};
+
+use rand::prelude::Rng;
 use tree_sitter::{
     Language, Node, Parser, Point, Query, QueryCapture, QueryCursor, QueryMatch, Tree, TreeCursor,
 };

cli/src/tests/highlight_test.rs

@@ -1,13 +1,18 @@
-use super::helpers::fixtures::{get_highlight_config, get_language, get_language_queries_path};
+use std::{
+    ffi::CString,
+    fs,
+    os::raw::c_char,
+    ptr, slice, str,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+
 use lazy_static::lazy_static;
-use std::ffi::CString;
-use std::os::raw::c_char;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::{fs, ptr, slice, str};
 use tree_sitter_highlight::{
     c, Error, Highlight, HighlightConfiguration, HighlightEvent, Highlighter, HtmlRenderer,
 };
 
+use super::helpers::fixtures::{get_highlight_config, get_language, get_language_queries_path};
+
 lazy_static! {
     static ref JS_HIGHLIGHT: HighlightConfiguration =
         get_highlight_config("javascript", Some("injections.scm"), &HIGHLIGHT_NAMES);

cli/src/tests/language_test.rs

@@ -1,6 +1,7 @@
-use super::helpers::fixtures::get_language;
 use tree_sitter::Parser;
 
+use super::helpers::fixtures::get_language;
+
 #[test]
 fn test_lookahead_iterator() {
     let mut parser = Parser::new();

cli/src/tests/node_test.rs

@@ -1,11 +1,14 @@
-use super::helpers::edits::get_random_edit;
-use super::helpers::fixtures::{fixtures_dir, get_language, get_test_language};
-use super::helpers::random::Rand;
-use crate::generate::generate_parser_for_grammar;
-use crate::parse::perform_edit;
 use std::fs;
+
 use tree_sitter::{Node, Parser, Point, Tree};
 
+use super::helpers::{
+    edits::get_random_edit,
+    fixtures::{fixtures_dir, get_language, get_test_language},
+    random::Rand,
+};
+use crate::{generate::generate_parser_for_grammar, parse::perform_edit};
+
 const JSON_EXAMPLE: &str = r#"
 
 [

cli/src/tests/parser_hang_test.rs

@@ -1,15 +1,17 @@
 // For some reasons `Command::spawn` doesn't work in CI env for many exotic arches.
 #![cfg(all(any(target_arch = "x86_64", target_arch = "x86"), not(sanitizing)))]
 
+use std::{
+    env::VarError,
+    process::{Command, Stdio},
+};
+
+use tree_sitter::Parser;
+
 use crate::{
     generate::{generate_parser_for_grammar, load_grammar_file},
     tests::helpers::fixtures::{fixtures_dir, get_test_language},
 };
-use std::{
-    env::VarError,
-    process::{Command, Stdio},
-};
-use tree_sitter::Parser;
 
 // The `sanitizing` cfg is required to don't run tests under specific sunitizer
 // because they don't work well with subprocesses _(it's an assumption)_.

cli/src/tests/parser_test.rs

@@ -1,3 +1,12 @@
+use std::{
+    fs,
+    sync::atomic::{AtomicUsize, Ordering},
+    thread, time,
+};
+
+use tree_sitter::{IncludedRangesError, InputEdit, LogType, Parser, Point, Range};
+use tree_sitter_proc_macro::retry;
+
 use super::helpers::{
     allocations,
     edits::{invert_edit, ReadRecorder},
@@ -8,13 +17,6 @@ use crate::{
     parse::{perform_edit, Edit},
     tests::helpers::fixtures::fixtures_dir,
 };
-use std::{
-    fs,
-    sync::atomic::{AtomicUsize, Ordering},
-    thread, time,
-};
-use tree_sitter::{IncludedRangesError, InputEdit, LogType, Parser, Point, Range};
-use tree_sitter_proc_macro::retry;
 
 #[test]
 fn test_parsing_simple_string() {

cli/src/tests/pathological_test.rs

@@ -1,6 +1,7 @@
-use super::helpers::{allocations, fixtures::get_language};
 use tree_sitter::Parser;
 
+use super::helpers::{allocations, fixtures::get_language};
+
 #[test]
 fn test_pathological_example_1() {
     let language = "cpp";

cli/src/tests/query_test.rs

@@ -1,3 +1,14 @@
+use std::{env, fmt::Write};
+
+use indoc::indoc;
+use lazy_static::lazy_static;
+use rand::{prelude::StdRng, SeedableRng};
+use tree_sitter::{
+    CaptureQuantifier, Language, Node, Parser, Point, Query, QueryCursor, QueryError,
+    QueryErrorKind, QueryPredicate, QueryPredicateArg, QueryProperty,
+};
+use unindent::Unindent;
+
 use super::helpers::{
     allocations,
     fixtures::{get_language, get_test_language},
@@ -8,15 +19,6 @@ use crate::{
     generate::generate_parser_for_grammar,
     tests::helpers::query_helpers::{collect_captures, collect_matches},
 };
-use indoc::indoc;
-use lazy_static::lazy_static;
-use rand::{prelude::StdRng, SeedableRng};
-use std::{env, fmt::Write};
-use tree_sitter::{
-    CaptureQuantifier, Language, Node, Parser, Point, Query, QueryCursor, QueryError,
-    QueryErrorKind, QueryPredicate, QueryPredicateArg, QueryProperty,
-};
-use unindent::Unindent;
 
 lazy_static! {
     static ref EXAMPLE_FILTER: Option<String> = env::var("TREE_SITTER_TEST_EXAMPLE_FILTER").ok();

cli/src/tests/tags_test.rs

@@ -1,14 +1,16 @@
-use super::helpers::{
-    allocations,
-    fixtures::{get_language, get_language_queries_path},
-};
 use std::{
     ffi::{CStr, CString},
     fs, ptr, slice, str,
 };
+
 use tree_sitter::Point;
 use tree_sitter_tags::{c_lib as c, Error, TagsConfiguration, TagsContext};
 
+use super::helpers::{
+    allocations,
+    fixtures::{get_language, get_language_queries_path},
+};
+
 const PYTHON_TAG_QUERY: &str = r#"
 (
   (function_definition

cli/src/tests/test_highlight_test.rs

@@ -1,9 +1,12 @@
-use super::helpers::fixtures::{get_highlight_config, get_language, test_loader};
-use crate::query_testing::{parse_position_comments, Assertion};
-use crate::test_highlight::get_highlight_positions;
 use tree_sitter::{Parser, Point};
 use tree_sitter_highlight::{Highlight, Highlighter};
 
+use super::helpers::fixtures::{get_highlight_config, get_language, test_loader};
+use crate::{
+    query_testing::{parse_position_comments, Assertion},
+    test_highlight::get_highlight_positions,
+};
+
 #[test]
 fn test_highlight_test_with_basic_test() {
     let language = get_language("javascript");

cli/src/tests/test_tags_test.rs

@@ -1,9 +1,12 @@
-use super::helpers::fixtures::{get_language, get_tags_config};
-use crate::query_testing::{parse_position_comments, Assertion};
-use crate::test_tags::get_tag_positions;
 use tree_sitter::{Parser, Point};
 use tree_sitter_tags::TagsContext;
 
+use super::helpers::fixtures::{get_language, get_tags_config};
+use crate::{
+    query_testing::{parse_position_comments, Assertion},
+    test_tags::get_tag_positions,
+};
+
 #[test]
 fn test_tags_test_with_basic_test() {
     let language = get_language("python");

cli/src/tests/text_provider_test.rs

@@ -1,8 +1,9 @@
 use std::{iter, sync::Arc};
 
-use crate::tests::helpers::fixtures::get_language;
 use tree_sitter::{Language, Node, Parser, Point, Query, QueryCursor, TextProvider, Tree};
 
+use crate::tests::helpers::fixtures::get_language;
+
 fn parse_text(text: impl AsRef<[u8]>) -> (Tree, Language) {
     let language = get_language("c");
     let mut parser = Parser::new();

cli/src/tests/tree_test.rs

@@ -1,9 +1,10 @@
-use super::helpers::edits::invert_edit;
-use super::helpers::fixtures::get_language;
-use crate::parse::{perform_edit, Edit};
 use std::str;
+
 use tree_sitter::{InputEdit, Parser, Point, Range, Tree};
 
+use super::helpers::{edits::invert_edit, fixtures::get_language};
+use crate::parse::{perform_edit, Edit};
+
 #[test]
 fn test_tree_edit() {
     let mut parser = Parser::new();

cli/src/tests/wasm_language_test.rs

@@ -1,10 +1,12 @@
-use crate::tests::helpers::{allocations, fixtures::WASM_DIR};
-use lazy_static::lazy_static;
 use std::fs;
+
+use lazy_static::lazy_static;
 use tree_sitter::{
     wasmtime::Engine, Parser, Query, QueryCursor, WasmError, WasmErrorKind, WasmStore,
 };
 
+use crate::tests::helpers::{allocations, fixtures::WASM_DIR};
+
 lazy_static! {
     static ref ENGINE: Engine = Engine::default();
 }