Skip to content

Commit d010015

Browse files
committed
fix: Clean up pass
1 parent 32cf893 commit d010015

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

content/inside-rust/this-development-cycle-in-cargo-1.92.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ https://github.com/rust-lang/cargo/pull/15991
8686
[epage](https://github.com/epage/) posted the [stabilization report](https://github.com/rust-lang/rust/pull/148051)
8787
for the Rust frontmatter syntax,
8888
the first step towards stabilizing Cargo script.
89-
Cargo's frontmatter parser was also updated to better match rustc's include functionality
89+
Cargo's frontmatter parser was also updated to better match rustc's whitespace handling
9090
([#15975](https://github.com/rust-lang/cargo/pull/15975))
9191
and error messages (
9292
[#15952](https://github.com/rust-lang/cargo/pull/15952),
9393
[#15972](https://github.com/rust-lang/cargo/pull/15972)
9494
).
9595

9696
`build-dir` ([docs](https://doc.rust-lang.org/cargo/reference/build-cache.html)),
97-
split out of `target-dir` in Cargo 1.91,
97+
which split out of `target-dir` in Cargo 1.91,
9898
was modeled off of Cargo script but implemented independently.
9999
In [#16073](https://github.com/rust-lang/cargo/pull/16073),
100100
Cargo script switched to using `build-dir = "{cargo-cache-home}/build/{workspace-path-hash}"`
@@ -122,8 +122,8 @@ When we discussed this as a team, we were interested in people being able to get
122122
We were also concerned about platform support for setting `arg[0]` and [`current_exe`](https://doc.rust-lang.org/std/env/fn.current_exe.html).
123123
Granted, shebang support is also not supported on every platform.
124124
Python and Ruby report `arg[0]` as the script but they have more control over the behavior.
125-
In the end, we decided on setting `arg[0]` and it being a best-effort.
126-
We will leave `current_exe` alone to be the way to access the binary path.
125+
In the end, we decided on setting `arg[0]` where possible, on a best-effort basis.
126+
We will leave `current_exe` untouched to serve as the way to access the binary path.
127127
We would be open to people contributing support for more platforms,
128128
likely through contributing it to `std`.
129129
Setting of `arg[0]` was implemented in
@@ -161,14 +161,14 @@ We decided to do the bare minimum sanitization needed for general Cargo commands
161161
During the implementation of
162162
[#16120](https://github.com/rust-lang/cargo/pull/16120),
163163
[epage](https://github.com/epage/)
164-
felt it was too premature to freely allow names that match directory names inside the binary's directory.
165-
Users can just now move some of those directories out in Rust 1.91
164+
felt it was too premature to freely allow names that would collide with directory names from `build-dir` being overlaid with `target-dir`.
165+
Users can now move `build-dir` out in Rust 1.91
166166
([#15833](https://github.com/rust-lang/cargo/pull/15833)).
167167
Changing this to be the default in Cargo is still under discussion
168168
([#16147](https://github.com/rust-lang/cargo/issues/16147))
169169
and users could still move it back.
170-
Instead of sanitizing,
171-
epage let this fall back to existing validation rules that will error.
170+
Instead of sanitizing to avoid conflicts with `build-dir` content,
171+
epage let this fall back to existing validation rules that will error for now.
172172

173173
### Public dependencies
174174

@@ -238,7 +238,7 @@ If we had a new locking scheme
238238
we could reduce path lengths on Windows
239239
and allow intermediate artifact reuse between profiles and even platforms (e.g. build script builds).
240240
As I said earlier, the locking scheme is also blocked on the new layout.
241-
We either have to do implement and stabilize them together or have two transitions.
241+
We either have to implement and stabilize them together or have two transitions.
242242
It doesn't stop there.
243243
A new locking scheme may be benefited by us moving away from mutable intermediate artifacts
244244
which could balloon disk usage as each build for each edit of your source would have a distinct artifact.
@@ -268,7 +268,7 @@ Even once we change the `build-dir` location
268268
([#16147](https://github.com/rust-lang/cargo/issues/16147)),
269269
users will be able to opt-out.
270270
Should we do similar for the new layout itself?
271-
If we made the flag a proper config,
271+
If we made the flag a proper [config](https://doc.rust-lang.org/cargo/reference/config.html),
272272
this would give the `build-dir` layout more of a semblance of stability than is meant.
273273
This is also a maintenance burden.
274274
Supporting the two layouts already complicates things and has limited our changes to the new layout.

0 commit comments

Comments
 (0)