Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6d39c7f

Browse files
committedNov 27, 2019
Format libstd with rustfmt
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. 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
1 parent 04e69e4 commit 6d39c7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2887
-2635
lines changed
 

‎src/libstd/ascii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#![stable(feature = "rust1", since = "1.0.0")]
1818

1919
#[stable(feature = "rust1", since = "1.0.0")]
20-
pub use core::ascii::{EscapeDefault, escape_default};
20+
pub use core::ascii::{escape_default, EscapeDefault};
2121

2222
/// Extension methods for ASCII-subset only operations.
2323
///

‎src/libstd/backtrace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ use crate::env;
9595
use crate::fmt;
9696
use crate::sync::atomic::{AtomicUsize, Ordering::SeqCst};
9797
use crate::sync::Mutex;
98-
use crate::sys_common::backtrace::{output_filename, lock};
98+
use crate::sys_common::backtrace::{lock, output_filename};
9999
use crate::vec::Vec;
100-
use backtrace_rs as backtrace;
101100
use backtrace::BytesOrWideString;
101+
use backtrace_rs as backtrace;
102102

103103
/// A captured OS thread stack backtrace.
104104
///

0 commit comments

Comments
 (0)
Please sign in to comment.