Skip to content

Commit

Permalink
Auto merge of #8906 - Aaron1011:fix/trailing-semi, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove unnecessary trailing semicolons

PR rust-lang/rust#78296 will cause rustc to
start warning on semicolons following item statements.
  • Loading branch information
bors committed Nov 29, 2020
2 parents 502ced2 + ea0b5ca commit ea541ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ impl CliUnstable {
bail!("flag -Z{} does not take a value, found: `{}`", key, v);
}
Ok(true)
};
}

fn parse_usize_opt(value: Option<&str>) -> CargoResult<Option<usize>> {
Ok(match value {
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ impl<'cfg> Workspace<'cfg> {
.join("Cargo.toml");
debug!("find_root - pointer {}", path.display());
Ok(paths::normalize_path(&path))
};
}

{
let current = self.packages.load(manifest_path)?;
Expand Down

0 comments on commit ea541ba

Please sign in to comment.