Skip to content

Commit 9291627

Browse files
committed
Auto merge of #112023 - Mark-Simulacrum:bump-version, r=Mark-Simulacrum
Bump to 1.72.0 r? `@Mark-Simulacrum`
2 parents cca7ee5 + 0809338 commit 9291627

File tree

5 files changed

+1
-48
lines changed

5 files changed

+1
-48
lines changed

src/bootstrap/Cargo.lock

-7
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ dependencies = [
5858
"once_cell",
5959
"opener",
6060
"pretty_assertions",
61-
"semver",
6261
"serde",
6362
"serde_derive",
6463
"serde_json",
@@ -646,12 +645,6 @@ version = "1.1.0"
646645
source = "registry+https://github.com/rust-lang/crates.io-index"
647646
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
648647

649-
[[package]]
650-
name = "semver"
651-
version = "1.0.17"
652-
source = "registry+https://github.com/rust-lang/crates.io-index"
653-
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
654-
655648
[[package]]
656649
name = "serde"
657650
version = "1.0.160"

src/bootstrap/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ walkdir = "2"
5757
sysinfo = { version = "0.26.0", optional = true }
5858
clap = { version = "4.2.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }
5959
clap_complete = "4.2.2"
60-
semver = "1.0.17"
6160

6261
# Solaris doesn't support flock() and thus fd-lock is not option now
6362
[target.'cfg(not(target_os = "solaris"))'.dependencies]

src/bootstrap/config.rs

-38
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pub use crate::flags::Subcommand;
2424
use crate::flags::{Color, Flags, Warnings};
2525
use crate::util::{exe, output, t};
2626
use once_cell::sync::OnceCell;
27-
use semver::Version;
2827
use serde::{Deserialize, Deserializer};
2928
use serde_derive::Deserialize;
3029

@@ -1118,7 +1117,6 @@ impl Config {
11181117
config.download_beta_toolchain();
11191118
config.out.join(config.build.triple).join("stage0/bin/rustc")
11201119
});
1121-
11221120
config.initial_cargo = build
11231121
.cargo
11241122
.map(|cargo| {
@@ -1780,42 +1778,6 @@ impl Config {
17801778
self.rust_codegen_backends.get(0).cloned()
17811779
}
17821780

1783-
pub fn check_build_rustc_version(&self) {
1784-
if self.dry_run() {
1785-
return;
1786-
}
1787-
1788-
// check rustc version is same or lower with 1 apart from the building one
1789-
let mut cmd = Command::new(&self.initial_rustc);
1790-
cmd.arg("--version");
1791-
let rustc_output = output(&mut cmd)
1792-
.lines()
1793-
.next()
1794-
.unwrap()
1795-
.split(' ')
1796-
.nth(1)
1797-
.unwrap()
1798-
.split('-')
1799-
.next()
1800-
.unwrap()
1801-
.to_owned();
1802-
let rustc_version = Version::parse(&rustc_output.trim()).unwrap();
1803-
let source_version =
1804-
Version::parse(&fs::read_to_string(self.src.join("src/version")).unwrap().trim())
1805-
.unwrap();
1806-
if !(source_version == rustc_version
1807-
|| (source_version.major == rustc_version.major
1808-
&& source_version.minor == rustc_version.minor + 1))
1809-
{
1810-
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
1811-
eprintln!(
1812-
"Unexpected rustc version: {}, we should use {}/{} to build source with {}",
1813-
rustc_version, prev_version, source_version, source_version
1814-
);
1815-
crate::detail_exit(1);
1816-
}
1817-
}
1818-
18191781
/// Returns the commit to download, or `None` if we shouldn't download CI artifacts.
18201782
fn download_ci_rustc_commit(&self, download_rustc: Option<StringOrBool>) -> Option<String> {
18211783
// If `download-rustc` is not set, default to rebuilding.

src/bootstrap/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ impl Build {
414414
bootstrap_out.display()
415415
)
416416
}
417-
config.check_build_rustc_version();
418417

419418
if rust_info.is_from_tarball() && config.description.is_none() {
420419
config.description = Some("built from a source tarball".to_owned());

src/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.71.0
1+
1.72.0

0 commit comments

Comments
 (0)