Run cargo +nightly fmt --all with the new config

crates/apollo-compiler/examples/file_watcher.rs

@@ -1,16 +1,20 @@
-use std::{
-    collections::HashMap,
-    fs::{self, DirEntry},
-    path::{Path, PathBuf},
-    sync::mpsc::channel,
-    time::Duration,
-};
-
-use anyhow::{anyhow, Result};
+use anyhow::anyhow;
+use anyhow::Result;
 use apollo_compiler::validation::Valid;
 use apollo_compiler::ExecutableDocument;
 use apollo_compiler::Schema;
-use notify::{Config, EventKind, PollWatcher, RecursiveMode, Watcher};
+use notify::Config;
+use notify::EventKind;
+use notify::PollWatcher;
+use notify::RecursiveMode;
+use notify::Watcher;
+use std::collections::HashMap;
+use std::fs;
+use std::fs::DirEntry;
+use std::path::Path;
+use std::path::PathBuf;
+use std::sync::mpsc::channel;
+use std::time::Duration;
 
 fn main() -> Result<()> {
     let dir = Path::new("crates/apollo-compiler/examples/documents");

crates/apollo-compiler/src/diagnostic.rs

@@ -70,11 +70,13 @@
 use crate::execution::GraphQLError;
 use crate::execution::GraphQLLocation;
 use crate::validation::FileId;
+#[cfg(doc)]
+use crate::ExecutableDocument;
 use crate::NodeLocation;
+#[cfg(doc)]
+use crate::Schema;
 use crate::SourceFile;
 use crate::SourceMap;
-#[cfg(doc)]
-use crate::{ExecutableDocument, Schema};
 use ariadne::ColorGenerator;
 use ariadne::ReportKind;
 use std::cell::Cell;

crates/apollo-compiler/src/executable/mod.rs

@@ -17,10 +17,15 @@ pub(crate) mod from_ast;
 mod serialize;
 pub(crate) mod validation;
 
-pub use crate::ast::{
-    Argument, Directive, DirectiveList, Name, NamedType, OperationType, Type, Value,
-    VariableDefinition,
-};
+pub use crate::ast::Argument;
+pub use crate::ast::Directive;
+pub use crate::ast::DirectiveList;
+pub use crate::ast::Name;
+pub use crate::ast::NamedType;
+pub use crate::ast::OperationType;
+pub use crate::ast::Type;
+pub use crate::ast::Value;
+pub use crate::ast::VariableDefinition;
 use crate::validation::DiagnosticList;
 use crate::validation::Valid;
 use crate::validation::WithErrors;

crates/apollo-compiler/src/lib.rs

@@ -15,7 +15,13 @@ pub mod schema;
 pub mod validation;
 
 pub use self::executable::ExecutableDocument;
-pub use self::name::{InvalidNameError, Name};
-pub use self::node::{FileId, Node, NodeLocation};
-pub use self::parser::{parse_mixed_validate, Parser, SourceFile, SourceMap};
+pub use self::name::InvalidNameError;
+pub use self::name::Name;
+pub use self::node::FileId;
+pub use self::node::Node;
+pub use self::node::NodeLocation;
+pub use self::parser::parse_mixed_validate;
+pub use self::parser::Parser;
+pub use self::parser::SourceFile;
+pub use self::parser::SourceMap;
 pub use self::schema::Schema;

crates/apollo-compiler/src/schema/mod.rs

@@ -17,12 +17,21 @@ mod from_ast;
 mod serialize;
 pub(crate) mod validation;
 
-pub use self::component::{Component, ComponentName, ComponentOrigin, ExtensionId};
+pub use self::component::Component;
+pub use self::component::ComponentName;
+pub use self::component::ComponentOrigin;
+pub use self::component::ExtensionId;
 pub use self::from_ast::SchemaBuilder;
-pub use crate::ast::{
-    Directive, DirectiveDefinition, DirectiveLocation, EnumValueDefinition, FieldDefinition,
-    InputValueDefinition, Name, NamedType, Type, Value,
-};
+pub use crate::ast::Directive;
+pub use crate::ast::DirectiveDefinition;
+pub use crate::ast::DirectiveLocation;
+pub use crate::ast::EnumValueDefinition;
+pub use crate::ast::FieldDefinition;
+pub use crate::ast::InputValueDefinition;
+pub use crate::ast::Name;
+pub use crate::ast::NamedType;
+pub use crate::ast::Type;
+pub use crate::ast::Value;
 use crate::name;
 use crate::ty;
 use crate::validation::DiagnosticList;

crates/apollo-compiler/src/validation/argument.rs

@@ -1,6 +1,8 @@
+use crate::ast;
 use crate::validation::diagnostics::DiagnosticData;
-use crate::validation::{DiagnosticList, NodeLocation};
-use crate::{ast, Node};
+use crate::validation::DiagnosticList;
+use crate::validation::NodeLocation;
+use crate::Node;
 use std::collections::HashMap;
 
 pub(crate) fn validate_arguments(

crates/apollo-compiler/src/validation/directive.rs

@@ -1,11 +1,16 @@
 use super::CycleError;
+use crate::ast;
 use crate::coordinate::DirectiveArgumentCoordinate;
 use crate::coordinate::DirectiveCoordinate;
+use crate::schema;
 use crate::validation::diagnostics::DiagnosticData;
 use crate::validation::DiagnosticList;
-use crate::validation::{NodeLocation, RecursionGuard, RecursionStack};
-use crate::{ast, schema, Node};
-use std::collections::{HashMap, HashSet};
+use crate::validation::NodeLocation;
+use crate::validation::RecursionGuard;
+use crate::validation::RecursionStack;
+use crate::Node;
+use std::collections::HashMap;
+use std::collections::HashSet;
 
 /// This struct just groups functions that are used to find self-referential directives.
 /// The way to use it is to call `FindRecursiveDirective::check`.

crates/apollo-compiler/src/validation/enum_.rs

@@ -1,7 +1,9 @@
-use crate::schema::{EnumType, ExtendedType};
+use crate::ast;
+use crate::schema::EnumType;
+use crate::schema::ExtendedType;
 use crate::validation::diagnostics::DiagnosticData;
 use crate::validation::DiagnosticList;
-use crate::{ast, Node};
+use crate::Node;
 
 pub(crate) fn validate_enum_definitions(diagnostics: &mut DiagnosticList, schema: &crate::Schema) {
     for ty in schema.types.values() {

crates/apollo-compiler/src/validation/field.rs

@@ -1,11 +1,15 @@
-use crate::coordinate::{FieldArgumentCoordinate, TypeAttributeCoordinate};
-use crate::validation::diagnostics::DiagnosticData;
-use crate::{ast, executable, schema, ExecutableDocument, Node};
-
+use crate::ast;
 use crate::ast::Name;
+use crate::coordinate::FieldArgumentCoordinate;
+use crate::coordinate::TypeAttributeCoordinate;
+use crate::executable;
+use crate::schema;
 use crate::schema::Component;
+use crate::validation::diagnostics::DiagnosticData;
 use crate::validation::DiagnosticList;
 use crate::validation::OperationValidationContext;
+use crate::ExecutableDocument;
+use crate::Node;
 use indexmap::IndexMap;
 
 pub(crate) fn validate_field(

crates/apollo-compiler/src/validation/fragment.rs

@@ -5,9 +5,12 @@ use crate::executable;
 use crate::schema;
 use crate::schema::Implementers;
 use crate::validation::diagnostics::DiagnosticData;
+use crate::validation::CycleError;
 use crate::validation::DiagnosticList;
+use crate::validation::NodeLocation;
 use crate::validation::OperationValidationContext;
-use crate::validation::{CycleError, NodeLocation, RecursionGuard, RecursionStack};
+use crate::validation::RecursionGuard;
+use crate::validation::RecursionStack;
 use crate::ExecutableDocument;
 use crate::Node;
 use std::borrow::Cow;

crates/apollo-compiler/src/validation/input_object.rs

@@ -1,7 +1,11 @@
 use crate::ast;
-use crate::schema::{ExtendedType, InputObjectType};
+use crate::schema::ExtendedType;
+use crate::schema::InputObjectType;
 use crate::validation::diagnostics::DiagnosticData;
-use crate::validation::{CycleError, DiagnosticList, RecursionGuard, RecursionStack};
+use crate::validation::CycleError;
+use crate::validation::DiagnosticList;
+use crate::validation::RecursionGuard;
+use crate::validation::RecursionStack;
 use crate::Node;
 use std::collections::HashMap;
 

crates/apollo-compiler/src/validation/interface.rs

@@ -1,8 +1,13 @@
-use crate::schema::{ComponentName, ExtendedType, InterfaceType, Name};
+use crate::ast;
+use crate::schema::ComponentName;
+use crate::schema::ExtendedType;
+use crate::schema::InterfaceType;
+use crate::schema::Name;
 use crate::validation::diagnostics::DiagnosticData;
 use crate::validation::field::validate_field_definitions;
 use crate::validation::DiagnosticList;
-use crate::{ast, Node, NodeLocation};
+use crate::Node;
+use crate::NodeLocation;
 use indexmap::IndexSet;
 
 pub(crate) fn validate_interface_definitions(

crates/apollo-compiler/src/validation/mod.rs

@@ -24,23 +24,27 @@ pub(crate) mod value;
 pub(crate) mod variable;
 
 use crate::ast::Name;
-use crate::diagnostic::{CliReport, Diagnostic, ToCliReport};
+use crate::diagnostic::CliReport;
+use crate::diagnostic::Diagnostic;
+use crate::diagnostic::ToCliReport;
+use crate::executable::BuildError as ExecutableBuildError;
+use crate::executable::ConflictingFieldArgument;
+use crate::executable::ConflictingFieldName;
+use crate::executable::ConflictingFieldType;
 use crate::executable::VariableDefinition;
-use crate::executable::{
-    BuildError as ExecutableBuildError, ConflictingFieldArgument, ConflictingFieldName,
-    ConflictingFieldType,
-};
-use crate::execution::{GraphQLError, Response};
+use crate::execution::GraphQLError;
+use crate::execution::Response;
+pub(crate) use crate::node::FileId;
 use crate::schema::BuildError as SchemaBuildError;
 use crate::schema::Implementers;
+use crate::Node;
+use crate::NodeLocation;
 use crate::SourceMap;
-use crate::{Node, NodeLocation};
 use indexmap::IndexSet;
 use std::collections::HashMap;
 use std::fmt;
-use std::sync::{Arc, OnceLock};
-
-pub(crate) use crate::node::FileId;
+use std::sync::Arc;
+use std::sync::OnceLock;
 
 /// Wraps a [`Schema`] or [`ExecutableDocument`] to mark it
 /// as [valid](https://spec.graphql.org/October2021/#sec-Validation).

crates/apollo-compiler/src/validation/scalar.rs

@@ -1,5 +1,7 @@
+use crate::ast;
+use crate::schema;
 use crate::validation::DiagnosticList;
-use crate::{ast, schema, Node};
+use crate::Node;
 
 pub(crate) fn validate_scalar_definitions(
     diagnostics: &mut DiagnosticList,

crates/apollo-compiler/src/validation/selection.rs

@@ -1,19 +1,24 @@
+use crate::ast;
 use crate::ast::Name;
 use crate::ast::NamedType;
 use crate::coordinate::TypeAttributeCoordinate;
+use crate::executable;
 use crate::executable::BuildError;
 use crate::executable::ConflictingFieldArgument;
 use crate::executable::ConflictingFieldName;
 use crate::executable::ConflictingFieldType;
 use crate::executable::SelectionSet;
+use crate::schema;
 use crate::validation::DiagnosticList;
 use crate::validation::OperationValidationContext;
 use crate::ExecutableDocument;
-use crate::{ast, executable, schema, Node};
+use crate::Node;
 use apollo_parser::LimitTracker;
 use indexmap::IndexMap;
 use std::cell::OnceCell;
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::HashMap;
+use std::collections::HashSet;
+use std::collections::VecDeque;
 use std::rc::Rc;
 
 /// Represents a field selected against a parent type.

crates/apollo-compiler/src/validation/union_.rs

@@ -1,7 +1,10 @@
-use crate::schema::{self, ExtendedType, UnionType};
+use crate::ast;
+use crate::schema;
+use crate::schema::ExtendedType;
+use crate::schema::UnionType;
 use crate::validation::diagnostics::DiagnosticData;
 use crate::validation::DiagnosticList;
-use crate::{ast, Node};
+use crate::Node;
 
 pub(crate) fn validate_union_definitions(diagnostics: &mut DiagnosticList, schema: &crate::Schema) {
     for ty in schema.types.values() {

crates/apollo-compiler/src/validation/value.rs

@@ -2,7 +2,6 @@ use crate::ast;
 use crate::coordinate::TypeAttributeCoordinate;
 use crate::schema;
 use crate::validation::diagnostics::DiagnosticData;
-
 use crate::validation::DiagnosticList;
 use crate::Node;
 

crates/apollo-compiler/src/validation/variable.rs

@@ -1,10 +1,16 @@
+use crate::ast;
+use crate::executable;
 use crate::validation::diagnostics::DiagnosticData;
-use crate::validation::{
-    DiagnosticList, NodeLocation, RecursionGuard, RecursionLimitError, RecursionStack,
-};
-use crate::{ast, executable, ExecutableDocument, Node};
+use crate::validation::DiagnosticList;
+use crate::validation::NodeLocation;
+use crate::validation::RecursionGuard;
+use crate::validation::RecursionLimitError;
+use crate::validation::RecursionStack;
+use crate::ExecutableDocument;
+use crate::Node;
 use std::collections::hash_map::Entry;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
+use std::collections::HashSet;
 
 pub(crate) fn validate_variable_definitions(
     diagnostics: &mut DiagnosticList,

crates/apollo-compiler/tests/validation/types.rs

@@ -1,12 +1,11 @@
 //! Ported from graphql-js, 2023-11-16
 //! https://github.com/graphql/graphql-js/blob/0b7590f0a2b65e6210da2e49be0d8e6c27781af2/src/validation/__tests__/ValuesOfCorrectTypeRule-test.ts
-use expect_test::Expect;
-use std::sync::OnceLock;
-use unindent::unindent;
-
 use apollo_compiler::validation::Valid;
 use apollo_compiler::ExecutableDocument;
 use apollo_compiler::Schema;
+use expect_test::Expect;
+use std::sync::OnceLock;
+use unindent::unindent;
 
 const GRAPHQL_JS_TEST_SCHEMA: &str = r#"
   interface Mammal {

crates/apollo-parser/benches/query.rs

@@ -1,4 +1,5 @@
-use apollo_parser::{cst, Lexer};
+use apollo_parser::cst;
+use apollo_parser::Lexer;
 use criterion::*;
 
 fn parse_query(query: &str) {

crates/apollo-parser/benches/supergraph.rs

@@ -1,4 +1,5 @@
-use apollo_parser::{cst, Lexer};
+use apollo_parser::cst;
+use apollo_parser::Lexer;
 use criterion::*;
 
 fn parse_schema(schema: &str) {

crates/apollo-parser/examples/ariadne.rs

@@ -1,10 +1,14 @@
 //! This example describes how to use `apollo-parser` with
 //! [`ariadne`](https://docs.rs/ariadne/0.3.0/ariadne) diagnostic library.
 
-use std::{fs, path::Path};
-
-use apollo_parser::{cst, Parser};
-use ariadne::{Label, Report, ReportKind, Source};
+use apollo_parser::cst;
+use apollo_parser::Parser;
+use ariadne::Label;
+use ariadne::Report;
+use ariadne::ReportKind;
+use ariadne::Source;
+use std::fs;
+use std::path::Path;
 
 fn parse_schema() -> cst::Document {
     let file = Path::new("crates/apollo-parser/examples/schema_with_errors.graphql");

crates/apollo-parser/examples/unused_vars.rs

@@ -1,9 +1,10 @@
 //! Example usage of `apollo-parser` to check for unused vars in a given GraphQL
 //! query.
 
-use std::{fs, path::Path};
-
-use apollo_parser::{cst, Parser};
+use apollo_parser::cst;
+use apollo_parser::Parser;
+use std::fs;
+use std::path::Path;
 
 fn are_variables_unused() {
     // Example mutation with variables.