From 95b19e41d2e5b24cf3fa3e36ea955a0b5d7f4a1a Mon Sep 17 00:00:00 2001 From: Avery Harnish Date: Thu, 21 Oct 2021 10:57:38 -0500 Subject: [PATCH] chore: updates workspace to rust edition 2021 (#886) --- Cargo.toml | 3 +-- crates/houston/Cargo.toml | 2 +- crates/robot-panic/Cargo.toml | 2 +- crates/robot-panic/src/report.rs | 11 ++++------- crates/rover-client/Cargo.toml | 2 +- crates/sdl-encoder/Cargo.toml | 2 +- crates/sputnik/Cargo.toml | 2 +- crates/timber/Cargo.toml | 2 +- installers/binstall/Cargo.toml | 2 +- xtask/Cargo.toml | 2 +- xtask/src/commands/test.rs | 12 ++++++++++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6ae64971f..4cbde7864 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,14 +5,13 @@ description = """ Rover is a tool for working with the Apollo GraphQL Registry. """ documentation = "https://go.apollo.dev/r/docs" -edition = "2018" +edition = "2021" keywords = ["graphql", "cli", "apollo", "graph", "registry"] license = "MIT" name = "rover" readme = "README.md" repository = "https://github.com/apollographql/rover/" version = "0.3.0" -resolver = "2" [[bin]] name = "rover" diff --git a/crates/houston/Cargo.toml b/crates/houston/Cargo.toml index 2b81ce6a0..ddb405216 100644 --- a/crates/houston/Cargo.toml +++ b/crates/houston/Cargo.toml @@ -2,7 +2,7 @@ name = "houston" version = "0.0.0" authors = ["Apollo Developers "] -edition = "2018" +edition = "2021" [dependencies] camino = "1" diff --git a/crates/robot-panic/Cargo.toml b/crates/robot-panic/Cargo.toml index c70fb3fe6..d087dd777 100644 --- a/crates/robot-panic/Cargo.toml +++ b/crates/robot-panic/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "robot-panic" version = "1.0.3" -edition = "2018" +edition = "2021" [dependencies] backtrace = "0.3" diff --git a/crates/robot-panic/src/report.rs b/crates/robot-panic/src/report.rs index d919e74a7..2fb356e20 100644 --- a/crates/robot-panic/src/report.rs +++ b/crates/robot-panic/src/report.rs @@ -171,13 +171,10 @@ impl Report { "body", &format!( " \n\n\ - - ## Description\n\ - - Describe the issue that you're seeing.\n\n\ - - **Crash Report**\n \ + do before submitting this report\n --> \n\n\n + ## Description\n\n + Describe the issue that you're seeing.\n\n\n + **Crash Report**\n\n ```toml\n{}\n```\n", &crash_report ), diff --git a/crates/rover-client/Cargo.toml b/crates/rover-client/Cargo.toml index cccf2f2bb..cea997d78 100644 --- a/crates/rover-client/Cargo.toml +++ b/crates/rover-client/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Apollo Developers "] description = "an http client for making graphql requests for the rover CLI" -edition = "2018" +edition = "2021" name = "rover-client" version = "0.0.0" diff --git a/crates/sdl-encoder/Cargo.toml b/crates/sdl-encoder/Cargo.toml index 7db5fd695..4d31c9293 100644 --- a/crates/sdl-encoder/Cargo.toml +++ b/crates/sdl-encoder/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["lrlna "] -edition = "2018" +edition = "2021" name = "sdl-encoder" version = "0.1.0" diff --git a/crates/sputnik/Cargo.toml b/crates/sputnik/Cargo.toml index a1cfcaf96..9b8cc87c9 100644 --- a/crates/sputnik/Cargo.toml +++ b/crates/sputnik/Cargo.toml @@ -2,7 +2,7 @@ name = "sputnik" version = "0.0.0" authors = ["Apollo Developers "] -edition = "2018" +edition = "2021" [dependencies] camino = "1" diff --git a/crates/timber/Cargo.toml b/crates/timber/Cargo.toml index f2b16005e..d9dc16095 100644 --- a/crates/timber/Cargo.toml +++ b/crates/timber/Cargo.toml @@ -2,7 +2,7 @@ name = "timber" version = "0.1.0" authors = ["Apollo Developers "] -edition = "2018" +edition = "2021" [dependencies] serde = "1" diff --git a/installers/binstall/Cargo.toml b/installers/binstall/Cargo.toml index a4274f796..ea86b6913 100644 --- a/installers/binstall/Cargo.toml +++ b/installers/binstall/Cargo.toml @@ -2,7 +2,7 @@ name = "binstall" version = "0.1.0" authors = ["Apollo Developers "] -edition = "2018" +edition = "2021" [dependencies] atty = "0.2" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 84c802953..e623d935c 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -2,7 +2,7 @@ name = "xtask" version = "0.1.0" authors = ["Apollo Developers "] -edition = "2018" +edition = "2021" [dependencies] ansi_term = "0.12" diff --git a/xtask/src/commands/test.rs b/xtask/src/commands/test.rs index 88517a5bc..d7d6fccbf 100644 --- a/xtask/src/commands/test.rs +++ b/xtask/src/commands/test.rs @@ -9,6 +9,14 @@ pub struct Test { // The target to build Rover for #[structopt(long = "target", env = "XTASK_TARGET", default_value, possible_values = &POSSIBLE_TARGETS)] target: Target, + + // The supergraph-demo branch to check out + #[structopt(long = "branch", default_value = "main")] + pub(crate) branch: String, + + // The supergraph-demo org to clone + #[structopt(long = "org", default_value = "apollographql")] + pub(crate) org: String, } impl Test { @@ -19,8 +27,8 @@ impl Test { unit_test_runner.run(verbose)?; let integration_test_runner = IntegrationTest { target: self.target.clone(), - branch: Default::default(), - org: Default::default(), + branch: self.branch.clone(), + org: self.org.clone(), }; integration_test_runner.run(verbose)?; Ok(())