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

"rustfix'" → "rustfix's" #116

Merged
merged 1 commit into from
Jun 3, 2018
Merged

"rustfix'" → "rustfix's" #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cargo-fix/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ fn check_version_control(matches: &::clap::ArgMatches) -> Result<(), Error> {
stream.set_color(ColorSpec::new().set_bold(true))?;
writeln!(stream, "Could not detect a version control system")?;
stream.reset()?;
writeln!(stream, "You should consider using a VCS so you can easily see and revert rustfix' changes.")?;
writeln!(stream, "You should consider using a VCS so you can easily see and revert rustfix's changes.")?;

if !matches.is_present("allow-no-vcs") {
bail!("No VCS found, aborting. Overwrite this behavior with `--allow-no-vcs`.");
Expand All @@ -146,7 +146,7 @@ fn check_version_control(matches: &::clap::ArgMatches) -> Result<(), Error> {
stream.set_color(ColorSpec::new().set_bold(true))?;
writeln!(stream, "Working directory dirty")?;
stream.reset()?;
writeln!(stream, "Make sure your working directory is clean so you can easily revert rustfix' changes.")?;
writeln!(stream, "Make sure your working directory is clean so you can easily revert rustfix's changes.")?;

stream.write_all(&output)?;

Expand Down
4 changes: 2 additions & 2 deletions cargo-fix/tests/all/vcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn warns_if_no_vcs_detected() {
.check_vcs(true)
.stderr(
"warning: Could not detect a version control system\n\
You should consider using a VCS so you can easily see and revert rustfix' changes.\n\
You should consider using a VCS so you can easily see and revert rustfix's changes.\n\
error: No VCS found, aborting. Overwrite this behavior with `--allow-no-vcs`.\n\
",
)
Expand All @@ -43,7 +43,7 @@ fn warns_about_dirty_working_directory() {
.check_vcs(true)
.stderr(
"warning: Working directory dirty\n\
Make sure your working directory is clean so you can easily revert rustfix' changes.\n\
Make sure your working directory is clean so you can easily revert rustfix's changes.\n\
?? Cargo.toml\n\
?? src/\n\
error: Aborting because of dirty working directory. Overwrite this behavior with `--allow-dirty`.\n\n",
Expand Down