Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 27 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ edition = "2021"

[dependencies]
anyhow = "1.0.58"
clap = "3.0.0-beta.4"
clap = { version = "3.2.8", features = ["derive", "env", "cargo"] }
dialoguer = "0.10.1"
dirs = "4.0.0"
node-semver = "2.0.0"
reqwest = { version = "0.11.11", features = ["blocking"] }
serde = { version = "1.0.137", features = ["derive"] }
serde = { version = "1.0.138", features = ["derive"] }
serde_json = "1.0.82"

[target.'cfg(unix)'.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
};

use anyhow::Result;
use clap::{AppSettings, Clap, ValueHint};
use clap::{AppSettings, Parser, ValueHint};

use crate::subcommand::{
install::InstallCommand, list::ListCommand, parse_version::ParseVersionCommand,
Expand All @@ -15,7 +15,7 @@ mod archives;
mod node_version;
mod subcommand;

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
enum Subcommands {
List(ListCommand),
Install(InstallCommand),
Expand All @@ -24,7 +24,7 @@ enum Subcommands {
ParseVersion(ParseVersionCommand),
}

#[derive(Clap, Debug)]
#[derive(Parser, Debug)]
#[clap(
name = "nvm(-rust)",
about = "Node Version Manager (but better, and in Rust)",
Expand Down
4 changes: 2 additions & 2 deletions src/subcommand/install.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{borrow::Borrow, path::Path};

use anyhow::{Context, Result};
use clap::{AppSettings, Clap};
use clap::{AppSettings, Parser};
use node_semver::Range;

use crate::{
Expand All @@ -11,7 +11,7 @@ use crate::{
Config,
};

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
#[clap(
about = "Install a new node version",
alias = "i",
Expand Down
4 changes: 2 additions & 2 deletions src/subcommand/list.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ops::Deref};

use anyhow::Result;
use clap::{AppSettings, Clap};
use clap::{AppSettings, Parser};
use node_semver::Range;

use crate::{
Expand Down Expand Up @@ -32,7 +32,7 @@ fn latest_version_string_from(status: &VersionStatus) -> String {
}
}

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
#[clap(
about = "List installed and released node versions",
alias = "ls",
Expand Down
2 changes: 1 addition & 1 deletion src/subcommand/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ pub mod parse_version;
pub mod switch;
pub mod uninstall;

pub trait Action<T: clap::Clap> {
pub trait Action<T: clap::Parser> {
fn run(config: &Config, options: &T) -> Result<()>;
}
4 changes: 2 additions & 2 deletions src/subcommand/parse_version.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use anyhow::Result;
use clap::{AppSettings, Clap};
use clap::{AppSettings, Parser};
use node_semver::Range;

use crate::{node_version::is_version_range, subcommand::Action, Config};

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
#[clap(
about = "Echo what a version string will be parsed to",
alias = "pv",
Expand Down
4 changes: 2 additions & 2 deletions src/subcommand/switch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::os::unix::fs::symlink;
use std::os::windows::fs::symlink_dir;

use anyhow::Result;
use clap::{AppSettings, Clap};
use clap::{AppSettings, Parser};
use node_semver::{Range, Version};

use crate::{
Expand All @@ -19,7 +19,7 @@ use crate::{
Config,
};

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
#[clap(
about = "Switch to an installed node version",
alias = "switch",
Expand Down
4 changes: 2 additions & 2 deletions src/subcommand/uninstall.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::Result;
use clap::{AppSettings, Clap};
use clap::{AppSettings, Parser};
use node_semver::Range;

use crate::{
Expand All @@ -9,7 +9,7 @@ use crate::{
Config,
};

#[derive(Clap, Clone, Debug)]
#[derive(Parser, Clone, Debug)]
#[clap(
about = "Uninstall a version",
alias = "r",
Expand Down