Skip to content

Commit 276da7e

Browse files
jperkinjperkin
committed
rust: Update to version 1.45.2.
While here clean up all pkglint warnings. Changes since 1.44.1: Version 1.45.2 (2020-08-03) ========================== * [Fix bindings in tuple struct patterns][74954] * [Fix track_caller integration with trait objects][74784] [74954]: rust-lang/rust#74954 [74784]: rust-lang/rust#74784 Version 1.45.1 (2020-07-30) ========================== * [Fix const propagation with references.][73613] * [rustfmt accepts rustfmt_skip in cfg_attr again.][73078] * [Avoid spurious implicit region bound.][74509] * [Install clippy on x.py install][74457] [73613]: rust-lang/rust#73613 [73078]: rust-lang/rust#73078 [74509]: rust-lang/rust#74509 [74457]: rust-lang/rust#74457 Version 1.45.0 (2020-07-16) ========================== Language -------- - [Out of range float to int conversions using `as` has been defined as a saturating conversion.][71269] This was previously undefined behaviour, but you can use the `{f64, f32}::to_int_unchecked` methods to continue using the current behaviour, which may be desirable in rare performance sensitive situations. - [`mem::Discriminant<T>` now uses `T`'s discriminant type instead of always using `u64`.][70705] - [Function like procedural macros can now be used in expression, pattern, and statement positions.][68717] This means you can now use a function-like procedural macro anywhere you can use a declarative (`macro_rules!`) macro. Compiler -------- - [You can now override individual target features through the `target-feature` flag.][72094] E.g. `-C target-feature=+avx2 -C target-feature=+fma` is now equivalent to `-C target-feature=+avx2,+fma`. - [Added the `force-unwind-tables` flag.][69984] This option allows rustc to always generate unwind tables regardless of panic strategy. - [Added the `embed-bitcode` flag.][71716] This codegen flag allows rustc to include LLVM bitcode into generated `rlib`s (this is on by default). - [Added the `tiny` value to the `code-model` codegen flag.][72397] - [Added tier 3 support\* for the `mipsel-sony-psp` target.][72062] - [Added tier 3 support for the `thumbv7a-uwp-windows-msvc` target.][72133] \* Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries --------- - [`net::{SocketAddr, SocketAddrV4, SocketAddrV6}` now implements `PartialOrd` and `Ord`.][72239] - [`proc_macro::TokenStream` now implements `Default`.][72234] - [You can now use `char` with `ops::{Range, RangeFrom, RangeFull, RangeInclusive, RangeTo}` to iterate over a range of codepoints.][72413] E.g. you can now write the following; ```rust for ch in 'a'..='z' { print!("{}", ch); } println!(); // Prints "abcdefghijklmnopqrstuvwxyz" ``` - [`OsString` now implements `FromStr`.][71662] - [The `saturating_neg` method as been added to all signed integer primitive types, and the `saturating_abs` method has been added for all integer primitive types.][71886] - [`Arc<T>`, `Rc<T>` now implement `From<Cow<'_, T>>`, and `Box` now implements `From<Cow>` when `T` is `[T: Copy]`, `str`, `CStr`, `OsStr`, or `Path`.][71447] - [`Box<[T]>` now implements `From<[T; N]>`.][71095] - [`BitOr` and `BitOrAssign` are implemented for all `NonZero` integer types.][69813] - [The `fetch_min`, and `fetch_max` methods have been added to all atomic integer types.][72324] - [The `fetch_update` method has been added to all atomic integer types.][71843] Stabilized APIs --------------- - [`Arc::as_ptr`] - [`BTreeMap::remove_entry`] - [`Rc::as_ptr`] - [`rc::Weak::as_ptr`] - [`rc::Weak::from_raw`] - [`rc::Weak::into_raw`] - [`str::strip_prefix`] - [`str::strip_suffix`] - [`sync::Weak::as_ptr`] - [`sync::Weak::from_raw`] - [`sync::Weak::into_raw`] - [`char::UNICODE_VERSION`] - [`Span::resolved_at`] - [`Span::located_at`] - [`Span::mixed_site`] - [`unix::process::CommandExt::arg0`] Cargo ----- Misc ---- - [Rustdoc now supports strikethrough text in Markdown.][71928] E.g. `~~outdated information~~` becomes "~~outdated information~~". - [Added an emoji to Rustdoc's deprecated API message.][72014] Compatibility Notes ------------------- - [Trying to self initialize a static value (that is creating a value using itself) is unsound and now causes a compile error.][71140] - [`{f32, f64}::powi` now returns a slightly different value on Windows.][73420] This is due to changes in LLVM's intrinsics which `{f32, f64}::powi` uses. - [Rustdoc's CLI's extra error exit codes have been removed.][71900] These were previously undocumented and not intended for public use. Rustdoc still provides a non-zero exit code on errors. Internals Only -------------- - [Make clippy a git subtree instead of a git submodule][70655] - [Unify the undo log of all snapshot types][69464] [73420]: rust-lang/rust#73420 [72324]: rust-lang/rust#72324 [71843]: rust-lang/rust#71843 [71886]: rust-lang/rust#71886 [72234]: rust-lang/rust#72234 [72239]: rust-lang/rust#72239 [72397]: rust-lang/rust#72397 [72413]: rust-lang/rust#72413 [72014]: rust-lang/rust#72014 [72062]: rust-lang/rust#72062 [72094]: rust-lang/rust#72094 [72133]: rust-lang/rust#72133 [71900]: rust-lang/rust#71900 [71928]: rust-lang/rust#71928 [71662]: rust-lang/rust#71662 [71716]: rust-lang/rust#71716 [71447]: rust-lang/rust#71447 [71269]: rust-lang/rust#71269 [71095]: rust-lang/rust#71095 [71140]: rust-lang/rust#71140 [70655]: rust-lang/rust#70655 [70705]: rust-lang/rust#70705 [69984]: rust-lang/rust#69984 [69813]: rust-lang/rust#69813 [69464]: rust-lang/rust#69464 [68717]: rust-lang/rust#68717 [`Arc::as_ptr`]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#method.as_ptr [`BTreeMap::remove_entry`]: https://doc.rust-lang.org/stable/std/collections/struct.BTreeMap.html#method.remove_entry [`Rc::as_ptr`]: https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#method.as_ptr [`rc::Weak::as_ptr`]: https://doc.rust-lang.org/stable/std/rc/struct.Weak.html#method.as_ptr [`rc::Weak::from_raw`]: https://doc.rust-lang.org/stable/std/rc/struct.Weak.html#method.from_raw [`rc::Weak::into_raw`]: https://doc.rust-lang.org/stable/std/rc/struct.Weak.html#method.into_raw [`sync::Weak::as_ptr`]: https://doc.rust-lang.org/stable/std/sync/struct.Weak.html#method.as_ptr [`sync::Weak::from_raw`]: https://doc.rust-lang.org/stable/std/sync/struct.Weak.html#method.from_raw [`sync::Weak::into_raw`]: https://doc.rust-lang.org/stable/std/sync/struct.Weak.html#method.into_raw [`str::strip_prefix`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.strip_prefix [`str::strip_suffix`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.strip_suffix [`char::UNICODE_VERSION`]: https://doc.rust-lang.org/stable/std/char/constant.UNICODE_VERSION.html [`Span::resolved_at`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.resolved_at [`Span::located_at`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.located_at [`Span::mixed_site`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.mixed_site [`unix::process::CommandExt::arg0`]: https://doc.rust-lang.org/std/os/unix/process/trait.CommandExt.html#tymethod.arg0
1 parent 4886ac0 commit 276da7e

9 files changed

+183
-146
lines changed

‎lang/rust/Makefile

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.187 2020/07/08 14:46:14 jperkin Exp $
1+
# $NetBSD: Makefile,v 1.188 2020/08/06 11:42:56 jperkin Exp $
22

3-
DISTNAME= rustc-1.44.1-src
3+
DISTNAME= rustc-1.45.2-src
44
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
55
CATEGORIES= lang
66
MASTER_SITES= http://static.rust-lang.org/dist/
@@ -156,40 +156,32 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
156156
#
157157
DISTFILES:= ${DEFAULT_DISTFILES}
158158

159-
.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi)
160-
RUST_STAGE0_VER= 1.41.1
161-
RUST_ARCH:= i686-apple-darwin
162-
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
163-
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
164-
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
165-
pre-build-fix:
166-
.endif
167159
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
168-
RUST_STAGE0_VER= 1.43.1
160+
RUST_STAGE0_VER= 1.44.1
169161
RUST_ARCH:= x86_64-apple-darwin
170162
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
171163
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
172164
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
173165
pre-build-fix:
174166
.endif
175167
.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
176-
RUST_STAGE0_VER= 1.43.1
168+
RUST_STAGE0_VER= 1.44.1
177169
RUST_ARCH:= i686-unknown-linux-gnu
178170
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
179171
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
180172
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
181173
pre-build-fix:
182174
.endif
183175
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
184-
RUST_STAGE0_VER= 1.43.1
176+
RUST_STAGE0_VER= 1.44.1
185177
RUST_ARCH:= x86_64-unknown-linux-gnu
186178
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
187179
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
188180
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
189181
pre-build-fix:
190182
.endif
191183
.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
192-
RUST_STAGE0_VER= 1.43.1
184+
RUST_STAGE0_VER= 1.44.1
193185
RUST_ARCH:= x86_64-sun-solaris
194186
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
195187
SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -198,23 +190,23 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
198190
pre-build-fix:
199191
.endif
200192
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
201-
RUST_STAGE0_VER= 1.43.1
193+
RUST_STAGE0_VER= 1.44.1
202194
RUST_ARCH:= i686-unknown-freebsd
203195
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
204196
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
205197
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
206198
pre-build-fix:
207199
.endif
208200
.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
209-
RUST_STAGE0_VER= 1.43.1
201+
RUST_STAGE0_VER= 1.44.1
210202
RUST_ARCH:= x86_64-unknown-freebsd
211203
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
212204
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
213205
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
214206
pre-build-fix:
215207
.endif
216208
.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
217-
RUST_STAGE0_VER= 1.43.1
209+
RUST_STAGE0_VER= 1.44.1
218210
RUST_ARCH= i686-unknown-netbsd
219211
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
220212
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -231,15 +223,15 @@ pre-build-fix:
231223
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
232224
.endif
233225
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
234-
RUST_STAGE0_VER= 1.43.1
226+
RUST_STAGE0_VER= 1.44.1
235227
RUST_ARCH= x86_64-unknown-netbsd
236228
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
237229
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
238230
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
239231
pre-build-fix:
240232
.endif
241233
.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
242-
RUST_STAGE0_VER= 1.43.1
234+
RUST_STAGE0_VER= 1.44.1
243235
RUST_ARCH= powerpc-unknown-netbsd
244236
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
245237
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -249,7 +241,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
249241
pre-build-fix:
250242
.endif
251243
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
252-
RUST_STAGE0_VER= 1.43.1
244+
RUST_STAGE0_VER= 1.44.1
253245
RUST_ARCH= aarch64-unknown-netbsd
254246
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
255247
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -259,7 +251,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
259251
pre-build-fix:
260252
.endif
261253
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
262-
RUST_STAGE0_VER= 1.43.1
254+
RUST_STAGE0_VER= 1.44.1
263255
RUST_ARCH= sparc64-unknown-netbsd
264256
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
265257
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -340,10 +332,18 @@ CKSUMS+= baa97a46744047bef086334ed9a63b340e4aba85e6471493780fc99d8e6445ed
340332
CKSUMS+= 8d8a171090b75e86e7505921460fba072db0077942edd11c4a3c8a70e9164eef
341333
CKSUMS+= 7ad3b486020bd652ad7c5af752f039c30ee0099c86ff6b6f336587db7a2bc523
342334

335+
CKSUM_CRATES+= vendor/stacker
336+
CKSUMS+= 0f3602e048ab4bc5304226b9c171aee46bd58d0e354ead9c7d2ba6ac6d6f262f
337+
CKSUMS+= 978a71088fd5b6116eb9839d311b34a701d1429928fc536de872c2e5cd74dec8
338+
343339
CKSUM_CRATES+= vendor/time
344340
CKSUMS+= 4f6bc5c6300c2d49da7d21615152872e16d53c0f02540824f48c45edd4d3140f
345341
CKSUMS+= 6d460b1899de033f625ccb13b1e3ba28cd338980a8c88c518a18749a079bafc3
346342

343+
CKSUM_CRATES+= vendor/tokio-uds
344+
CKSUMS+= 2d4ba4a488ebc43333a5a89dbf1bf614d157e916e97b0364c06e3056d5865913
345+
CKSUMS+= 9b9f0d753fdd362defe0c28c118b80dee04a8d736c5b090a62560e9bc771c7ea
346+
347347
SUBST_CLASSES+= cksum
348348
SUBST_STAGE.cksum= pre-configure
349349
.for crate in ${CKSUM_CRATES}
@@ -403,9 +403,6 @@ do-install:
403403
&& ${_ULIMIT_CMD} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
404404
${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N}
405405

406-
GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
407-
sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
408-
409406
.if ${OPSYS} == "Darwin"
410407
.PHONY: fix-darwin-install-name
411408
post-install: fix-darwin-install-name
@@ -415,6 +412,9 @@ fix-darwin-install-name:
415412
done
416413
.endif
417414

415+
GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
416+
${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
417+
418418
# Create a relocatable stage2 bootstrap from the bits we just built that can be
419419
# used to build the next version of rust. Currently only tested on SmartOS.
420420
#
@@ -427,6 +427,7 @@ USE_TOOLS+= gtar
427427
# cannot extend the length of the RPATH...
428428
ELFEDIT?= /usr/bin/elfedit
429429

430+
.PHONY: stage0-bootstrap
430431
stage0-bootstrap: install
431432
${RM} -rf ${BOOTSTRAP_TMPDIR}
432433
${MKDIR} ${BOOTSTRAP_TMPDIR}
@@ -478,7 +479,8 @@ stage0-bootstrap: install
478479
libssh2.so.1 libunistring.so.2; do \
479480
${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
480481
done
481-
for f in ${BOOTSTRAP_TMPDIR}/bin/{cargo*,clippy*,rls,rustc,rustdoc,rustfmt}; do \
482+
for f in ${BOOTSTRAP_TMPDIR}/bin/*; do \
483+
/bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
482484
${ELFEDIT} -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \
483485
done
484486
for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \

‎lang/rust/cargo.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: cargo.mk,v 1.17 2020/06/14 15:33:27 nia Exp $
1+
# $NetBSD: cargo.mk,v 1.18 2020/08/06 11:42:56 jperkin 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
@@ -28,10 +28,10 @@ USE_TOOLS+= bsdtar digest
2828
CARGO_VENDOR_DIR= ${WRKDIR}/vendor
2929

3030
DISTFILES?= ${DEFAULT_DISTFILES}
31-
.for _crate in ${CARGO_CRATE_DEPENDS}
32-
DISTFILES+= ${_crate}.crate
33-
SITES.${_crate}.crate+= -${MASTER_SITE_CRATESIO}${_crate:C/-[0-9]+\.[0-9.]+.*$//}/${_crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
34-
EXTRACT_DIR.${_crate}.crate?= ${CARGO_VENDOR_DIR}
31+
.for crate in ${CARGO_CRATE_DEPENDS}
32+
DISTFILES+= ${crate}.crate
33+
SITES.${crate}.crate+= -${MASTER_SITE_CRATESIO}${crate:C/-[0-9]+\.[0-9.]+.*$//}/${crate:C/^.*-([0-9]+\.[0-9.]+.*)$/\1/}/download
34+
EXTRACT_DIR.${crate}.crate?= ${CARGO_VENDOR_DIR}
3535
.endfor
3636

3737
.include "../../mk/bsd.prefs.mk"
@@ -48,10 +48,10 @@ cargo-vendor-crates:
4848
${RUN}${MKDIR} ${WRKSRC}/.cargo
4949
${RUN}${PRINTF} "[source.crates-io]\nreplace-with = \"vendored-sources\"\n[source.vendored-sources]\ndirectory = \"${CARGO_VENDOR_DIR}\"\n" > ${WRKSRC}/.cargo/config
5050
${RUN}${MKDIR} ${CARGO_VENDOR_DIR}
51-
.for _crate in ${CARGO_CRATE_DEPENDS}
51+
.for crate in ${CARGO_CRATE_DEPENDS}
5252
${RUN}${PRINTF} '{"package":"%s","files":{}}' \
53-
$$(${DIGEST} sha256 < ${_DISTDIR}/${_crate}.crate) \
54-
> ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json
53+
$$(${DIGEST} sha256 < ${_DISTDIR}/${crate}.crate) \
54+
> ${CARGO_VENDOR_DIR}/${crate}/.cargo-checksum.json
5555
.endfor
5656

5757
.PHONY: show-cargo-depends

0 commit comments

Comments
 (0)