Remove rustup test wrapper macros

djc · djc · commit fa0cc58f09b5 · 2024-06-16T09:10:24.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -120,7 +120,6 @@ version = "0.52.0"
 enum-map = "2.5.0"
 platforms.workspace = true
 proptest.workspace = true
-rustup-macros.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 trycmd = "0.15.0"
 
@@ -130,7 +129,7 @@ platforms.workspace = true
 regex = "1"
 
 [workspace]
-members = ["download", "rustup-macros"]
+members = ["download"]
 
 [workspace.dependencies]
 anyhow = "1.0.69"
@@ -141,7 +140,6 @@ opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] }
 opentelemetry-otlp = "0.16"
 platforms = "3.4"
 proptest = "1.1.0"
-rustup-macros = { path = "rustup-macros" }
 tempfile = "3.8"
 termcolor = "1.2"
 thiserror = "1.0"
diff --git a/rustup-macros/Cargo.toml b/rustup-macros/Cargo.toml
diff --git a/rustup-macros/src/lib.rs b/rustup-macros/src/lib.rs
diff --git a/src/cli/download_tracker.rs b/src/cli/download_tracker.rs
@@ -272,8 +272,6 @@ fn format_dhms(sec: u64) -> (u64, u8, u8, u8) {
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     use super::format_dhms;
 
     #[test]
diff --git a/src/cli/self_update.rs b/src/cli/self_update.rs
@@ -1335,8 +1335,6 @@ pub(crate) fn cleanup_self_updater(process: &Process) -> Result<()> {
 mod tests {
     use std::collections::HashMap;
 
-    use rustup_macros::unit_test as test;
-
     use crate::cli::common;
     use crate::cli::self_update::InstallOpts;
     use crate::dist::dist::{PartialToolchainDesc, Profile};
diff --git a/src/cli/self_update/windows.rs b/src/cli/self_update/windows.rs
@@ -728,8 +728,6 @@ mod tests {
     use winreg::enums::{RegType, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
     use winreg::{RegKey, RegValue};
 
-    use rustup_macros::unit_test as test;
-
     use crate::currentprocess::TestProcess;
     use crate::test::with_saved_path;
 
diff --git a/src/config.rs b/src/config.rs
@@ -968,8 +968,6 @@ enum ParseMode {
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     use super::*;
 
     #[test]
diff --git a/src/currentprocess/terminalsource.rs b/src/currentprocess/terminalsource.rs
@@ -238,8 +238,6 @@ impl io::Write for ColorableTerminalLocked {
 mod tests {
     use std::collections::HashMap;
 
-    use rustup_macros::unit_test as test;
-
     use super::*;
     use crate::currentprocess::TestProcess;
     use crate::test::Env;
diff --git a/src/diskio/test.rs b/src/diskio/test.rs
@@ -2,12 +2,9 @@ use std::collections::HashMap;
 
 use anyhow::Result;
 
-use rustup_macros::unit_test as test;
-
-use crate::test::test_dir;
-
 use super::{get_executor, Executor, Item, Kind};
 use crate::currentprocess::TestProcess;
+use crate::test::test_dir;
 
 impl Item {
     /// The length of the file, for files (for stats)
diff --git a/src/dist/component/tests.rs b/src/dist/component/tests.rs
@@ -2,8 +2,6 @@ use std::fs;
 use std::io::Write;
 use std::path::PathBuf;
 
-use rustup_macros::unit_test as test;
-
 use crate::currentprocess::TestProcess;
 use crate::dist::component::Transaction;
 use crate::dist::dist::DEFAULT_DIST_SERVER;
diff --git a/src/dist/dist.rs b/src/dist/dist.rs
@@ -1154,8 +1154,6 @@ fn date_from_manifest_date(date_str: &str) -> Option<NaiveDate> {
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     use super::*;
 
     #[test]
diff --git a/src/dist/manifestation/tests.rs b/src/dist/manifestation/tests.rs
@@ -14,8 +14,6 @@ use anyhow::{anyhow, Result};
 use tokio::{runtime::Handle, task};
 use url::Url;
 
-use rustup_macros::unit_test as test;
-
 use crate::{
     currentprocess::{Process, TestProcess},
     dist::{
diff --git a/src/dist/triple.rs b/src/dist/triple.rs
@@ -54,8 +54,6 @@ impl PartialTargetTriple {
 
 #[cfg(test)]
 mod test {
-    use rustup_macros::unit_test as test;
-
     use super::*;
 
     #[test]
diff --git a/src/env_var.rs b/src/env_var.rs
@@ -46,8 +46,6 @@ mod tests {
     use std::collections::HashMap;
     use std::ffi::{OsStr, OsString};
 
-    use rustup_macros::unit_test as test;
-
     use super::*;
     use crate::currentprocess::TestProcess;
     use crate::test::{with_saved_path, Env};
diff --git a/src/lib.rs b/src/lib.rs
@@ -92,8 +92,6 @@ pub mod utils;
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     use crate::{is_proxyable_tools, DUP_TOOLS, TOOLS};
 
     #[test]
diff --git a/src/utils/units.rs b/src/utils/units.rs
@@ -77,8 +77,6 @@ impl Display for Size {
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     #[test]
     fn unit_formatter_test() {
         use crate::utils::units::{Size, Unit, UnitMode};
diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -666,8 +666,6 @@ pub(crate) fn home_dir_from_passwd() -> Option<PathBuf> {
 
 #[cfg(test)]
 mod tests {
-    use rustup_macros::unit_test as test;
-
     use super::*;
 
     #[test]
diff --git a/tests/suite/cli_exact.rs b/tests/suite/cli_exact.rs
@@ -6,7 +6,6 @@ use rustup::test::{
     mock::clitools::{self, set_current_dist_date, with_update_server, Config, Scenario},
     this_host_triple,
 };
-use rustup_macros::integration_test as test;
 
 /// Start a test with Scenario::None
 fn test(f: &dyn Fn(&mut Config)) {
diff --git a/tests/suite/cli_inst_interactive.rs b/tests/suite/cli_inst_interactive.rs
@@ -10,7 +10,6 @@ use rustup::test::{
     this_host_triple, with_saved_path,
 };
 use rustup::utils::raw;
-use rustup_macros::integration_test as test;
 
 fn run_input(config: &Config, args: &[&str], input: &str) -> SanitizedOutput {
     run_input_with_env(config, args, input, &[])
diff --git a/tests/suite/cli_misc.rs b/tests/suite/cli_misc.rs
@@ -10,7 +10,6 @@ use rustup::test::{
     this_host_triple,
 };
 use rustup::utils::utils;
-use rustup_macros::integration_test as test;
 
 pub fn setup(f: &dyn Fn(&mut Config)) {
     clitools::test(Scenario::SimpleV2, f);
diff --git a/tests/suite/cli_paths.rs b/tests/suite/cli_paths.rs
@@ -11,11 +11,9 @@ mod unix {
     use std::fs;
     use std::path::PathBuf;
 
-    use rustup::utils::raw;
-    use rustup_macros::integration_test as test;
-
     use super::INIT_NONE;
     use rustup::test::mock::clitools::{self, Scenario};
+    use rustup::utils::raw;
 
     // Let's write a fake .rc which looks vaguely like a real script.
     const FAKE_RC: &str = r#"
@@ -390,11 +388,9 @@ export PATH="$HOME/apple/bin"
 
 #[cfg(windows)]
 mod windows {
+    use super::INIT_NONE;
     use rustup::test::mock::clitools::{self, Scenario};
     use rustup::test::{get_path, with_saved_path};
-    use rustup_macros::integration_test as test;
-
-    use super::INIT_NONE;
 
     #[test]
     /// Smoke test for end-to-end code connectivity of the installer path mgmt on windows.
diff --git a/tests/suite/cli_rustup.rs b/tests/suite/cli_rustup.rs
@@ -7,7 +7,6 @@ use std::{env::consts::EXE_SUFFIX, path::Path};
 use rustup::for_host;
 use rustup::test::this_host_triple;
 use rustup::utils::raw;
-use rustup_macros::integration_test as test;
 
 use rustup::test::mock::{
     self,
diff --git a/tests/suite/cli_self_upd.rs b/tests/suite/cli_self_upd.rs
@@ -21,7 +21,6 @@ use rustup::test::{
 };
 use rustup::utils::{raw, utils};
 use rustup::{for_host, DUP_TOOLS, TOOLS};
-use rustup_macros::integration_test as test;
 
 #[cfg(windows)]
 use rustup::test::with_saved_reg_value;
diff --git a/tests/suite/cli_ui.rs b/tests/suite/cli_ui.rs
@@ -1,7 +1,5 @@
 use std::{fs, path::PathBuf};
 
-use rustup_macros::integration_test as test;
-
 #[test]
 fn rustup_ui_doc_text_tests() {
     let t = trycmd::TestCases::new();
diff --git a/tests/suite/cli_v1.rs b/tests/suite/cli_v1.rs
diff --git a/tests/suite/cli_v2.rs b/tests/suite/cli_v2.rs
diff --git a/tests/suite/dist_install.rs b/tests/suite/dist_install.rs
