Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

Commit 602d979

Browse files
committed
refactor: address PR feedback
1 parent 3510d4f commit 602d979

File tree

6 files changed

+27
-40
lines changed

6 files changed

+27
-40
lines changed

Cargo.lock

Lines changed: 1 addition & 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ anyhow = "1.0"
1212
askama = "0.11"
1313
clap = { version = "3.1.8", features = ["cargo", "derive"] }
1414
globwalk = "0.8.1"
15-
dpc-pariter = "0.5.1"
15+
pariter = "0.5.1"
1616
pathdiff = "0.2.1"
1717
serde = { version = "1.0", features = ["derive"] }
1818
serde_json = { version = "1.0", features = ["preserve_order"] }

src/link.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::collections::HashMap;
22
use std::path::PathBuf;
33

4-
use anyhow::{anyhow, Result};
4+
use anyhow::{anyhow, ensure, Result};
55

66
use pathdiff::diff_paths;
77

@@ -205,9 +205,10 @@ pub fn link_typescript_project_references(opts: opts::Link) -> Result<()> {
205205
let is_dependencies_link_success = link_package_dependencies(&opts, &lerna_manifest)
206206
.expect("Unable to link internal package dependencies");
207207

208-
if opts.check_only && !(is_children_link_success && is_dependencies_link_success) {
209-
return Err(anyhow!("Found out-of-date project references"));
210-
}
208+
ensure!(
209+
opts.check_only && !(is_children_link_success && is_dependencies_link_success),
210+
"Found out-of-date project references"
211+
);
211212

212213
// TODO(7): create `tsconfig.settings.json` files
213214

src/lint.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::collections::HashMap;
22

3-
use anyhow::{anyhow, Result};
3+
use anyhow::{ensure, Result};
44

55
use crate::opts;
66

@@ -88,9 +88,6 @@ fn lint_dependency_version(opts: &opts::DependencyVersion) -> Result<()> {
8888
is_exit_success = false;
8989
}
9090

91-
if is_exit_success {
92-
return Ok(());
93-
} else {
94-
return Err(anyhow!("Found unexpected dependency versions"));
95-
}
91+
ensure!(is_exit_success, "Found unexpected dependency versions");
92+
Ok(())
9693
}

src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ use anyhow::Result;
44

55
use clap::Parser;
66

7-
use typescript_tools::link;
8-
use typescript_tools::lint;
9-
use typescript_tools::make_depend;
10-
use typescript_tools::opts;
11-
use typescript_tools::pin;
12-
use typescript_tools::query;
7+
use typescript_tools::{link, lint, make_depend, opts, pin, query};
138

149
fn main() -> Result<()> {
1510
let opts = opts::Opts::parse();

src/monorepo_manifest.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use globwalk::{FileType, GlobWalkerBuilder};
1010

1111
use serde::{Deserialize, Serialize};
1212

13-
use dpc_pariter::IteratorExt as _;
13+
use pariter::IteratorExt as _;
1414

1515
use crate::configuration_file::ConfigurationFile;
1616
use crate::package_manifest::PackageManifest;
@@ -60,18 +60,21 @@ where
6060
.expect("Unable to create glob")
6161
.into_iter()
6262
.filter_map(Result::ok)
63-
.parallel_map(move |dir_entry| {
64-
PackageManifest::from_directory(
65-
monorepo_root.clone(),
66-
dir_entry
67-
.path()
68-
.parent()
69-
.expect("Unexpected package in monorepo root")
70-
.strip_prefix(monorepo_root.clone())
71-
.expect("Unexpected package in monorepo root")
72-
.to_owned(),
73-
)
74-
})
63+
.parallel_map_custom(
64+
|options| options.threads(32),
65+
move |dir_entry| {
66+
PackageManifest::from_directory(
67+
monorepo_root.clone(),
68+
dir_entry
69+
.path()
70+
.parent()
71+
.expect("Unexpected package in monorepo root")
72+
.strip_prefix(monorepo_root.clone())
73+
.expect("Unexpected package in monorepo root")
74+
.to_owned(),
75+
)
76+
},
77+
)
7578
.collect()
7679
}
7780

0 commit comments

Comments
 (0)