Skip to content

Commit 3c01125

Browse files
committed
Add use regex::Regex instead of using full path
1 parent 7962dfe commit 3c01125

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/cli/rustup_mode.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use std::process::Command;
77
use std::str::FromStr;
88

99
use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand};
10+
use regex::Regex;
1011

1112
use super::common;
1213
use super::errors::*;
@@ -1324,7 +1325,7 @@ fn toolchain_remove(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode
13241325
"exactly one regex filter must be supplied"
13251326
);
13261327

1327-
let regex = regex::Regex::from_str(m.values_of("toolchain").unwrap().next().unwrap())
1328+
let regex = Regex::from_str(m.values_of("toolchain").unwrap().next().unwrap())
13281329
.expect("invalid regex");
13291330

13301331
for toolchain in cfg.get_toolchains_from_regex(regex)? {

src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use std::str::FromStr;
88
use std::sync::Arc;
99

1010
use pgp::{Deserializable, SignedPublicKey};
11+
use regex::Regex;
1112
use serde::Deserialize;
1213

1314
use crate::dist::download::DownloadCfg;
@@ -363,7 +364,7 @@ impl Cfg {
363364
Toolchain::from(self, name)
364365
}
365366

366-
pub fn get_toolchains_from_regex(&self, regex: regex::Regex) -> Result<Vec<Toolchain<'_>>> {
367+
pub fn get_toolchains_from_regex(&self, regex: Regex) -> Result<Vec<Toolchain<'_>>> {
367368
Ok(self
368369
.list_toolchains_iter()?
369370
.filter(|toolchain| regex.is_match(toolchain))

0 commit comments

Comments
 (0)