Skip to content

Commit 3c90d7e

Browse files
he32he32
committed
Update lang/rust to version 1.52.1.
Pkgsrc changes: * Bump bootstrap kit version to 1.51.0. * Adjust patches as needed. * Update checksum adjustments. * Fix syntax error in commands adjusting libserde_derive for Darwin Upstream changes: Version 1.52.1 (2021-05-10) ============================ This release disables incremental compilation, unless the user has explicitly opted in via the newly added RUSTC_FORCE_INCREMENTAL=1 environment variable. This is due to the widespread, and frequently occuring, breakage encountered by Rust users due to newly enabled incremental verification in 1.52.0. Notably, Rust users **should** upgrade to 1.52.0 or 1.52.1: the bugs that are detected by newly added incremental verification are still present in past stable versions, and are not yet fixed on any channel. These bugs can lead to miscompilation of Rust binaries. These problems only affect incremental builds, so release builds with Cargo should not be affected unless the user has explicitly opted into incremental. Debug and check builds are affected. See [84970] for more details. [84970]: rust-lang/rust#84970 Version 1.52.0 (2021-05-06) ============================ Language -------- - [Added the `unsafe_op_in_unsafe_fn` lint, which checks whether the unsafe code in an `unsafe fn` is wrapped in a `unsafe` block.][79208] This lint is allowed by default, and may become a warning or hard error in a future edition. - [You can now cast mutable references to arrays to a pointer of the same type as the element.][81479] Compiler -------- - [Upgraded the default LLVM to LLVM 12.][81451] Added tier 3\* support for the following targets. - [`s390x-unknown-linux-musl`][82166] - [`riscv32gc-unknown-linux-musl` & `riscv64gc-unknown-linux-musl`][82202] - [`powerpc-unknown-openbsd`][82733] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [`OsString` now implements `Extend` and `FromIterator`.][82121] - [`cmp::Reverse` now has `#[repr(transparent)]` representation.][81879] - [`Arc<impl Error>` now implements `error::Error`.][80553] - [All integer division and remainder operations are now `const`.][80962] Stabilised APIs ------------- - [`Arguments::as_str`] - [`char::MAX`] - [`char::REPLACEMENT_CHARACTER`] - [`char::UNICODE_VERSION`] - [`char::decode_utf16`] - [`char::from_digit`] - [`char::from_u32_unchecked`] - [`char::from_u32`] - [`slice::partition_point`] - [`str::rsplit_once`] - [`str::split_once`] The following previously stable APIs are now `const`. - [`char::len_utf8`] - [`char::len_utf16`] - [`char::to_ascii_uppercase`] - [`char::to_ascii_lowercase`] - [`char::eq_ignore_ascii_case`] - [`u8::to_ascii_uppercase`] - [`u8::to_ascii_lowercase`] - [`u8::eq_ignore_ascii_case`] Rustdoc ------- - [Rustdoc lints are now treated as a tool lint, meaning that lints are now prefixed with `rustdoc::` (e.g. `#[warn(rustdoc::non_autolinks)]`).][80527] Using the old style is still allowed, and will become a warning in a future release. - [Rustdoc now supports argument files.][82261] - [Rustdoc now generates smart punctuation for documentation.][79423] - [You can now use "task lists" in Rustdoc Markdown.][81766] E.g. ```markdown - [x] Complete - [ ] Todo ``` Misc ---- - [You can now pass multiple filters to tests.][81356] E.g. `cargo test -- foo bar` will run all tests that match `foo` and `bar`. - [Rustup now distributes PDB symbols for the `std` library on Windows, allowing you to see `std` symbols when debugging.][82218] Internal Only ------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Check the result cache before the DepGraph when ensuring queries][81855] - [Try fast_reject::simplify_type in coherence before doing full check][81744] - [Only store a LocalDefId in some HIR nodes][81611] - [Store HIR attributes in a side table][79519] Compatibility Notes ------------------- - [Cargo build scripts are now forbidden from setting `RUSTC_BOOTSTRAP`.][cargo/9181] - [Removed support for the `x86_64-rumprun-netbsd` target.][82594] - [Deprecated the `x86_64-sun-solaris` target in favor of `x86_64-pc-solaris`.][82216] - [Rustdoc now only accepts `,`, ` `, and `\t` as delimiters for specifying languages in code blocks.][78429] - [Rustc now catches more cases of `pub_use_of_private_extern_crate`][80763] - [Changes in how proc macros handle whitespace may lead to panics when used with older `proc-macro-hack` versions. A `cargo update` should be sufficient to fix this in all cases.][84136] [84136]: rust-lang/rust#84136 [80763]: rust-lang/rust#80763 [82166]: rust-lang/rust#82166 [82121]: rust-lang/rust#82121 [81879]: rust-lang/rust#81879 [82261]: rust-lang/rust#82261 [82218]: rust-lang/rust#82218 [82216]: rust-lang/rust#82216 [82202]: rust-lang/rust#82202 [81855]: rust-lang/rust#81855 [81766]: rust-lang/rust#81766 [81744]: rust-lang/rust#81744 [81611]: rust-lang/rust#81611 [81479]: rust-lang/rust#81479 [81451]: rust-lang/rust#81451 [81356]: rust-lang/rust#81356 [80962]: rust-lang/rust#80962 [80553]: rust-lang/rust#80553 [80527]: rust-lang/rust#80527 [79519]: rust-lang/rust#79519 [79423]: rust-lang/rust#79423 [79208]: rust-lang/rust#79208 [78429]: rust-lang/rust#78429 [82733]: rust-lang/rust#82733 [82594]: rust-lang/rust#82594 [cargo/9181]: rust-lang/cargo#9181 [`char::MAX`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.MAX [`char::REPLACEMENT_CHARACTER`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.REPLACEMENT_CHARACTER [`char::UNICODE_VERSION`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.UNICODE_VERSION [`char::decode_utf16`]: https://doc.rust-lang.org/std/primitive.char.html#method.decode_utf16 [`char::from_u32`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32 [`char::from_u32_unchecked`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32_unchecked [`char::from_digit`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_digit [`Peekable::next_if`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if [`Peekable::next_if_eq`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if_eq [`Arguments::as_str`]: https://doc.rust-lang.org/stable/std/fmt/struct.Arguments.html#method.as_str [`str::split_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.split_once [`str::rsplit_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.rsplit_once [`slice::partition_point`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.partition_point [`char::len_utf8`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf8 [`char::len_utf16`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf16 [`char::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_uppercase [`char::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_lowercase [`char::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.eq_ignore_ascii_case [`u8::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_uppercase [`u8::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_lowercase [`u8::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.eq_ignore_ascii_case
1 parent a947e55 commit 3c90d7e

11 files changed

+187
-195
lines changed

‎lang/rust/Makefile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.238 2021/05/26 09:21:39 he Exp $
1+
# $NetBSD: Makefile,v 1.239 2021/05/31 10:17:53 he Exp $
22

3-
DISTNAME= rustc-1.51.0-src
3+
DISTNAME= rustc-1.52.1-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= https://static.rust-lang.org/dist/
@@ -175,55 +175,55 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
175175
DISTFILES:= ${DEFAULT_DISTFILES}
176176

177177
.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
178-
RUST_STAGE0_VER= 1.50.0
178+
RUST_STAGE0_VER= 1.51.0
179179
RUST_ARCH:= aarch64-apple-darwin
180180
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
181181
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
182182
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
183183
pre-build-fix:
184184
.endif
185185
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
186-
RUST_STAGE0_VER= 1.50.0
186+
RUST_STAGE0_VER= 1.51.0
187187
RUST_ARCH:= x86_64-apple-darwin
188188
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
189189
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
190190
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
191191
pre-build-fix:
192192
.endif
193193
.if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
194-
RUST_STAGE0_VER= 1.50.0
194+
RUST_STAGE0_VER= 1.51.0
195195
RUST_ARCH:= aarch64-unknown-linux-gnu
196196
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
197197
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
198198
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
199199
pre-build-fix:
200200
.endif
201201
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
202-
RUST_STAGE0_VER= 1.50.0
202+
RUST_STAGE0_VER= 1.51.0
203203
RUST_ARCH:= arm-unknown-linux-gnueabihf
204204
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
205205
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
206206
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
207207
pre-build-fix:
208208
.endif
209209
.if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
210-
RUST_STAGE0_VER= 1.50.0
210+
RUST_STAGE0_VER= 1.51.0
211211
RUST_ARCH:= armv7-unknown-linux-gnueabihf
212212
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
213213
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
214214
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
215215
pre-build-fix:
216216
.endif
217217
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
218-
RUST_STAGE0_VER= 1.50.0
218+
RUST_STAGE0_VER= 1.51.0
219219
RUST_ARCH:= i686-unknown-linux-gnu
220220
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
221221
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
222222
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
223223
pre-build-fix:
224224
.endif
225225
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
226-
RUST_STAGE0_VER= 1.50.0
226+
RUST_STAGE0_VER= 1.51.0
227227
RUST_ARCH:= x86_64-unknown-linux-gnu
228228
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
229229
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -236,7 +236,7 @@ pre-build-fix:
236236
# x86_64-sun-solaris bootstrap and comment out the overrides.
237237
#
238238
.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
239-
RUST_STAGE0_VER= 1.50.0
239+
RUST_STAGE0_VER= 1.51.0
240240
RUST_ARCH:= x86_64-unknown-illumos
241241
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
242242
SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -250,15 +250,15 @@ CONFIGURE_ARGS+= --target=${RUST_ARCH}
250250
pre-build-fix:
251251
.endif
252252
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
253-
RUST_STAGE0_VER= 1.50.0
253+
RUST_STAGE0_VER= 1.51.0
254254
RUST_ARCH:= x86_64-unknown-freebsd
255255
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
256256
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
257257
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
258258
pre-build-fix:
259259
.endif
260260
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
261-
RUST_STAGE0_VER= 1.50.0
261+
RUST_STAGE0_VER= 1.51.0
262262
RUST_ARCH= i586-unknown-netbsd
263263
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
264264
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -275,15 +275,15 @@ pre-build-fix:
275275
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
276276
.endif
277277
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
278-
RUST_STAGE0_VER= 1.50.0
278+
RUST_STAGE0_VER= 1.51.0
279279
RUST_ARCH= x86_64-unknown-netbsd
280280
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
281281
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
282282
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
283283
pre-build-fix:
284284
.endif
285285
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
286-
RUST_STAGE0_VER= 1.50.0
286+
RUST_STAGE0_VER= 1.51.0
287287
RUST_ARCH= powerpc-unknown-netbsd
288288

289289
# Cross-built against NetBSD 9.0
@@ -307,7 +307,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
307307
pre-build-fix:
308308
.endif
309309
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
310-
RUST_STAGE0_VER= 1.50.0
310+
RUST_STAGE0_VER= 1.51.0
311311
RUST_ARCH= aarch64-unknown-netbsd
312312
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
313313
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -317,7 +317,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
317317
pre-build-fix:
318318
.endif
319319
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
320-
RUST_STAGE0_VER= 1.50.0
320+
RUST_STAGE0_VER= 1.51.0
321321
RUST_ARCH= sparc64-unknown-netbsd
322322
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
323323
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -328,7 +328,7 @@ pre-build-fix:
328328
.endif
329329
.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
330330
RUST_ARCH= armv7-unknown-netbsd-eabihf
331-
RUST_STAGE0_VER= 1.50.0
331+
RUST_STAGE0_VER= 1.51.0
332332
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
333333
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
334334
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -368,8 +368,8 @@ SUBST_VARS.rpath= PREFIX
368368
# updating and verification.
369369
#
370370
CKSUM_CRATES+= vendor/libc
371-
CKSUMS+= 8d7ddc8dd25a9404f9181a49438d9506c676cfd4b6fa21dbe5c1f9969abc4b91
372-
CKSUMS+= f147be95b04ea1303171dff46c5a66b08cd47ccd0a4c346d5bcec7a8aaac3fc4
371+
CKSUMS+= ed57a5ad4c715a9038055fe3a57ea12f5ef97c55c3f603596e721a5cbb90ed73
372+
CKSUMS+= 3cd5c5296dc09431c77663cb5b4b4ddd4454e18b6846fdb670da859280d3f6d1
373373

374374
CKSUM_CRATES+= vendor/cc-1.0.60
375375
CKSUMS+= 903c5f2f5dd0cc7d04f99f605a95e6abde8b38156fd4e73eefc58493f55a4e5a
@@ -480,7 +480,7 @@ post-install: fix-darwin-install-name
480480
fix-darwin-install-name:
481481
for f in ${DESTDIR}${PREFIX}/lib/librustc_macros-*.dylib \
482482
${DESTDIR}${PREFIX}/lib/libtracing_attributes-*.dylib \
483-
${DESTDIR}${PREFIX}/lib/libserde_derive-*.dylib \
483+
${DESTDIR}${PREFIX}/lib/libserde_derive-*.dylib; \
484484
${DESTDIR}${PREFIX}/lib/libchalk_derive-*.dylib; do \
485485
install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
486486
done

‎lang/rust/cargo.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cargo.mk,v 1.24 2021/01/12 15:37:32 jperkin Exp $
1+
# $NetBSD: cargo.mk,v 1.25 2021/05/31 10:17:53 he Exp $
22
#
33
# Common logic that can be used by packages that depend on cargo crates
44
# from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -51,7 +51,7 @@ cargo-vendor-crates:
5151
${RUN}${MKDIR} ${CARGO_VENDOR_DIR}
5252
.for crate in ${CARGO_CRATE_DEPENDS}
5353
${RUN}${PRINTF} '{"package":"%s","files":{}}' \
54-
$$(${DIGEST} sha256 < ${_DISTDIR}/${crate}.crate) \
54+
`$(${DIGEST} sha256 < ${_DISTDIR}/${crate}.crate` \
5555
> ${CARGO_VENDOR_DIR}/${crate}/.cargo-checksum.json
5656
.endfor
5757

‎lang/rust/cross.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cross.mk,v 1.6 2021/05/26 09:21:39 he Exp $
1+
# $NetBSD: cross.mk,v 1.7 2021/05/31 10:17:53 he Exp $
22

33
# These settings may be used to cross-build rust.
44
#
@@ -25,10 +25,10 @@
2525
# The GNU cross target designation
2626
#GNU_CROSS_TARGET= armv7--netbsdelf-eabihf
2727
#GNU_CROSS_TARGET= sparc64--netbsd
28-
#GNU_CROSS_TARGET= i486--netbsdelf
2928
#GNU_CROSS_TARGET= powerpc--netbsd
3029
#GNU_CROSS_TARGET= aarch64--netbsd
3130
#GNU_CROSS_TARGET= aarch64_be--netbsd
31+
#GNU_CROSS_TARGET= i486--netbsdelf
3232
#MAKE_ENV+= GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
3333

3434
# To cross-build rust, you need to specify

0 commit comments

Comments
 (0)