Fix clippies

Author: jonathanrainer

src/composition/supergraph/config/federation.rs

@@ -6,9 +6,8 @@ use std::marker::PhantomData;
 use apollo_federation_types::config::{FederationVersion, SupergraphConfig};
 use derive_getters::Getters;
 
-use crate::command::supergraph::compose::do_compose::SupergraphComposeOpts;
-
 use super::full::FullyResolvedSubgraph;
+use crate::command::supergraph::compose::do_compose::SupergraphComposeOpts;
 
 mod state {
     #[derive(Clone, Debug)]
@@ -166,9 +165,8 @@ mod tests {
     use apollo_federation_types::config::{FederationVersion, SubgraphConfig, SupergraphConfig};
     use speculoos::prelude::*;
 
-    use crate::composition::supergraph::config::{full::FullyResolvedSubgraph, scenario::*};
-
     use super::FederationVersionResolverFromSupergraphConfig;
+    use crate::composition::supergraph::config::{full::FullyResolvedSubgraph, scenario::*};
 
     /// Test showing that federation version is selected from the user-specified fed version
     /// over local supergraph config or resolved subgraphs
@@ -189,7 +187,7 @@ mod tests {
         let supergraph_config =
             SupergraphConfig::new(unresolved_subgraphs, Some(FederationVersion::LatestFedOne));
 
-        let resolved_subgraphs = vec![(
+        let resolved_subgraphs = [(
             subgraph_name.to_string(),
             FullyResolvedSubgraph::builder()
                 .schema(subgraph_scenario.sdl)
@@ -222,7 +220,7 @@ mod tests {
         let supergraph_config =
             SupergraphConfig::new(unresolved_subgraphs, Some(FederationVersion::LatestFedTwo));
 
-        let resolved_subgraphs = vec![(
+        let resolved_subgraphs = [(
             subgraph_name.to_string(),
             FullyResolvedSubgraph::builder()
                 .schema(subgraph_scenario.sdl)
@@ -254,7 +252,7 @@ mod tests {
         let federation_version_resolver = FederationVersionResolverFromSupergraphConfig::default();
         let supergraph_config = SupergraphConfig::new(unresolved_subgraphs, None);
 
-        let resolved_subgraphs = vec![(
+        let resolved_subgraphs = [(
             subgraph_name.to_string(),
             FullyResolvedSubgraph::builder()
                 .schema(subgraph_scenario.sdl)

src/utils/supergraph_config.rs

@@ -487,7 +487,7 @@ mod test_get_supergraph_config {
         let supergraph_config_path = third_level_folder.path().join("supergraph.yaml");
         fs::write(
             supergraph_config_path.clone(),
-            &supergraph_config.into_bytes(),
+            supergraph_config.into_bytes(),
         )
         .expect("Could not write supergraph.yaml");
 
@@ -568,9 +568,10 @@ fn merge_supergraph_configs(
 
 #[cfg(test)]
 mod test_merge_supergraph_configs {
-    use super::*;
     use rstest::{fixture, rstest};
 
+    use super::*;
+
     #[fixture]
     #[once]
     fn local_supergraph_config_with_latest_fed_one_version() -> SupergraphConfig {
@@ -1048,6 +1049,7 @@ mod test_resolve_supergraph_yaml {
     use apollo_federation_types::config::{FederationVersion, SchemaSource, SubgraphConfig};
     use assert_fs::TempDir;
     use camino::Utf8PathBuf;
+    use houston::Config;
     use httpmock::MockServer;
     use indoc::indoc;
     use rstest::{fixture, rstest};
@@ -1056,14 +1058,11 @@ mod test_resolve_supergraph_yaml {
     use speculoos::assert_that;
     use speculoos::prelude::{ResultAssertions, VecAssertions};
 
-    use houston::Config;
-
+    use super::*;
     use crate::options::ProfileOpt;
     use crate::utils::client::{ClientBuilder, StudioClientConfig};
     use crate::utils::parsers::FileDescriptorType;
 
-    use super::*;
-
     #[fixture]
     fn profile_opt() -> ProfileOpt {
         ProfileOpt {
@@ -1185,7 +1184,7 @@ subgraphs:
     routing_url: https://people.example.com
     schema:
       file: ./people.graphql"#,
-            latest_fed2_version.to_string()
+            latest_fed2_version
         );
         let tmp_home = TempDir::new().unwrap();
         let mut config_path = Utf8PathBuf::try_from(tmp_home.path().to_path_buf()).unwrap();
@@ -1225,7 +1224,7 @@ subgraphs:
     routing_url: https://people.example.com
     schema:
         file: ../../people.graphql"#,
-            latest_fed2_version.to_string()
+            latest_fed2_version
         );
         let tmp_home = TempDir::new().unwrap();
         let tmp_dir = Utf8PathBuf::try_from(tmp_home.path().to_path_buf()).unwrap();
@@ -1279,7 +1278,7 @@ subgraphs:
     routing_url: https://people.example.com
     schema:
         file: ../../people.graphql"#,
-            latest_fed2_version.to_string()
+            latest_fed2_version
         );
         let tmp_home = TempDir::new().unwrap();
         let tmp_dir = Utf8PathBuf::try_from(tmp_home.path().to_path_buf()).unwrap();