Skip to content

Commit ee0b90d

Browse files
committed
refactor: remove unless function
1 parent a94f6ea commit ee0b90d

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

src/lib.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,10 +1618,9 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
16181618
},
16191619
)
16201620
.await?;
1621-
TsConfig::extend_file_dependencies(
1622-
&mut tsconfig.file_dependencies,
1623-
&reference_tsconfig.file_dependencies,
1624-
);
1621+
tsconfig
1622+
.file_dependencies
1623+
.extend(reference_tsconfig.file_dependencies.iter().cloned());
16251624
reference.tsconfig.replace(reference_tsconfig);
16261625
}
16271626
Ok(())

src/tests/tsconfig_project_references.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::{
44
tsconfig::FileDependencies, ResolveContext, ResolveError, ResolveOptions, Resolver, ResolverPath,
5-
TsConfig, TsconfigOptions, TsconfigReferences,
5+
TsconfigOptions, TsconfigReferences,
66
};
77

88
#[test]
@@ -11,15 +11,15 @@ fn file_dependencies_are_deduplicated() {
1111
file_dependencies.insert("/repo/app/tsconfig.json".into());
1212
file_dependencies.insert("/repo/base.json".into());
1313

14-
let dependencies = [
14+
let dependencies: FileDependencies = [
1515
"/repo/base.json".into(),
1616
"/repo/shared/tsconfig.json".into(),
1717
"/repo/shared/tsconfig.json".into(),
1818
]
1919
.into_iter()
2020
.collect();
2121

22-
TsConfig::extend_file_dependencies(&mut file_dependencies, &dependencies);
22+
file_dependencies.extend(dependencies.iter().cloned());
2323

2424
assert_eq!(
2525
file_dependencies

src/tsconfig.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,9 @@ impl TsConfig {
158158
.base_url
159159
.clone_from(&other_config.compiler_options.base_url);
160160
}
161-
Self::extend_file_dependencies(&mut self.file_dependencies, &other_config.file_dependencies);
162-
}
163-
164-
pub(crate) fn extend_file_dependencies(
165-
file_dependencies: &mut FileDependencies,
166-
dependencies: &FileDependencies,
167-
) {
168-
file_dependencies.extend(dependencies.iter().cloned());
161+
self
162+
.file_dependencies
163+
.extend(other_config.file_dependencies.iter().cloned());
169164
}
170165

171166
pub fn resolve(&self, path: &Utf8Path, specifier: &str) -> Vec<Utf8PathBuf> {

0 commit comments

Comments
 (0)