Skip to content
/ rust Public
forked from rust-lang/rust

Commit 54aff1f

Browse files
authored
Rollup merge of rust-lang#139721 - dtolnay:stage0newline, r=onur-ozkan
End all lines in src/stage0 with trailing newline Most tools that process text files prefer if every line ends in \n. Text files without the last newline are aberrant and usually not what you want. **Before:** ```console $ cat src/stage0 src/stage0 dist_server=https://static.rust-lang.org artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds ... dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.gz=986f6c594d37bcbd3833e053640ba8775f68d26a65c5618386654ef55d7b3542 dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843dist_server=https://static.rust-lang.org artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds ... dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.gz=986f6c594d37bcbd3833e053640ba8775f68d26a65c5618386654ef55d7b3542 dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843$ ▌ ``` **After:** ```console $ cat src/stage0 src/stage0 dist_server=https://static.rust-lang.org artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds ... dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.gz=986f6c594d37bcbd3833e053640ba8775f68d26a65c5618386654ef55d7b3542 dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843 dist_server=https://static.rust-lang.org artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds ... dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.gz=986f6c594d37bcbd3833e053640ba8775f68d26a65c5618386654ef55d7b3542 dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843 $ ▌ ```
2 parents daed9e2 + 6ba9649 commit 54aff1f

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

Diff for: src/stage0

+1-1
Original file line numberDiff line numberDiff line change
@@ -476,4 +476,4 @@ dist/2025-04-02/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz=e67a33440c3e021ff2
476476
dist/2025-04-02/rustc-nightly-x86_64-unknown-linux-musl.tar.gz=0ea7e17d7bb67d6a6c4b2f864aaffcd96512f15f17f0acc63751eb1df6c486a7
477477
dist/2025-04-02/rustc-nightly-x86_64-unknown-linux-musl.tar.xz=b73d37b704ab58921172cc561f5598db6a504dcd4d7980966f7c26caaf6d3594
478478
dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.gz=986f6c594d37bcbd3833e053640ba8775f68d26a65c5618386654ef55d7b3542
479-
dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843
479+
dist/2025-04-02/rustc-nightly-x86_64-unknown-netbsd.tar.xz=c0d9a88c30d2ab38ec3a11fabb5515ed9bc3ac1a8e35a438d68bf7ff82f6b843

Diff for: src/tools/bump-stage0/src/main.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,33 @@ impl Tool {
6565
nightly_branch,
6666
} = &self.config;
6767

68-
file_content.push_str(&format!("dist_server={}", dist_server));
69-
file_content.push_str(&format!("\nartifacts_server={}", artifacts_server));
68+
file_content.push_str(&format!("dist_server={}\n", dist_server));
69+
file_content.push_str(&format!("artifacts_server={}\n", artifacts_server));
7070
file_content.push_str(&format!(
71-
"\nartifacts_with_llvm_assertions_server={}",
71+
"artifacts_with_llvm_assertions_server={}\n",
7272
artifacts_with_llvm_assertions_server
7373
));
74-
file_content.push_str(&format!("\ngit_merge_commit_email={}", git_merge_commit_email));
75-
file_content.push_str(&format!("\ngit_repository={}", git_repository));
76-
file_content.push_str(&format!("\nnightly_branch={}", nightly_branch));
74+
file_content.push_str(&format!("git_merge_commit_email={}\n", git_merge_commit_email));
75+
file_content.push_str(&format!("git_repository={}\n", git_repository));
76+
file_content.push_str(&format!("nightly_branch={}\n", nightly_branch));
7777

78-
file_content.push_str("\n\n");
78+
file_content.push_str("\n");
7979
file_content.push_str(COMMENTS);
80+
file_content.push_str("\n");
8081

8182
let compiler = self.detect_compiler()?;
82-
file_content.push_str(&format!("\ncompiler_date={}", compiler.date));
83-
file_content.push_str(&format!("\ncompiler_version={}", compiler.version));
83+
file_content.push_str(&format!("compiler_date={}\n", compiler.date));
84+
file_content.push_str(&format!("compiler_version={}\n", compiler.version));
8485

8586
if let Some(rustfmt) = self.detect_rustfmt()? {
86-
file_content.push_str(&format!("\nrustfmt_date={}", rustfmt.date));
87-
file_content.push_str(&format!("\nrustfmt_version={}", rustfmt.version));
87+
file_content.push_str(&format!("rustfmt_date={}\n", rustfmt.date));
88+
file_content.push_str(&format!("rustfmt_version={}\n", rustfmt.version));
8889
}
8990

9091
file_content.push_str("\n");
9192

9293
for (key, value) in self.checksums {
93-
file_content.push_str(&format!("\n{}={}", key, value));
94+
file_content.push_str(&format!("{}={}\n", key, value));
9495
}
9596

9697
std::fs::write(PATH, file_content)?;

0 commit comments

Comments
 (0)