Skip to content

Commit fc7f4a5

Browse files
perryqhperryqh
committed
linting updates
1 parent 4672d31 commit fc7f4a5

File tree

6 files changed

+67
-71
lines changed

6 files changed

+67
-71
lines changed

‎src/cache/file.rs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,24 @@ const DEFAULT_CACHE_CAPACITY: usize = 10000;
2121

2222
impl Caching for GlobalCache {
2323
fn get_file_owner(&self, path: &Path) -> Result<Option<FileOwnerCacheEntry>, Error> {
24-
if let Some(cache_mutex) = self.file_owner_cache.as_ref() {
25-
if let Ok(cache) = cache_mutex.lock() {
26-
if let Some(cached_entry) = cache.get(path) {
27-
let timestamp = get_file_timestamp(path)?;
28-
if cached_entry.timestamp == timestamp {
29-
return Ok(Some(cached_entry.clone()));
30-
}
31-
}
24+
if let Some(cache_mutex) = self.file_owner_cache.as_ref()
25+
&& let Ok(cache) = cache_mutex.lock()
26+
&& let Some(cached_entry) = cache.get(path)
27+
{
28+
let timestamp = get_file_timestamp(path)?;
29+
if cached_entry.timestamp == timestamp {
30+
return Ok(Some(cached_entry.clone()));
3231
}
3332
}
3433
Ok(None)
3534
}
3635

3736
fn write_file_owner(&self, path: &Path, owner: Option<String>) {
38-
if let Some(cache_mutex) = self.file_owner_cache.as_ref() {
39-
if let Ok(mut cache) = cache_mutex.lock() {
40-
if let Ok(timestamp) = get_file_timestamp(path) {
41-
cache.insert(path.to_path_buf(), FileOwnerCacheEntry { timestamp, owner });
42-
}
43-
}
37+
if let Some(cache_mutex) = self.file_owner_cache.as_ref()
38+
&& let Ok(mut cache) = cache_mutex.lock()
39+
&& let Ok(timestamp) = get_file_timestamp(path)
40+
{
41+
cache.insert(path.to_path_buf(), FileOwnerCacheEntry { timestamp, owner });
4442
}
4543
}
4644

‎src/ownership/file_generator.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ impl FileGenerator {
4949
}
5050

5151
pub fn compare_lines(a: &String, b: &String) -> Ordering {
52-
if let Some((prefix, _)) = a.split_once("**") {
53-
if b.starts_with(prefix) {
54-
return Ordering::Less;
55-
}
52+
if let Some((prefix, _)) = a.split_once("**")
53+
&& b.starts_with(prefix)
54+
{
55+
return Ordering::Less;
5656
}
57-
if let Some((prefix, _)) = b.split_once("**") {
58-
if a.starts_with(prefix) {
59-
return Ordering::Greater;
60-
}
57+
if let Some((prefix, _)) = b.split_once("**")
58+
&& a.starts_with(prefix)
59+
{
60+
return Ordering::Greater;
6161
}
6262
a.cmp(b)
6363
}

‎src/ownership/for_file_fast.rs‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ pub fn find_file_owners(project_root: &Path, config: &Config, file_path: &Path)
3232
if let Some(rel_str) = relative_file_path.to_str() {
3333
let is_config_owned = glob_list_matches(rel_str, &config.owned_globs);
3434
let is_config_unowned = glob_list_matches(rel_str, &config.unowned_globs);
35-
if is_config_owned && !is_config_unowned {
36-
if let Some(team) = teams_by_name.get(&team_name) {
37-
sources_by_team.entry(team.name.clone()).or_default().push(Source::TeamFile);
38-
}
35+
if is_config_owned
36+
&& !is_config_unowned
37+
&& let Some(team) = teams_by_name.get(&team_name)
38+
{
39+
sources_by_team.entry(team.name.clone()).or_default().push(Source::TeamFile);
3940
}
4041
}
4142
}
@@ -194,32 +195,30 @@ fn nearest_package_owner(
194195
if let Some(rel_str) = parent_rel.to_str() {
195196
if glob_list_matches(rel_str, &config.ruby_package_paths) {
196197
let pkg_yml = current.join("package.yml");
197-
if pkg_yml.exists() {
198-
if let Ok(owner) = read_ruby_package_owner(&pkg_yml) {
199-
if let Some(team) = teams_by_name.get(&owner) {
200-
let package_path = parent_rel.join("package.yml");
201-
let package_glob = format!("{rel_str}/**/**");
202-
return Some((
203-
team.name.clone(),
204-
Source::Package(package_path.to_string_lossy().to_string(), package_glob),
205-
));
206-
}
207-
}
198+
if pkg_yml.exists()
199+
&& let Ok(owner) = read_ruby_package_owner(&pkg_yml)
200+
&& let Some(team) = teams_by_name.get(&owner)
201+
{
202+
let package_path = parent_rel.join("package.yml");
203+
let package_glob = format!("{rel_str}/**/**");
204+
return Some((
205+
team.name.clone(),
206+
Source::Package(package_path.to_string_lossy().to_string(), package_glob),
207+
));
208208
}
209209
}
210210
if glob_list_matches(rel_str, &config.javascript_package_paths) {
211211
let pkg_json = current.join("package.json");
212-
if pkg_json.exists() {
213-
if let Ok(owner) = read_js_package_owner(&pkg_json) {
214-
if let Some(team) = teams_by_name.get(&owner) {
215-
let package_path = parent_rel.join("package.json");
216-
let package_glob = format!("{rel_str}/**/**");
217-
return Some((
218-
team.name.clone(),
219-
Source::Package(package_path.to_string_lossy().to_string(), package_glob),
220-
));
221-
}
222-
}
212+
if pkg_json.exists()
213+
&& let Ok(owner) = read_js_package_owner(&pkg_json)
214+
&& let Some(team) = teams_by_name.get(&owner)
215+
{
216+
let package_path = parent_rel.join("package.json");
217+
let package_glob = format!("{rel_str}/**/**");
218+
return Some((
219+
team.name.clone(),
220+
Source::Package(package_path.to_string_lossy().to_string(), package_glob),
221+
));
223222
}
224223
}
225224
}

‎src/ownership/mapper/package_mapper.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ fn remove_nested_packages<'a>(packages: &'a [&'a Package]) -> Vec<&'a Package> {
122122

123123
for package in packages.iter().sorted_by_key(|package| package.package_root()) {
124124
if let Some(last_package) = top_level_packages.last() {
125-
if let (Some(current_root), Some(last_root)) = (package.package_root(), last_package.package_root()) {
126-
if !current_root.starts_with(last_root) {
127-
top_level_packages.push(package);
128-
}
125+
if let (Some(current_root), Some(last_root)) = (package.package_root(), last_package.package_root())
126+
&& !current_root.starts_with(last_root)
127+
{
128+
top_level_packages.push(package);
129129
}
130130
} else {
131131
top_level_packages.push(package);

‎src/ownership/validator.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ impl Validator {
7474
.files
7575
.par_iter()
7676
.flat_map(|file| {
77-
if let Some(owner) = &file.owner {
78-
if !team_names.contains(owner) {
79-
return Some(Error::InvalidTeam {
80-
name: owner.clone(),
81-
path: project.relative_path(&file.path).to_owned(),
82-
});
83-
}
77+
if let Some(owner) = &file.owner
78+
&& !team_names.contains(owner)
79+
{
80+
return Some(Error::InvalidTeam {
81+
name: owner.clone(),
82+
path: project.relative_path(&file.path).to_owned(),
83+
});
8484
}
8585

8686
None

‎src/project_builder.rs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,13 @@ impl<'a> ProjectBuilder<'a> {
6161
builder.filter_entry(move |entry: &DirEntry| {
6262
let path = entry.path();
6363
let file_name = entry.file_name().to_str().unwrap_or("");
64-
if let Some(ft) = entry.file_type() {
65-
if ft.is_dir() {
66-
if let Ok(rel) = path.strip_prefix(&base_path) {
67-
if rel.components().count() == 1 && ignore_dirs.iter().any(|d| *d == file_name) {
68-
return false;
69-
}
70-
}
71-
}
64+
if let Some(ft) = entry.file_type()
65+
&& ft.is_dir()
66+
&& let Ok(rel) = path.strip_prefix(&base_path)
67+
&& rel.components().count() == 1
68+
&& ignore_dirs.iter().any(|d| *d == file_name)
69+
{
70+
return false;
7271
}
7372

7473
true
@@ -92,10 +91,10 @@ impl<'a> ProjectBuilder<'a> {
9291
let _ = tx.send(entry_type);
9392
}
9493
Err(report) => {
95-
if let Ok(mut slot) = error_holder.lock() {
96-
if slot.is_none() {
97-
*slot = Some(report);
98-
}
94+
if let Ok(mut slot) = error_holder.lock()
95+
&& slot.is_none()
96+
{
97+
*slot = Some(report);
9998
}
10099
}
101100
}

0 commit comments

Comments
 (0)