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 57e1da5

Browse files
committedMar 19, 2020
Auto merge of #70118 - pietroalbini:rollup-pgjc90i, r=pietroalbini
Rollup of 2 pull requests Successful merges: - #70112 (Rollup of 10 pull requests) - #70116 (ci: use python from the correct path) Failed merges: r? @ghost
2 parents f509b26 + 94ed071 commit 57e1da5

File tree

285 files changed

+2027
-1839
lines changed

Some content is hidden

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

285 files changed

+2027
-1839
lines changed
 

‎Cargo.lock

+10
Original file line numberDiff line numberDiff line change
@@ -3624,6 +3624,7 @@ dependencies = [
36243624
"rustc_data_structures",
36253625
"rustc_hir",
36263626
"rustc_metadata",
3627+
"rustc_session",
36273628
"rustc_span",
36283629
"rustc_target",
36293630
]
@@ -3677,6 +3678,7 @@ dependencies = [
36773678
"rustc_parse",
36783679
"rustc_plugin_impl",
36793680
"rustc_save_analysis",
3681+
"rustc_session",
36803682
"rustc_span",
36813683
"rustc_target",
36823684
"serialize",
@@ -3791,6 +3793,7 @@ dependencies = [
37913793
"rustc_hir",
37923794
"rustc_index",
37933795
"rustc_macros",
3796+
"rustc_session",
37943797
"rustc_span",
37953798
"rustc_target",
37963799
"smallvec 1.0.0",
@@ -3903,6 +3906,7 @@ dependencies = [
39033906
"rustc_expand",
39043907
"rustc_hir",
39053908
"rustc_index",
3909+
"rustc_session",
39063910
"rustc_span",
39073911
"rustc_target",
39083912
"serialize",
@@ -3933,6 +3937,7 @@ dependencies = [
39333937
"rustc_infer",
39343938
"rustc_lexer",
39353939
"rustc_macros",
3940+
"rustc_session",
39363941
"rustc_span",
39373942
"rustc_target",
39383943
"rustc_trait_selection",
@@ -4013,6 +4018,7 @@ dependencies = [
40134018
"rustc_hir",
40144019
"rustc_lint",
40154020
"rustc_metadata",
4021+
"rustc_session",
40164022
"rustc_span",
40174023
]
40184024

@@ -4027,6 +4033,7 @@ dependencies = [
40274033
"rustc_data_structures",
40284034
"rustc_errors",
40294035
"rustc_hir",
4036+
"rustc_session",
40304037
"rustc_span",
40314038
"rustc_typeck",
40324039
]
@@ -4068,6 +4075,7 @@ dependencies = [
40684075
"rustc_data_structures",
40694076
"rustc_hir",
40704077
"rustc_parse",
4078+
"rustc_session",
40714079
"rustc_span",
40724080
"serde_json",
40734081
]
@@ -4174,6 +4182,7 @@ dependencies = [
41744182
"rustc_data_structures",
41754183
"rustc_hir",
41764184
"rustc_infer",
4185+
"rustc_session",
41774186
"rustc_span",
41784187
"rustc_target",
41794188
"rustc_trait_selection",
@@ -4193,6 +4202,7 @@ dependencies = [
41934202
"rustc_hir",
41944203
"rustc_index",
41954204
"rustc_infer",
4205+
"rustc_session",
41964206
"rustc_span",
41974207
"rustc_target",
41984208
"rustc_trait_selection",

‎src/bootstrap/format.rs

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ struct RustfmtConfig {
3737
}
3838

3939
pub fn format(build: &Build, check: bool) {
40+
if build.config.dry_run {
41+
return;
42+
}
4043
let mut builder = ignore::types::TypesBuilder::new();
4144
builder.add_defaults();
4245
builder.select("rust");

0 commit comments

Comments
 (0)
Please sign in to comment.