Skip to content

Commit fa0cc58

Browse files
committed
Remove rustup test wrapper macros
1 parent e8708d0 commit fa0cc58

28 files changed

+4
-197
lines changed

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ version = "0.52.0"
120120
enum-map = "2.5.0"
121121
platforms.workspace = true
122122
proptest.workspace = true
123-
rustup-macros.workspace = true
124123
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
125124
trycmd = "0.15.0"
126125

@@ -130,7 +129,7 @@ platforms.workspace = true
130129
regex = "1"
131130

132131
[workspace]
133-
members = ["download", "rustup-macros"]
132+
members = ["download"]
134133

135134
[workspace.dependencies]
136135
anyhow = "1.0.69"
@@ -141,7 +140,6 @@ opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] }
141140
opentelemetry-otlp = "0.16"
142141
platforms = "3.4"
143142
proptest = "1.1.0"
144-
rustup-macros = { path = "rustup-macros" }
145143
tempfile = "3.8"
146144
termcolor = "1.2"
147145
thiserror = "1.0"

rustup-macros/Cargo.toml

Lines changed: 0 additions & 13 deletions
This file was deleted.

rustup-macros/src/lib.rs

Lines changed: 0 additions & 124 deletions
This file was deleted.

src/cli/download_tracker.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ fn format_dhms(sec: u64) -> (u64, u8, u8, u8) {
272272

273273
#[cfg(test)]
274274
mod tests {
275-
use rustup_macros::unit_test as test;
276-
277275
use super::format_dhms;
278276

279277
#[test]

src/cli/self_update.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,8 +1335,6 @@ pub(crate) fn cleanup_self_updater(process: &Process) -> Result<()> {
13351335
mod tests {
13361336
use std::collections::HashMap;
13371337

1338-
use rustup_macros::unit_test as test;
1339-
13401338
use crate::cli::common;
13411339
use crate::cli::self_update::InstallOpts;
13421340
use crate::dist::dist::{PartialToolchainDesc, Profile};

src/cli/self_update/windows.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,6 @@ mod tests {
728728
use winreg::enums::{RegType, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
729729
use winreg::{RegKey, RegValue};
730730

731-
use rustup_macros::unit_test as test;
732-
733731
use crate::currentprocess::TestProcess;
734732
use crate::test::with_saved_path;
735733

src/config.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,6 @@ enum ParseMode {
968968

969969
#[cfg(test)]
970970
mod tests {
971-
use rustup_macros::unit_test as test;
972-
973971
use super::*;
974972

975973
#[test]

src/currentprocess/terminalsource.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ impl io::Write for ColorableTerminalLocked {
238238
mod tests {
239239
use std::collections::HashMap;
240240

241-
use rustup_macros::unit_test as test;
242-
243241
use super::*;
244242
use crate::currentprocess::TestProcess;
245243
use crate::test::Env;

src/diskio/test.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ use std::collections::HashMap;
22

33
use anyhow::Result;
44

5-
use rustup_macros::unit_test as test;
6-
7-
use crate::test::test_dir;
8-
95
use super::{get_executor, Executor, Item, Kind};
106
use crate::currentprocess::TestProcess;
7+
use crate::test::test_dir;
118

129
impl Item {
1310
/// The length of the file, for files (for stats)

0 commit comments

Comments
 (0)