Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
tninesling committed Feb 27, 2025
1 parent 63a6580 commit 0e47bb6
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions apollo-federation/src/link/context_spec_definition.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::sync::LazyLock;

use apollo_compiler::Name;
use apollo_compiler::Node;
use apollo_compiler::ast::Directive;
use apollo_compiler::ast::DirectiveDefinition;
use apollo_compiler::name;
use apollo_compiler::Name;
use apollo_compiler::Node;
use regex::Regex;

use crate::error::FederationError;
Expand Down
22 changes: 11 additions & 11 deletions apollo-federation/src/query_graph/build_query_graph.rs
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
use std::sync::Arc;

use apollo_compiler::Name;
use apollo_compiler::Schema;
use apollo_compiler::collections::IndexMap;
use apollo_compiler::collections::IndexSet;
use apollo_compiler::schema::DirectiveList as ComponentDirectiveList;
use apollo_compiler::schema::ExtendedType;
use apollo_compiler::validation::Valid;
use apollo_compiler::Name;
use apollo_compiler::Schema;
use itertools::Itertools;
use petgraph::Direction;
use petgraph::graph::EdgeIndex;
use petgraph::graph::NodeIndex;
use petgraph::visit::EdgeRef;
use petgraph::Direction;
use strum::IntoEnumIterator;

use crate::bail;
use crate::error::FederationError;
use crate::error::SingleFederationError;
use crate::link::context_spec_definition::parse_context;
use crate::link::federation_spec_definition::get_federation_spec_definition_from_subgraph;
use crate::link::federation_spec_definition::FederationSpecDefinition;
use crate::link::federation_spec_definition::KeyDirectiveArguments;
use crate::operation::merge_selection_sets;
use crate::link::federation_spec_definition::get_federation_spec_definition_from_subgraph;
use crate::operation::Selection;
use crate::operation::SelectionSet;
use crate::operation::merge_selection_sets;
use crate::query_graph::ContextCondition;
use crate::query_graph::OverrideCondition;
use crate::query_graph::QueryGraph;
use crate::query_graph::QueryGraphEdge;
use crate::query_graph::QueryGraphEdgeTransition;
use crate::query_graph::QueryGraphNode;
use crate::query_graph::QueryGraphNodeType;
use crate::schema::ValidFederationSchema;
use crate::schema::field_set::parse_field_set;
use crate::schema::position::AbstractTypeDefinitionPosition;
use crate::schema::position::CompositeTypeDefinitionPosition;
Expand All @@ -45,7 +46,6 @@ use crate::schema::position::SchemaRootDefinitionKind;
use crate::schema::position::SchemaRootDefinitionPosition;
use crate::schema::position::TypeDefinitionPosition;
use crate::schema::position::UnionTypeDefinitionPosition;
use crate::schema::ValidFederationSchema;
use crate::supergraph::extract_subgraphs_from_supergraph;
use crate::utils::FallibleIterator;

Expand Down Expand Up @@ -2356,27 +2356,27 @@ fn resolvable_key_applications<'doc>(

#[cfg(test)]
mod tests {
use apollo_compiler::Name;
use apollo_compiler::Schema;
use apollo_compiler::collections::IndexMap;
use apollo_compiler::collections::IndexSet;
use apollo_compiler::name;
use apollo_compiler::Name;
use apollo_compiler::Schema;
use petgraph::Direction;
use petgraph::graph::NodeIndex;
use petgraph::visit::EdgeRef;
use petgraph::Direction;

use crate::error::FederationError;
use crate::query_graph::build_query_graph::build_query_graph;
use crate::query_graph::QueryGraph;
use crate::query_graph::QueryGraphEdgeTransition;
use crate::query_graph::QueryGraphNode;
use crate::query_graph::QueryGraphNodeType;
use crate::query_graph::build_query_graph::build_query_graph;
use crate::schema::ValidFederationSchema;
use crate::schema::position::ObjectOrInterfaceTypeDefinitionPosition;
use crate::schema::position::ObjectTypeDefinitionPosition;
use crate::schema::position::OutputTypeDefinitionPosition;
use crate::schema::position::ScalarTypeDefinitionPosition;
use crate::schema::position::SchemaRootDefinitionKind;
use crate::schema::ValidFederationSchema;

const SCHEMA_NAME: &str = "test";

Expand Down
16 changes: 8 additions & 8 deletions apollo-federation/src/schema/subgraph_metadata.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::collections::HashMap;
use std::collections::HashSet;

use apollo_compiler::Schema;
use apollo_compiler::collections::IndexSet;
use apollo_compiler::schema::ExtendedType;
use apollo_compiler::validation::Valid;
use apollo_compiler::Schema;

use crate::error::FederationError;
use crate::link::context_spec_definition::parse_context;
Expand All @@ -13,14 +13,13 @@ use crate::link::spec::Version;
use crate::link::spec_definition::SpecDefinition;
use crate::operation::Selection;
use crate::operation::SelectionSet;
use crate::schema::FederationSchema;
use crate::schema::field_set::collect_target_fields_from_field_set;
use crate::schema::position::CompositeTypeDefinitionPosition;
use crate::schema::position::FieldArgumentDefinitionPosition;
use crate::schema::position::FieldDefinitionPosition;
use crate::schema::position::ObjectFieldDefinitionPosition;
use crate::schema::position::ObjectOrInterfaceTypeDefinitionPosition;
use crate::schema::FederationSchema;

use super::position::CompositeTypeDefinitionPosition;
use super::position::FieldArgumentDefinitionPosition;
use super::position::ObjectFieldDefinitionPosition;

fn unwrap_schema(fed_schema: &Valid<FederationSchema>) -> &Valid<Schema> {
// Okay to assume valid because `fed_schema` is known to be valid.
Expand Down Expand Up @@ -595,10 +594,11 @@ impl ExternalMetadata {

#[cfg(test)]
mod tests {
use apollo_compiler::Name;

use crate::schema::FederationSchema;
use crate::schema::position::FieldDefinitionPosition;
use crate::schema::position::ObjectFieldDefinitionPosition;
use crate::schema::FederationSchema;
use apollo_compiler::Name;

#[test]
fn subgraph_metadata_is_field_shareable() {
Expand Down

0 comments on commit 0e47bb6

Please sign in to comment.