about summary refs log tree commit diff
path: root/library/std
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-07-14 10:22:01 +0000
committerbors <bors@rust-lang.org>2024-07-14 10:22:01 +0000
commita241cf1c49c46c57ee2ea9b19df4e7e2cc41449d (patch)
tree3b0fcc4c9c6c90accde290b933733579a9de519b /library/std
parent0ffbddd09e02a00b762d838ea1598bfa89dd1668 (diff)
parent82f13e721570f116b34cfe4014fc9915e95fc7aa (diff)
downloadrust-a241cf1c49c46c57ee2ea9b19df4e7e2cc41449d.tar.gz
rust-a241cf1c49c46c57ee2ea9b19df4e7e2cc41449d.zip
Auto merge of #127713 - matthiaskrgr:rollup-zxlyexf, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #127083 (Add release notes for 1.80)
 - #127322 (handle ci-rustc incompatible options during config parse)
 - #127697 (use std for file mtime and atime modifications)
 - #127704 (Fix minor typos in std::process doc on Win argv)
 - #127710 (clarify the meaning of the version number for accepted/removed features)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
-rw-r--r--library/std/src/process.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/process.rs b/library/std/src/process.rs
index f351dab78dc..fc86578a5ff 100644
--- a/library/std/src/process.rs
+++ b/library/std/src/process.rs
@@ -96,9 +96,9 @@
 //! child processes must agree on how the commandline string is encoded.
 //!
 //! Most programs use the standard C run-time `argv`, which in practice results
-//! in consistent argument handling. However some programs have their own way of
+//! in consistent argument handling. However, some programs have their own way of
 //! parsing the commandline string. In these cases using [`arg`] or [`args`] may
-//! result in the child process seeing a different array of arguments then the
+//! result in the child process seeing a different array of arguments than the
 //! parent process intended.
 //!
 //! Two ways of mitigating this are: