Skip to content

Commit 3f644f9

Browse files
committed
Auto merge of #4610 - hdhoang:patch-1, r=alexcrichton
layout: fix typo, and improve pronoun "it" is ambiguous between `new` and `at` (the most recent noun).
2 parents 5763451 + ffd5e0f commit 3f644f9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/cargo/ops/cargo_rustc/layout.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ pub fn is_bad_artifact_name(name: &str) -> bool {
7878
}
7979

8080
impl Layout {
81-
/// Calcuate the paths for build output, lock the build directory, and return as a Layout.
81+
/// Calculate the paths for build output, lock the build directory, and return as a Layout.
8282
///
8383
/// This function will block if the directory is already locked.
8484
///
85-
/// Differs from `at` in that it calculates the root path from the workspace target directory,
85+
/// Differs from `at` in that this calculates the root path from the workspace target directory,
8686
/// adding the target triple and the profile (debug, release, ...).
8787
pub fn new(ws: &Workspace,
8888
triple: Option<&str>,
@@ -98,7 +98,7 @@ impl Layout {
9898
Layout::at(ws.config(), path)
9999
}
100100

101-
/// Calcuate the paths for build output, lock the build directory, and return as a Layout.
101+
/// Calculate the paths for build output, lock the build directory, and return as a Layout.
102102
///
103103
/// This function will block if the directory is already locked.
104104
pub fn at(config: &Config, root: Filesystem) -> CargoResult<Layout> {

0 commit comments

Comments
 (0)