diff options
| author | David Tolnay <dtolnay@gmail.com> | 2019-11-29 18:46:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-29 18:46:08 -0800 |
| commit | 27710d28b7779200fcd0b3a91a0713374d3e6854 (patch) | |
| tree | 1de28d8e8fce399eb10afc2a93fcde41c7c3811e /src/libstd/sys_common/process.rs | |
| parent | 77b5a0502627775c65c62e2362d54ad96f7cf215 (diff) | |
| parent | 9ad085070746b5ff4c3262bb65c2cdefe4269198 (diff) | |
| download | rust-27710d28b7779200fcd0b3a91a0713374d3e6854.tar.gz rust-27710d28b7779200fcd0b3a91a0713374d3e6854.zip | |
Rollup merge of #66820 - dtolnay:fmt3, r=Dylan-DPC
Format libstd with rustfmt
(Same strategy as #66691.)
This commit applies rustfmt with rust-lang/rust's default settings to files in src/libstd *that are not involved in any currently open PR* to minimize merge conflicts, and are not part of libstd/os (#66818) or libstd/sys (#66819). The list of files involved in open PRs was determined by querying GitHub's GraphQL API [with this script](https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8).
With the list of files from the script in outstanding_files, the relevant commands were:
$ find src/libstd -name '*.rs' \
| xargs rustfmt --edition=2018 --unstable-features --skip-children
$ rg libstd outstanding_files | xargs git checkout --
Repeating this process several months apart should get us coverage of most of the rest of libstd.
To confirm no funny business:
$ git checkout $THIS_COMMIT^
$ git show --pretty= --name-only $THIS_COMMIT \
| xargs rustfmt --edition=2018 --unstable-features --skip-children
$ git diff $THIS_COMMIT # there should be no difference
Diffstat (limited to 'src/libstd/sys_common/process.rs')
| -rw-r--r-- | src/libstd/sys_common/process.rs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/libstd/sys_common/process.rs b/src/libstd/sys_common/process.rs index bdf66fca359..55b421794c4 100644 --- a/src/libstd/sys_common/process.rs +++ b/src/libstd/sys_common/process.rs @@ -11,16 +11,12 @@ use crate::sys::process::EnvKey; pub struct CommandEnv { clear: bool, saw_path: bool, - vars: BTreeMap<EnvKey, Option<OsString>> + vars: BTreeMap<EnvKey, Option<OsString>>, } impl Default for CommandEnv { fn default() -> Self { - CommandEnv { - clear: false, - saw_path: false, - vars: Default::default() - } + CommandEnv { clear: false, saw_path: false, vars: Default::default() } } } @@ -64,11 +60,7 @@ impl CommandEnv { } pub fn capture_if_changed(&self) -> Option<BTreeMap<EnvKey, OsString>> { - if self.is_unchanged() { - None - } else { - Some(self.capture()) - } + if self.is_unchanged() { None } else { Some(self.capture()) } } // The following functions build up changes |
