diff options
| author | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-17 17:10:25 +0000 |
| commit | 59ccba995de202fb9d9a8d795d2770fb2d199db0 (patch) | |
| tree | c3fb8fc436dc758eb7b2d7c6ddf438225671c3c0 /src/libstd/sys | |
| parent | dd39ecf368a3cdb937e129f36a2a342d0c9358f0 (diff) | |
| parent | 235fb23e553db0af9ac6e7d134a9f5a35bdf6619 (diff) | |
| download | rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.tar.gz rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.zip | |
Auto merge of #43939 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #43891, #43905, #43912, #43914, #43915, #43916, #43920, #43928, #43930 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/args.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/args.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/redox/args.rs b/src/libstd/sys/redox/args.rs index 6e44ad705fe..59ae2a74a6d 100644 --- a/src/libstd/sys/redox/args.rs +++ b/src/libstd/sys/redox/args.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -//! Global initialization and retreival of command line arguments. +//! Global initialization and retrieval of command line arguments. //! //! On some platforms these are stored during runtime startup, //! and on some they are retrieved from the system on demand. diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs index bbdcb5d3616..810d2d40c05 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -//! Global initialization and retreival of command line arguments. +//! Global initialization and retrieval of command line arguments. //! //! On some platforms these are stored during runtime startup, //! and on some they are retrieved from the system on demand. |