Skip to content

Commit 5b68809

Browse files
committed
address
1 parent 953937b commit 5b68809

File tree

10 files changed

+7
-17
lines changed

10 files changed

+7
-17
lines changed

vdev/src/commands/cli.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use clap_verbosity_flag::{InfoLevel, Verbosity};
44

55
/// Vector's unified dev tool
66
#[derive(Parser, Debug)]
7-
#[command(version, bin_name = "vdev", disable_help_subcommand = true)]
7+
#[command(version, bin_name = "vdev", infer_subcommands = true, disable_help_subcommand = true)]
88
pub struct Cli {
99
#[clap(flatten)]
1010
pub verbose: Verbosity<InfoLevel>,
@@ -19,7 +19,7 @@ enum Commands {
1919
Complete(super::complete::Cli),
2020
Config(super::config::cli::Cli),
2121
Exec(super::exec::Cli),
22-
Int(super::int::cli::Cli),
22+
Integration(super::integration::cli::Cli),
2323
Meta(super::meta::cli::Cli),
2424
Status(super::status::Cli),
2525
Test(super::test::Cli),
@@ -32,7 +32,7 @@ impl Cli {
3232
Commands::Complete(cli) => cli.exec(),
3333
Commands::Config(cli) => cli.exec(),
3434
Commands::Exec(cli) => cli.exec(),
35-
Commands::Int(cli) => cli.exec(),
35+
Commands::Integration(cli) => cli.exec(),
3636
Commands::Meta(cli) => cli.exec(),
3737
Commands::Status(cli) => cli.exec(),
3838
Commands::Test(cli) => cli.exec(),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

vdev/src/commands/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pub mod cli;
33
pub mod complete;
44
pub mod config;
55
pub mod exec;
6-
pub mod int;
6+
pub mod integration;
77
pub mod meta;
88
pub mod status;
99
pub mod test;

vdev/src/commands/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl Cli {
4646
if platform::windows() {
4747
args.extend(["--features".to_string(), "default-msvc".to_string()]);
4848
} else {
49-
args.extend(["--features".to_string(), "default-msvc".to_string()]);
49+
args.extend(["--features".to_string(), "default".to_string()]);
5050
}
5151
}
5252
}

vdev/src/platform.rs

+2-12
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn default_target() -> String {
3737
}
3838

3939
pub const fn windows() -> bool {
40-
cfg!(target_os = "windows")
40+
cfg!(windows)
4141
}
4242

4343
#[allow(dead_code)]
@@ -47,17 +47,7 @@ pub const fn macos() -> bool {
4747

4848
#[allow(dead_code)]
4949
pub const fn unix() -> bool {
50-
cfg!(not(any(target_os = "windows", target_os = "macos")))
51-
}
52-
53-
#[allow(dead_code)]
54-
pub fn os_type() -> os_info::Type {
55-
_os_info().os_type()
56-
}
57-
58-
#[once]
59-
fn _os_info() -> os_info::Info {
60-
os_info::get()
50+
cfg!(not(any(windows, target_os = "macos")))
6151
}
6252

6353
#[once]

0 commit comments

Comments
 (0)