Skip to content

Commit f96c72b

Browse files
authored
Merge pull request #194802 from Homebrew/bump-rust-1.82.0
rust 1.82.0
2 parents 2cf8cec + c3a6e82 commit f96c72b

File tree

1 file changed

+79
-28
lines changed

1 file changed

+79
-28
lines changed

Formula/r/rust.rb

+79-28
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@ class Rust < Formula
22
desc "Safe, concurrent, practical language"
33
homepage "https://www.rust-lang.org/"
44
license any_of: ["Apache-2.0", "MIT"]
5-
revision 1
65

76
stable do
8-
url "https://static.rust-lang.org/dist/rustc-1.81.0-src.tar.gz"
9-
sha256 "872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7"
7+
url "https://static.rust-lang.org/dist/rustc-1.82.0-src.tar.gz"
8+
sha256 "7c53f4509eda184e174efa6ba7d5eeb586585686ce8edefc781a2b11a7cf512a"
109

1110
# From https://github.com/rust-lang/rust/tree/#{version}/src/tools
1211
resource "cargo" do
13-
url "https://github.com/rust-lang/cargo/archive/refs/tags/0.82.0.tar.gz"
14-
sha256 "1c89e6a7a28dd78aca53227fd5e14340fcb7cb154ad9655a2f304b5687986cc3"
12+
url "https://github.com/rust-lang/cargo/archive/refs/tags/0.83.0.tar.gz"
13+
sha256 "53fbf5eb9d0c42ce184bd1b170606db7c878e7ef07ed3b513a67e62e14ca4661"
1514
end
1615
end
1716

1817
bottle do
19-
rebuild 1
20-
sha256 cellar: :any, arm64_sequoia: "5ac9af77ca0af21928aea2c4ff945b4c2641cf3cd6fe5a05f900407c022b67b5"
21-
sha256 cellar: :any, arm64_sonoma: "ee7e4b14245fdc2cc0eb624e32dd19cd90c68a13fd0ce8880dc9d227f26a0250"
22-
sha256 cellar: :any, arm64_ventura: "7c44e804a2d41c2367420779c3abe4b07bfdd369372d92115f63d5d41a25b52b"
23-
sha256 cellar: :any, sonoma: "61ca738cfd88cd304a4983148a74e6e06cc076842b1bb8625e8b7022362249f2"
24-
sha256 cellar: :any, ventura: "764f9261722fb7759009d0a2a294d191eda51facae1be7721f3e028856fe9f13"
25-
sha256 cellar: :any_skip_relocation, x86_64_linux: "c9226705d4c61a4fd96a004db47492db39a71e78cc34c8b1eb6c02aef25e22a1"
18+
sha256 cellar: :any, arm64_sequoia: "d360d73408fd04fb4764e56a3f6664d23e5ff31f04e72862f84f0a7890032967"
19+
sha256 cellar: :any, arm64_sonoma: "645ea85f492d6b522a4e393421692ef4d847beec44c7e6229b300788f1846c8c"
20+
sha256 cellar: :any, arm64_ventura: "9cee18d96c531f10110f3819873467c1ff47ae30f6a9a864018dbc94efdc94d5"
21+
sha256 cellar: :any, sonoma: "9f4a7df899767cb1bea9219421c10d6afc3d4a3d44227dcbac4bb01a249a8bc4"
22+
sha256 cellar: :any, ventura: "895f420a4102977bb8b8d5c27e9b9592f74cc289e8d9db7f44036815967f9a28"
23+
sha256 cellar: :any_skip_relocation, x86_64_linux: "12f7054b93eae88d31054b54c9f92a29266acd268e02db4b8f8120303dd3c4c6"
2624
end
2725

2826
head do
@@ -35,7 +33,7 @@ class Rust < Formula
3533

3634
depends_on "libgit2"
3735
depends_on "libssh2"
38-
depends_on "llvm@18"
36+
depends_on "llvm"
3937
depends_on macos: :sierra
4038
depends_on "openssl@3"
4139
depends_on "pkg-config"
@@ -50,32 +48,82 @@ class Rust < Formula
5048
link_overwrite "bin/cargo-fmt", "bin/git-rustfmt", "bin/rustfmt", "bin/rustfmt-*"
5149

5250
# From https://github.com/rust-lang/rust/blob/#{version}/src/stage0
53-
resource "cargobootstrap" do
51+
resource "rustc-bootstrap" do
5452
on_macos do
5553
on_arm do
56-
url "https://static.rust-lang.org/dist/2024-08-08/rustc-1.80.1-aarch64-apple-darwin.tar.xz"
57-
sha256 "b22ac69b19de26fed67634379ae72cbc8fcc2ad1b1d97c4fbcb747264e69f13c"
54+
url "https://static.rust-lang.org/dist/2024-09-05/rustc-1.81.0-aarch64-apple-darwin.tar.xz", using: :nounzip
55+
sha256 "bed00f549a08030b232ad811728e3a5d7239e2e53b667df9cfb11eabf87f2cf3"
5856
end
5957
on_intel do
60-
url "https://static.rust-lang.org/dist/2024-08-08/rustc-1.80.1-x86_64-apple-darwin.tar.xz"
61-
sha256 "72f7a04d1d283a24d76f1fe2317f7ec97daaeeb4010907ca5e7ef83790d94469"
58+
url "https://static.rust-lang.org/dist/2024-09-05/rustc-1.81.0-x86_64-apple-darwin.tar.xz", using: :nounzip
59+
sha256 "2313aa8a68b514e6e337bb97e933cb25a5cbb48506980da4eeaa04394e595aad"
6260
end
6361
end
6462

6563
on_linux do
6664
on_arm do
67-
url "https://static.rust-lang.org/dist/2024-08-08/rustc-1.80.1-aarch64-unknown-linux-gnu.tar.xz"
68-
sha256 "fc21ca734504c3d0ccaf361f05cb491142c365ce8a326f942206b0199c49bbb4"
65+
url "https://static.rust-lang.org/dist/2024-09-05/rustc-1.81.0-aarch64-unknown-linux-gnu.tar.xz", using: :nounzip
66+
sha256 "301f651f38f8c52ebaad0ac7eb211a5ea25c3b690686d1c265febeee62d2c6fc"
6967
end
7068
on_intel do
71-
url "https://static.rust-lang.org/dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-gnu.tar.xz"
72-
sha256 "0367f069b49560af5c61810530d4721ad13eecfcb48952e67a2c32be903d5043"
69+
url "https://static.rust-lang.org/dist/2024-09-05/rustc-1.81.0-x86_64-unknown-linux-gnu.tar.xz", using: :nounzip
70+
sha256 "988a4e4cdecebe4f4a0c52ec4ade5a5bfc58d6958969f5b1e8aac033bda2613e"
71+
end
72+
end
73+
end
74+
75+
# From https://github.com/rust-lang/rust/blob/#{version}/src/stage0
76+
resource "cargo-bootstrap" do
77+
on_macos do
78+
on_arm do
79+
url "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-aarch64-apple-darwin.tar.xz", using: :nounzip
80+
sha256 "cc826e6592016db7a5750a97051b71b48aca2d79f146daf08e953d56000ae43d"
81+
end
82+
on_intel do
83+
url "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-x86_64-apple-darwin.tar.xz", using: :nounzip
84+
sha256 "01a98d95e71025b8c52fdf8bbbe32a2d2739a5861301a99ec889994e3a512292"
85+
end
86+
end
87+
88+
on_linux do
89+
on_arm do
90+
url "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-aarch64-unknown-linux-gnu.tar.xz", using: :nounzip
91+
sha256 "76f8927e4923c26c51b60ef99a29f3609843b3a2730f0bdf2ea6958626f11b11"
92+
end
93+
on_intel do
94+
url "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-x86_64-unknown-linux-gnu.tar.xz", using: :nounzip
95+
sha256 "c50ee4b1ae8695461930e36d5465dddb7c7a0e0f0aa6cbd60de120b17c38b841"
96+
end
97+
end
98+
end
99+
100+
# From https://github.com/rust-lang/rust/blob/#{version}/src/stage0
101+
resource "rust-std-bootstrap" do
102+
on_macos do
103+
on_arm do
104+
url "https://static.rust-lang.org/dist/2024-09-05/rust-std-1.81.0-aarch64-apple-darwin.tar.xz", using: :nounzip
105+
sha256 "2dba5210a79617a9240570c1f7fcc24912a2c96689a3159324727e5a516c6326"
106+
end
107+
on_intel do
108+
url "https://static.rust-lang.org/dist/2024-09-05/rust-std-1.81.0-x86_64-apple-darwin.tar.xz", using: :nounzip
109+
sha256 "8319664a0b39ac47d9b52fce0f45bc9c37b06669ab4f1204a709fb0f2a5a03c3"
110+
end
111+
end
112+
113+
on_linux do
114+
on_arm do
115+
url "https://static.rust-lang.org/dist/2024-09-05/rust-std-1.81.0-aarch64-unknown-linux-gnu.tar.xz", using: :nounzip
116+
sha256 "85567f037cee338f8ec8f9b6287a7f200d221658a996cba254abc91606ece6f4"
117+
end
118+
on_intel do
119+
url "https://static.rust-lang.org/dist/2024-09-05/rust-std-1.81.0-x86_64-unknown-linux-gnu.tar.xz", using: :nounzip
120+
sha256 "6ddf80f254e8eea9956308ba89fd68e1ac7885853df9239b07bbc9f047b7562f"
73121
end
74122
end
75123
end
76124

77125
def llvm
78-
Formula["llvm@18"]
126+
Formula["llvm"]
79127
end
80128

81129
def install
@@ -94,11 +142,6 @@ def install
94142
ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version
95143
end
96144

97-
resource("cargobootstrap").stage do
98-
system "./install.sh", "--prefix=#{buildpath}/cargobootstrap"
99-
end
100-
ENV.prepend_path "PATH", buildpath/"cargobootstrap/bin"
101-
102145
cargo_src_path = buildpath/"src/tools/cargo"
103146
rm_r(cargo_src_path)
104147
resource("cargo").stage cargo_src_path
@@ -108,6 +151,13 @@ def install
108151
'curl = { version = "\\1", features = ["force-system-lib-on-osx"] }'
109152
end
110153

154+
cache_date = File.basename(File.dirname(resource("rustc-bootstrap").url))
155+
build_cache_directory = buildpath/"build/cache"/cache_date
156+
157+
resource("rustc-bootstrap").stage build_cache_directory
158+
resource("cargo-bootstrap").stage build_cache_directory
159+
resource("rust-std-bootstrap").stage build_cache_directory
160+
111161
# rust-analyzer is available in its own formula.
112162
tools = %w[
113163
analysis
@@ -129,6 +179,7 @@ def install
129179
--enable-vendor
130180
--disable-cargo-native-static
131181
--disable-docs
182+
--disable-lld
132183
--set=rust.jemalloc
133184
--release-description=#{tap.user}
134185
]

0 commit comments

Comments
 (0)