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
2 changes: 1 addition & 1 deletion src/ownership/codeowners_file_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fn build_codeowners_lines_in_priority(codeowners_file_path: String) -> Vec<Strin
let codeowners_file = match fs::read_to_string(codeowners_file_path) {
Ok(codeowners_file) => codeowners_file,
Err(e) => {
// we can't return the error because it's not clonable
// we can't return the error because it's not cloneable
eprintln!("Error reading codeowners file: {}", e);
return vec![];
}
Expand Down
4 changes: 2 additions & 2 deletions src/ownership/mapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl Display for Source {
Source::TeamGem => write!(f, "Owner specified in Team YML's `owned_gems`"),
Source::TeamGlob(glob) => write!(f, "Owner specified in Team YML as an owned_glob `{}`", glob),
Source::Package(package_path, glob) => {
write!(f, "Owner defined in `{}` with implicity owned glob: `{}`", package_path, glob)
write!(f, "Owner defined in `{}` with implicitly owned glob: `{}`", package_path, glob)
}
Source::TeamYml => write!(f, "Teams own their configuration files"),
}
Expand Down Expand Up @@ -208,7 +208,7 @@ mod tests {
);
assert_eq!(
Source::Package("packs/bam/packag.yml".to_string(), "packs/bam/**/**".to_string()).to_string(),
"Owner defined in `packs/bam/packag.yml` with implicity owned glob: `packs/bam/**/**`"
"Owner defined in `packs/bam/packag.yml` with implicitly owned glob: `packs/bam/**/**`"
);
assert_eq!(Source::TeamYml.to_string(), "Teams own their configuration files");
}
Expand Down
2 changes: 1 addition & 1 deletion src/ownership/mapper/package_mapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl PackageMapper {
let packages: Vec<&Package> = packages.iter().filter(|package| &package.package_type == package_type).collect();

// Nested packs can create a duplicate ownership false positive.
// We avoid it by treating nested packs as a single top level pack for the purpose of validations
// We avoid it by treating nested packs as a single top-level pack for the purposes of validation.
let packages = remove_nested_packages(&packages);

for package in packages {
Expand Down
6 changes: 3 additions & 3 deletions tests/valid_project_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ fn test_for_file_same_team_multiple_ownerships() -> Result<(), Box<dyn Error>> {
Team YML: config/teams/payroll.yml
Description:
- Owner annotation at the top of the file
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicitly owned glob: `javascript/packages/PayrollFlow/**/**`
"}));
Ok(())
}
Expand All @@ -262,7 +262,7 @@ fn test_fast_for_file_same_team_multiple_ownerships() -> Result<(), Box<dyn Erro
Team YML: config/teams/payroll.yml
Description:
- Owner annotation at the top of the file
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicitly owned glob: `javascript/packages/PayrollFlow/**/**`
"}));
Ok(())
}
Expand All @@ -283,7 +283,7 @@ fn test_for_file_with_2_ownerships() -> Result<(), Box<dyn Error>> {
Team YML: config/teams/payroll.yml
Description:
- Owner annotation at the top of the file
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicitly owned glob: `javascript/packages/PayrollFlow/**/**`
"}));

Ok(())
Expand Down