Skip to content

Commit

Permalink
Auto merge of #8476 - Rustin-Liu:rustin-patch, r=ehuss
Browse files Browse the repository at this point in the history
fix: add space to comments
  • Loading branch information
bors committed Jul 13, 2020
2 parents f35ebaf + 9ede526 commit 43cf773
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/cargo/ops/cargo_new.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,12 @@ impl IgnoreList {
_ => &self.ignore,
};

let mut out = "\n\n#Added by cargo\n".to_string();
let mut out = "\n\n# Added by cargo\n".to_string();
if ignore_items
.iter()
.any(|item| existing_items.contains(item))
{
out.push_str("#\n#already existing elements were commented out\n");
out.push_str("#\n# already existing elements were commented out\n");
}
out.push('\n');

Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ fn simple_git_ignore_exists() {
contents,
"/target\n\
**/some.file\n\n\
#Added by cargo\n\
# Added by cargo\n\
#\n\
#already existing elements were commented out\n\
# already existing elements were commented out\n\
\n\
#/target\n\
Cargo.lock\n",
Expand All @@ -108,7 +108,7 @@ fn git_ignore_exists_no_conflicting_entries() {
assert_eq!(
contents,
"**/some.file\n\n\
#Added by cargo\n\
# Added by cargo\n\
\n\
/target\n\
Cargo.lock\n",
Expand Down

0 comments on commit 43cf773

Please sign in to comment.