On Sat, Jul 22, 2017 at 02:09:17PM +0200, Sebastien Marie wrote:
> Hi,
>
> The following diff updates rustc to 1.19.0.
>
updated diff to be in sync with latest changes on lang/rust.
Thanks.
--
Sebastien Marie
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1628
diff -u -p -r1.1628 Makefile
--- devel/Makefile 17 Jul 2017 00:24:11 -0000 1.1628
+++ devel/Makefile 22 Jul 2017 12:07:17 -0000
@@ -50,7 +50,6 @@
SUBDIR += capstone
SUBDIR += catalyst
SUBDIR += catalyst-tutorial
- SUBDIR += cargo
SUBDIR += cargo-generate-vendor
SUBDIR += cbmc
SUBDIR += ccache
Index: devel/cargo/Makefile
===================================================================
RCS file: devel/cargo/Makefile
diff -N devel/cargo/Makefile
--- devel/cargo/Makefile 17 Jun 2017 02:08:10 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,215 +0,0 @@
-# $OpenBSD: Makefile,v 1.14 2017/06/17 02:08:10 danj Exp $
-COMMENT = package manager for Rust language
-
-ONLY_FOR_ARCHS = amd64 i386
-
-# cargo version
-CARGO_VERSION = 0.19.0
-RUSTC_VERSION = 1.18.0
-
-# cargo version used for bootstrapping
-BV-amd64 = 0.19.0-20170611
-BV-i386 = 0.19.0-20170611
-BOOTSTRAP_VERSION = ${BV-${MACHINE_ARCH}}
-
-PKGNAME = cargo-${CARGO_VERSION}
-DISTNAME = rustc-${RUSTC_VERSION}-src
-CATEGORIES = devel
-
-HOMEPAGE = https://doc.crates.io/
-
-MAINTAINER = Sebastien Marie <sema...@online.fr>
-
-DIST_SUBDIR = rust
-MODCARGO_DIST_SUBDIR = ../cargo
-
-# cargo is dual licensed MIT/Apache-2.0
-# third-parties (detail below):
-# - MIT
-# - Unlicense/MIT
-# - MIT/Apache-2.0
-#
-PERMIT_PACKAGE_CDROM = Yes
-
-WANTLIB = c crypto curl git2 m pthread ssh2 ssl
-
-MODCARGO_CRATES += advapi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += aho-corasick-0.5.3 # Unlicense/MIT
-MODCARGO_CRATES += aho-corasick-0.6.3 # Unlicense/MIT
-MODCARGO_CRATES += bitflags-0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES += cfg-if-0.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += chrono-0.2.25 # MIT/Apache-2.0
-MODCARGO_CRATES += cmake-0.1.22 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-0.2.10 # Apache-2.0/MIT
-MODCARGO_CRATES += curl-0.4.6 # MIT
-MODCARGO_CRATES += curl-sys-0.3.10 # MIT
-MODCARGO_CRATES += docopt-0.7.0 # Unlicense/MIT
-MODCARGO_CRATES += dtoa-0.4.1 # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger-0.4.2 # MIT/Apache-2.0
-MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0
-MODCARGO_CRATES += flate2-0.2.17 # MIT/Apache-2.0
-MODCARGO_CRATES += foreign-types-0.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += fs2-0.4.1 # MIT/Apache-2.0
-MODCARGO_CRATES += gcc-0.3.45 # MIT/Apache-2.0
-MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += git2-0.6.4 # MIT/Apache-2.0
-MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
-MODCARGO_CRATES += hamcrest-0.1.1 # MIT/Apache-2.0
-MODCARGO_CRATES += idna-0.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += itoa-0.3.1 # MIT/Apache-2.0
-MODCARGO_CRATES += kernel32-sys-0.2.2 # MIT
-MODCARGO_CRATES += lazy_static-0.2.5 # MIT
-MODCARGO_CRATES += libc-0.2.21 # MIT/Apache-2.0
-MODCARGO_CRATES += libgit2-sys-0.6.7 # MIT/Apache-2.0
-MODCARGO_CRATES += libssh2-sys-0.2.5 # MIT/Apache-2.0
-MODCARGO_CRATES += libz-sys-1.0.13 # MIT/Apache-2.0
-MODCARGO_CRATES += log-0.3.7 # MIT/Apache-2.0
-MODCARGO_CRATES += matches-0.1.4 # MIT
-MODCARGO_CRATES += memchr-0.1.11 # Unlicense/MIT
-MODCARGO_CRATES += memchr-1.0.1 # Unlicense/MIT
-MODCARGO_CRATES += miniz-sys-0.1.9 # MIT/Apache-2.0
-MODCARGO_CRATES += miow-0.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += net2-0.2.27 # MIT/Apache-2.0
-MODCARGO_CRATES += num-0.1.37 # MIT/Apache-2.0
-MODCARGO_CRATES += num-bigint-0.1.37 # MIT/Apache-2.0
-MODCARGO_CRATES += num-iter-0.1.33 # MIT/Apache-2.0
-MODCARGO_CRATES += num-complex-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += num-integer-0.1.33 # MIT/Apache-2.0
-MODCARGO_CRATES += num-rational-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += num-traits-0.1.37 # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-0.9.10 # Apache-2.0
-MODCARGO_CRATES += openssl-probe-0.1.1 # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-sys-0.9.10 # MIT
-MODCARGO_CRATES += pkg-config-0.3.9 # MIT/Apache-2.0
-MODCARGO_CRATES += psapi-sys-0.1.0 # MIT
-MODCARGO_CRATES += quote-0.3.15 # MIT/Apache-2.0
-MODCARGO_CRATES += rand-0.3.15 # MIT/Apache-2.0
-MODCARGO_CRATES += redox_syscall-0.1.17 # MIT
-MODCARGO_CRATES += regex-0.1.80 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-0.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-syntax-0.3.9 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-syntax-0.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += rustc-serialize-0.3.23 # MIT/Apache-2.0
-MODCARGO_CRATES += semver-0.6.0 # MIT/Apache-2.0
-MODCARGO_CRATES += semver-parser-0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += serde-0.9.12 # MIT/Apache-2.0
-MODCARGO_CRATES += serde_codegen_internals-0.14.2 # MIT/Apache-2.0
-MODCARGO_CRATES += serde_derive-0.9.12 # MIT/Apache-2.0
-MODCARGO_CRATES += serde_ignored-0.0.2 # MIT/Apache-2.0
-MODCARGO_CRATES += serde_json-0.9.9 # MIT/Apache-2.0
-MODCARGO_CRATES += shell-escape-0.1.3 # MIT/Apache-2.0
-MODCARGO_CRATES += strsim-0.6.0 # MIT
-MODCARGO_CRATES += syn-0.11.9 # MIT/Apache-2.0
-MODCARGO_CRATES += synom-0.11.3 # MIT/Apache-2.0
-MODCARGO_CRATES += tar-0.4.10 # MIT/Apache-2.0
-MODCARGO_CRATES += tempdir-0.3.5 # MIT/Apache-2.0
-MODCARGO_CRATES += term-0.4.5 # MIT/Apache-2.0
-MODCARGO_CRATES += thread-id-2.0.0 # Apache-2.0
-MODCARGO_CRATES += thread-id-3.0.0 # Apache-2.0
-MODCARGO_CRATES += thread_local-0.2.7 # Apache-2.0/MIT
-MODCARGO_CRATES += thread_local-0.3.3 # Apache-2.0/MIT
-MODCARGO_CRATES += time-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += toml-0.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += unicode-bidi-0.2.5 # MIT / Apache-2.0
-MODCARGO_CRATES += unicode-normalization-0.1.4 # MIT/Apache-2.0
-MODCARGO_CRATES += unicode-xid-0.0.4 # MIT/Apache-2.0
-MODCARGO_CRATES += unreachable-0.1.1 # MIT
-MODCARGO_CRATES += url-1.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += user32-sys-0.2.0 # MIT
-MODCARGO_CRATES += utf8-ranges-0.1.3 # Unlicense/MIT
-MODCARGO_CRATES += utf8-ranges-1.0.0 # Unlicense/MIT
-MODCARGO_CRATES += void-1.0.2 # MIT
-MODCARGO_CRATES += winapi-0.2.8 # MIT
-MODCARGO_CRATES += winapi-build-0.1.1 # MIT
-MODCARGO_CRATES += ws2_32-sys-0.2.1 # MIT
-
-MASTER_SITES = https://static.rust-lang.org/dist/
-MASTER_SITES0 = http://kapouay.odns.fr/pub/cargo/
-DISTFILES += ${DISTNAME}${EXTRACT_SUFX} \
- ${BOOTSTRAP}
-
-BOOTSTRAP = ${BOOTSTRAP-${MACHINE_ARCH}}
-.for m in i386 amd64
-BOOTSTRAP-$m = cargo-bootstrap-${m}-${BV-$m}.tar.gz:0
-SUPDISTFILES += ${BOOTSTRAP-$m}
-.endfor
-
-SEPARATE_BUILD = Yes
-
-MODULES = devel/cargo \
- lang/python
-
-# only deal with MODCARGO_CRATES
-MODCARGO_BUILDDEP = No
-MODCARGO_BUILD = No
-MODCARGO_INSTALL = No
-MODCARGO_TEST = No
-
-# redefine MODCARGO_CARGO_BIN to match bootstrapper
-MODCARGO_CARGO_BIN =
${WRKDIR}/cargo-bootstrap-${MACHINE_ARCH}-${BOOTSTRAP_VERSION}/cargo
-
-MODPY_RUNDEP = No
-
-USE_GMAKE = Yes
-
-BUILD_DEPENDS = devel/cmake \
- lang/rust>=1.14
-
-LIB_DEPENDS = net/curl \
- devel/libgit2/libgit2 \
- security/libssh2
-
-RUN_DEPENDS = lang/rust
-
-CONFIGURE_STYLE = cargo \
- simple
-CONFIGURE_ARGS += --prefix=${LOCALBASE} \
- --mandir=${LOCALBASE}/man \
- --release-channel=stable \
- --local-rust-root=${LOCALBASE} \
- --rustc=${LOCALBASE}/bin/rustc \
- --rustdoc=${LOCALBASE}/bin/rustdoc \
- --cargo=${MODCARGO_CARGO_BIN}
-
-MAKE_ENV += ${MODCARGO_ENV} \
- VERBOSE=1 \
- LIBGIT2_SYS_USE_PKG_CONFIG=1
-
-WRKDIST = ${WRKDIR}/${DISTNAME}/cargo
-
-SUBST_VARS += MODCARGO_TARGET_DIR
-pre-test:
- ${SUBST_CMD} ${WRKSRC}/tests/cargotest/support/paths.rs
-.ifdef FULLTEST
- rm -rf -- ${WRKDIR}/.cargo/config
-.endif
-
-post-extract:
- rmdir ${WRKSRC}/src/rust-installer
- ln -s ${WRKDIR}/${DISTNAME}/src/rust-installer \
- ${WRKSRC}/src/rust-installer
-
-post-install:
- rm -rf ${PREFIX}/lib/rustlib
- mkdir -p ${PREFIX}/share/bash-completion/completions
- mv ${PREFIX}${SYSCONFDIR}/bash_completion.d/cargo \
- ${PREFIX}/share/bash-completion/completions
- rmdir ${PREFIX}${SYSCONFDIR}/bash_completion.d \
- ${PREFIX}${SYSCONFDIR}
-
-# make a directory suitable for bootstrapping
-BOOTSTRAPDIR_CUR =
${WRKDIR}/cargo-bootstrap-${MACHINE_ARCH}-${BOOTSTRAP_VERSION}
-BOOTSTRAPDIR_NEW =
${WRKDIR}/cargo-bootstrap-${MACHINE_ARCH}-${CARGO_VERSION}-new
-bootstrap: fake
- rm -rf ${BOOTSTRAPDIR_NEW}
- mkdir -p ${BOOTSTRAPDIR_NEW}
- cp ${BOOTSTRAPDIR_CUR}/cargo ${BOOTSTRAPDIR_NEW}/cargo
- cp ${WRKINST}${PREFIX}/bin/cargo ${BOOTSTRAPDIR_NEW}/cargo.bin
- ldd ${BOOTSTRAPDIR_NEW}/cargo.bin \
- | sed -ne 's,.* \(/.*/lib/lib.*\.so[.0-9]*\)$$,\1,p' \
- | xargs -r -J % cp % ${BOOTSTRAPDIR_NEW}
-
-.include <bsd.port.mk>
Index: devel/cargo/cargo.port.mk
===================================================================
RCS file: /cvs/ports/devel/cargo/cargo.port.mk,v
retrieving revision 1.5
diff -u -p -r1.5 cargo.port.mk
--- devel/cargo/cargo.port.mk 15 Feb 2017 12:49:43 -0000 1.5
+++ devel/cargo/cargo.port.mk 22 Jul 2017 12:07:17 -0000
@@ -95,8 +95,7 @@ MODCARGO_configure += ;
.endif
# Build dependencies.
-MODCARGO_BUILD_DEPENDS = devel/cargo \
- lang/rust
+MODCARGO_BUILD_DEPENDS = lang/rust
# devel/cargo-generate-vendor is mandatory for hooks.
BUILD_DEPENDS += devel/cargo-generate-vendor
Index: devel/cargo/distinfo
===================================================================
RCS file: devel/cargo/distinfo
diff -N devel/cargo/distinfo
--- devel/cargo/distinfo 17 Jun 2017 02:08:10 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,190 +0,0 @@
-SHA256 (rust/../cargo/advapi32-sys-0.2.0.tar.gz) =
4GWICAyxnQrLZzmAiq+l8mv7LKAVsrY3ACi0TPfLipo=
-SHA256 (rust/../cargo/aho-corasick-0.5.3.tar.gz) =
ypcsLqX3Qr/OVoe5rvdVBqdk9h03+PZJBHhGqWht22Y=
-SHA256 (rust/../cargo/aho-corasick-0.6.3.tar.gz) =
UAkJxPh6nlI1WyZibYkIM+nh1TrFZtt2w2+qmEuIlpk=
-SHA256 (rust/../cargo/bitflags-0.7.0.tar.gz) =
qtGJN6Yo7Gq80m0UiQEswOGMIXmCEPSRr2ne2biBEG0=
-SHA256 (rust/../cargo/bufstream-0.1.2.tar.gz) =
e0jb4v8OmPovAzd9IEqWN9PJgWzUMb/gWoq70OoR0HQ=
-SHA256 (rust/../cargo/cfg-if-0.1.0.tar.gz) =
3h52DXtlNa9CQfyovYrfaOLn7azGsp9dOZBQxeSM+Iw=
-SHA256 (rust/../cargo/chrono-0.2.25.tar.gz) =
khP3zXwn6VwrV8SfDmmx6mWycTjahKFwEz/SGwdlnAA=
-SHA256 (rust/../cargo/cmake-0.1.22.tar.gz) =
0Y1omH7UxRbcw+eRNlm/pAdvUYLupKfgA4uwYJU+dqw=
-SHA256 (rust/../cargo/crossbeam-0.2.10.tar.gz) =
DF6iFWZMomTaip2cO+gNLq8wkjwlnQPocDiOuSdQj5c=
-SHA256 (rust/../cargo/curl-0.4.6.tar.gz) =
yQ4SQO80DdQCet5Dnlx8IGTdncZSaCEXvVDRSGo63Xs=
-SHA256 (rust/../cargo/curl-sys-0.3.10.tar.gz) =
wNkJ3EAq6AtvewEYwDkgNDYGG52aPKXSwlRtk+CmGqo=
-SHA256 (rust/../cargo/docopt-0.7.0.tar.gz) =
qzLqbihNh5hwZvIanoCac8FHIFce80UW8IkLPTVcz9g=
-SHA256 (rust/../cargo/dtoa-0.4.1.tar.gz) =
gMi3H9cRRpkKl0L8Bty73hkWGiZ+CtTlcsNRYvRXjJA=
-SHA256 (rust/../cargo/env_logger-0.4.2.tar.gz) =
44VvFpcJhgb8bLl6k96Iyj87w1u4eMclkg5uguzwXoM=
-SHA256 (rust/../cargo/filetime-0.1.10.tar.gz) =
U2OrjkE5uFaKYjfbUkhkblqKL4m9XMsCCSGCsR/T6SI=
-SHA256 (rust/../cargo/flate2-0.2.17.tar.gz) =
1OTQwV74KcvBt82mUXRr4ZzO6yOL57EEkiexSJHfniU=
-SHA256 (rust/../cargo/foreign-types-0.2.0.tar.gz) =
PkBWub1H+KxboSvncfd6Da55bRu6r1/QucLTi2m4op0=
-SHA256 (rust/../cargo/fs2-0.4.1.tar.gz) =
NO2u4HVVhZ3BPKOH5q4FaGu00DZMldZJttq5WVEfS68=
-SHA256 (rust/../cargo/gcc-0.3.45.tar.gz) =
QImTNvtQ2wx4cQ9T6Hr8VNjHJm+3YmL+zHjKGn8J3q4=
-SHA256 (rust/../cargo/gdi32-sys-0.2.0.tar.gz) =
CRJRWo/yS6kAQi7NqAC1L0AWpWJRki05fFdr+SxpBRg=
-SHA256 (rust/../cargo/git2-0.6.4.tar.gz) =
BGrgM4UlcECyo15W2WadlQ3ZEbor9IIC++9z7mqrJ7I=
-SHA256 (rust/../cargo/git2-curl-0.7.0.tar.gz) =
aGdrx4S/C++DJ4iYkpv2SiUeh8A0ByPQuT+glsnFv44=
-SHA256 (rust/../cargo/glob-0.2.11.tar.gz) =
i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s=
-SHA256 (rust/../cargo/hamcrest-0.1.1.tar.gz) =
vwiPBCpGcInpuqSXL1f5JH5CoMxUm6Jkx6BPu47LidQ=
-SHA256 (rust/../cargo/idna-0.1.0.tar.gz) =
EFMjbgDOT2aK7KSnaaCbO/WmgtgCq9bzyzk3T2sWLBE=
-SHA256 (rust/../cargo/itoa-0.3.1.tar.gz) =
6y9AT7xm/ZqsE+mYJIUF5+yyrY5Eq2OIaExfsRxsJRw=
-SHA256 (rust/../cargo/kernel32-sys-0.2.2.tar.gz) =
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
-SHA256 (rust/../cargo/lazy_static-0.2.5.tar.gz) =
RzLFY7miGkBlZcR0fap7RnQvCCkRrkdT85DcnsfuGpc=
-SHA256 (rust/../cargo/libc-0.2.21.tar.gz) =
iO6BiF+fBL/5keMG/qfBxgpfD55Anpn2tA4zEaM2MTU=
-SHA256 (rust/../cargo/libgit2-sys-0.6.7.tar.gz) =
2VH9XsyuB8dOjCwQdbBeoeQ75/iVIkWvjChA0UgLHZU=
-SHA256 (rust/../cargo/libssh2-sys-0.2.5.tar.gz) =
keE1ZFwuGYo5VSyMdoa7W4OxuZ9kgxwECmwnmKEZWTQ=
-SHA256 (rust/../cargo/libz-sys-1.0.13.tar.gz) =
5e6RKkXWhtOT1ayH+sFboLoY2q4U6OdUPGPr9/t+lww=
-SHA256 (rust/../cargo/log-0.3.7.tar.gz) =
UUHsoCd1p2LMbNVk2NLFD2fA6jo3LL8cUVkrPgKeEK0=
-SHA256 (rust/../cargo/matches-0.1.4.tar.gz) =
79diLjAi4abqpgLEzqiRIlTlWCycaS6RZ3FBgiRIAbE=
-SHA256 (rust/../cargo/memchr-0.1.11.tar.gz) =
2LYp+1FDdsZ1uYwUIegLFR04F6xC18ZncX0oJ2FBjSA=
-SHA256 (rust/../cargo/memchr-1.0.1.tar.gz) =
HbzMDkbx6ke58X5tZ8Wpa9JwMFGcUZyckTJ+MSdaR7Q=
-SHA256 (rust/../cargo/miniz-sys-0.1.9.tar.gz) =
KOruF2ZmcfqHLlZ1R+hCjoMwjr5YCM32oOKDl9vixyY=
-SHA256 (rust/../cargo/miow-0.2.1.tar.gz) =
jB8vOxzzMd5olqq/bp1V3KkDVsyZYMyn6q9AijVa6Rk=
-SHA256 (rust/../cargo/net2-0.2.27.tar.gz) =
GLlkKtYiL69c5G9pZvWbcbl3WtV1jJ4J/PCmyAYZcrQ=
-SHA256 (rust/../cargo/num-0.1.37.tar.gz) =
mLFbqE6RDqehlzvM0997Ma4oK/nYvSiXd5lQybgwPUA=
-SHA256 (rust/../cargo/num-bigint-0.1.37.tar.gz) =
um2DixblbaG2w4PQZf8ew8fXeX9lo+j2unCS/YeCC6w=
-SHA256 (rust/../cargo/num-complex-0.1.36.tar.gz) =
NTSJjYofaxbBL5/C9Oqrx+zcxV8mchPKqJiP3H1g/5Q=
-SHA256 (rust/../cargo/num-integer-0.1.33.tar.gz) =
IeTfEJjR15fSfvDGnBeMP6tklBVZspD8rhmOCCXJyLU=
-SHA256 (rust/../cargo/num-iter-0.1.33.tar.gz) =
99GJG9e5NvEjSbfRQDdhyKC4WhixSOnaRCnV0QLBpB4=
-SHA256 (rust/../cargo/num-rational-0.1.36.tar.gz) =
wtxeoEAgqPGDGK5IXHUfjPocDmnc9GXCndqqZKMTzEQ=
-SHA256 (rust/../cargo/num-traits-0.1.37.tar.gz) =
4cv6N4Hz/nPcBTIb7VKgbS1JHqp2TFIzXPQ5nwRuzpk=
-SHA256 (rust/../cargo/num_cpus-1.3.0.tar.gz) =
oYw5JGZAnFC4c2lBSiaAyT5zmu3rSY6yv/fX61aXROI=
-SHA256 (rust/../cargo/openssl-0.9.10.tar.gz) =
2KoOt6rUTw2m992hPdtFWdkaD0DPqxULH3atWznsUj8=
-SHA256 (rust/../cargo/openssl-probe-0.1.1.tar.gz) =
2Y3wJw1ATM08BQpB1XnFLR2xU3UWi7NHHgTsD183ja8=
-SHA256 (rust/../cargo/openssl-sys-0.9.10.tar.gz) =
FPW/0SBU12RRC4hxUtVkuhHZmuJOp9dAeBd49kZiBXY=
-SHA256 (rust/../cargo/pkg-config-0.3.9.tar.gz) =
OotMa4FlzRoc1LmxIJeBMTifZL2vRWQ1yqQeYw7bqQM=
-SHA256 (rust/../cargo/psapi-sys-0.1.0.tar.gz) =
q81dGgfTYOKXJ/dXqd7LPOi8bg76iWnPqtZpqDF6JHg=
-SHA256 (rust/../cargo/quote-0.3.15.tar.gz) =
em6SC2XGXxCyrmXIMagaBzqJ7dKMfM6JR1v/Rnq0Fno=
-SHA256 (rust/../cargo/rand-0.3.15.tar.gz) =
Ai4GNuwlGd2uSBVLAohkvc5Or301Imq45lxhG+l7GJ0=
-SHA256 (rust/../cargo/redox_syscall-0.1.17.tar.gz) =
Kdvf1LnfirMd7EfGCHt7E8v0p3bzNeTejvuoKI3aB1s=
-SHA256 (rust/../cargo/regex-0.1.80.tar.gz) =
T9Ss5qjPeGBxSiwigNbB9+akE0hsEymLvIb9PaAZQC8=
-SHA256 (rust/../cargo/regex-0.2.1.tar.gz) =
QnjBfQ9tYt/vCrAAKP60W9fSEChD+AdjR07rG+ihDAE=
-SHA256 (rust/../cargo/regex-syntax-0.3.9.tar.gz) =
+ewALDXoZ5GCXtKUtQAI7qnd/I3vRCAST7xrCNuDSVc=
-SHA256 (rust/../cargo/regex-syntax-0.4.0.tar.gz) =
L5GRsfV2AwlfEF0xfjddGbHJxcMYXqljOpmm3L7QRFc=
-SHA256 (rust/../cargo/rustc-serialize-0.3.23.tar.gz) =
aEzkhDbWRlMAyep4O2sUxDYda43LsTdbSGppzBni37A=
-SHA256 (rust/../cargo/semver-0.6.0.tar.gz) =
ejGG7J5lBxoglUNLH1uySDjU6OEw9YTHkPYDPHmUNTc=
-SHA256 (rust/../cargo/semver-parser-0.7.0.tar.gz) =
OIod8lPsoIVQvvbHI5LP58MJFL9B31Jptoy9b/j1cKM=
-SHA256 (rust/../cargo/serde-0.9.12.tar.gz) =
8CODjn4YeMZ5Mi3H9mw2SL0zdjohX611LzeKYjhWiY0=
-SHA256 (rust/../cargo/serde_codegen_internals-0.14.2.tar.gz) =
vIiL0oO9JCCxatDYYONa2KyyGUEYCoOhibsgRvnQBAA=
-SHA256 (rust/../cargo/serde_derive-0.9.12.tar.gz) =
67dTY59tVboay80zDMr02fWGI1OsKFHkPqxjwqU0OhE=
-SHA256 (rust/../cargo/serde_ignored-0.0.2.tar.gz) =
1LP1V2h0ch0UaQZX6fDtKG5ypSvi9v3Azy8CQYK9j2Q=
-SHA256 (rust/../cargo/serde_json-0.9.9.tar.gz) =
28RUOVUuuPuGkHosQcH9Dvl0WO+4f/f4eNtGbrWBgk4=
-SHA256 (rust/../cargo/shell-escape-0.1.3.tar.gz) =
3VzJZIHVRYOUe/6IvzDCPVP4g8bNAUU2i2mYnZe4Tvg=
-SHA256 (rust/../cargo/strsim-0.6.0.tar.gz) =
tNFcgQUZqRz4d+fjbmP+BogVxngYFDny8p4lYhR8NpQ=
-SHA256 (rust/../cargo/syn-0.11.9.tar.gz) =
SAyDRwHKujVIqpkeVGdygb46VBSp0J3b307XSlaanRk=
-SHA256 (rust/../cargo/synom-0.11.3.tar.gz) =
o5MGbtkBDrrtYLnq+jc9SxuqwYbdfgCFVbD3ArUZRbY=
-SHA256 (rust/../cargo/tar-0.4.10.tar.gz) =
HrO/bskoQ8qT9Pz7X8bf4wU0gVsUeIXbS1dZuOL/fVI=
-SHA256 (rust/../cargo/tempdir-0.3.5.tar.gz) =
h5dKb1wd+zRNczBVYBZQBZozY94qYQSBkpO6/2YhMtY=
-SHA256 (rust/../cargo/term-0.4.5.tar.gz) =
0WivOTCzac/iRRMlUFedR9/Yc9aUcHVaGcLGVo272Yk=
-SHA256 (rust/../cargo/thread-id-2.0.0.tar.gz) =
qVOdtWAQLRzvRri3jOc3/wu2Tn4Y01sqVoj30JfQ/wM=
-SHA256 (rust/../cargo/thread-id-3.0.0.tar.gz) =
RDfJdVjHDRKeQGKaWzhbP7H/rDAeY5QTNeTTVAgewUo=
-SHA256 (rust/../cargo/thread_local-0.2.7.tar.gz) =
hXbbv8rvlkFFLVzw35sOfuq3aUlW3TO7YVFfuPGM/dU=
-SHA256 (rust/../cargo/thread_local-0.3.3.tar.gz) =
yFBIxiYNF89IbOrjKC2ftrkL4iC/WyjEAPVIX/wp8Mc=
-SHA256 (rust/../cargo/time-0.1.36.tar.gz) =
IRtjwRIgY1bvH/mxk1X0N0D8P4WWDFmKk9Oj07p76t4=
-SHA256 (rust/../cargo/toml-0.3.2.tar.gz) =
vYatnr7iRv3t1hDg9tBYe3VKPYFDjbkwokTQSA7Xh48=
-SHA256 (rust/../cargo/unicode-bidi-0.2.5.tar.gz) =
06B4691iwOcacJw9U9KvaT/gn+k/v/g0SuviibePkDI=
-SHA256 (rust/../cargo/unicode-normalization-0.1.4.tar.gz) =
4o+jdCb87rXPj0HuJz+qfILEfcj7pYU0AoQeZl/Nhv8=
-SHA256 (rust/../cargo/unicode-xid-0.0.4.tar.gz) =
jB+GDX0pzwLLLz81n9NZka89MLrFLFfSZaPEYQdMtNw=
-SHA256 (rust/../cargo/unreachable-0.1.1.tar.gz) =
Hyrl3bGOHJJmRxdhbdlUnd5z9TnwG9e3fC7bJEa9/5E=
-SHA256 (rust/../cargo/url-1.4.0.tar.gz) =
9bqKdJ+0R5sENzNBbCRPqdHTrz18I4BJRGUcikSMuH4=
-SHA256 (rust/../cargo/user32-sys-0.2.0.tar.gz) =
TvRxHRB7IbQQo6l0sSBNmszIsQ2tddgyS111XeFhfUc=
-SHA256 (rust/../cargo/utf8-ranges-0.1.3.tar.gz) =
ocoTwIxBycPgQiTtn/gEYdl+EhWJ/yfHU6FssQgwrg8=
-SHA256 (rust/../cargo/utf8-ranges-1.0.0.tar.gz) =
Zi+rZSWpi+/ykh1/YaOefVngtCXrx9DZ5m0xblUSQSI=
-SHA256 (rust/../cargo/void-1.0.2.tar.gz) =
agLkiF7TvA8t6Q6m3UXry7ZtrP/gNUf627DuridwiH0=
-SHA256 (rust/../cargo/winapi-0.2.8.tar.gz) =
Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo=
-SHA256 (rust/../cargo/winapi-build-0.1.1.tar.gz) =
LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw=
-SHA256 (rust/../cargo/ws2_32-sys-0.2.1.tar.gz) =
1Zzv69DIkvot1t5YHpNzAdhVLLREic3/A1xhh8tj+l4=
-SHA256 (rust/cargo-bootstrap-amd64-0.19.0-20170611.tar.gz) =
mewH5qIC1Tvmab4Bt//1sgDkWqkMX8wtUWY+SDHMi9I=
-SHA256 (rust/cargo-bootstrap-i386-0.19.0-20170611.tar.gz) =
/dcGxnItU6WMo+9SsxaEhhEqhq6RLUkL0O67J/UZsQo=
-SHA256 (rust/rustc-1.18.0-src.tar.gz) =
0tw26ZueImlIiyvN3eQ8I05r3gPt9wy6gqAn/0nDYRE=
-SIZE (rust/../cargo/advapi32-sys-0.2.0.tar.gz) = 7217
-SIZE (rust/../cargo/aho-corasick-0.5.3.tar.gz) = 252052
-SIZE (rust/../cargo/aho-corasick-0.6.3.tar.gz) = 24963
-SIZE (rust/../cargo/bitflags-0.7.0.tar.gz) = 10851
-SIZE (rust/../cargo/bufstream-0.1.2.tar.gz) = 7477
-SIZE (rust/../cargo/cfg-if-0.1.0.tar.gz) = 2758
-SIZE (rust/../cargo/chrono-0.2.25.tar.gz) = 98296
-SIZE (rust/../cargo/cmake-0.1.22.tar.gz) = 12504
-SIZE (rust/../cargo/crossbeam-0.2.10.tar.gz) = 32993
-SIZE (rust/../cargo/curl-0.4.6.tar.gz) = 57831
-SIZE (rust/../cargo/curl-sys-0.3.10.tar.gz) = 3197115
-SIZE (rust/../cargo/docopt-0.7.0.tar.gz) = 41313
-SIZE (rust/../cargo/dtoa-0.4.1.tar.gz) = 73264
-SIZE (rust/../cargo/env_logger-0.4.2.tar.gz) = 10386
-SIZE (rust/../cargo/filetime-0.1.10.tar.gz) = 8884
-SIZE (rust/../cargo/flate2-0.2.17.tar.gz) = 47795
-SIZE (rust/../cargo/foreign-types-0.2.0.tar.gz) = 7182
-SIZE (rust/../cargo/fs2-0.4.1.tar.gz) = 12039
-SIZE (rust/../cargo/gcc-0.3.45.tar.gz) = 26303
-SIZE (rust/../cargo/gdi32-sys-0.2.0.tar.gz) = 7643
-SIZE (rust/../cargo/git2-0.6.4.tar.gz) = 129836
-SIZE (rust/../cargo/git2-curl-0.7.0.tar.gz) = 4097
-SIZE (rust/../cargo/glob-0.2.11.tar.gz) = 18065
-SIZE (rust/../cargo/hamcrest-0.1.1.tar.gz) = 9217
-SIZE (rust/../cargo/idna-0.1.0.tar.gz) = 234027
-SIZE (rust/../cargo/itoa-0.3.1.tar.gz) = 73340
-SIZE (rust/../cargo/kernel32-sys-0.2.2.tar.gz) = 24537
-SIZE (rust/../cargo/lazy_static-0.2.5.tar.gz) = 5865
-SIZE (rust/../cargo/libc-0.2.21.tar.gz) = 132909
-SIZE (rust/../cargo/libgit2-sys-0.6.7.tar.gz) = 4235960
-SIZE (rust/../cargo/libssh2-sys-0.2.5.tar.gz) = 412200
-SIZE (rust/../cargo/libz-sys-1.0.13.tar.gz) = 602795
-SIZE (rust/../cargo/log-0.3.7.tar.gz) = 16352
-SIZE (rust/../cargo/matches-0.1.4.tar.gz) = 1530
-SIZE (rust/../cargo/memchr-0.1.11.tar.gz) = 6977
-SIZE (rust/../cargo/memchr-1.0.1.tar.gz) = 8221
-SIZE (rust/../cargo/miniz-sys-0.1.9.tar.gz) = 53242
-SIZE (rust/../cargo/miow-0.2.1.tar.gz) = 21133
-SIZE (rust/../cargo/net2-0.2.27.tar.gz) = 19282
-SIZE (rust/../cargo/num-0.1.37.tar.gz) = 30152
-SIZE (rust/../cargo/num-bigint-0.1.37.tar.gz) = 35577
-SIZE (rust/../cargo/num-complex-0.1.36.tar.gz) = 12831
-SIZE (rust/../cargo/num-integer-0.1.33.tar.gz) = 8884
-SIZE (rust/../cargo/num-iter-0.1.33.tar.gz) = 7397
-SIZE (rust/../cargo/num-rational-0.1.36.tar.gz) = 12556
-SIZE (rust/../cargo/num-traits-0.1.37.tar.gz) = 20492
-SIZE (rust/../cargo/num_cpus-1.3.0.tar.gz) = 6779
-SIZE (rust/../cargo/openssl-0.9.10.tar.gz) = 101113
-SIZE (rust/../cargo/openssl-probe-0.1.1.tar.gz) = 5668
-SIZE (rust/../cargo/openssl-sys-0.9.10.tar.gz) = 31422
-SIZE (rust/../cargo/pkg-config-0.3.9.tar.gz) = 11055
-SIZE (rust/../cargo/psapi-sys-0.1.0.tar.gz) = 973
-SIZE (rust/../cargo/quote-0.3.15.tar.gz) = 12041
-SIZE (rust/../cargo/rand-0.3.15.tar.gz) = 55312
-SIZE (rust/../cargo/redox_syscall-0.1.17.tar.gz) = 11683
-SIZE (rust/../cargo/regex-0.1.80.tar.gz) = 185806
-SIZE (rust/../cargo/regex-0.2.1.tar.gz) = 189277
-SIZE (rust/../cargo/regex-syntax-0.3.9.tar.gz) = 117427
-SIZE (rust/../cargo/regex-syntax-0.4.0.tar.gz) = 118223
-SIZE (rust/../cargo/rustc-serialize-0.3.23.tar.gz) = 45610
-SIZE (rust/../cargo/semver-0.6.0.tar.gz) = 15598
-SIZE (rust/../cargo/semver-parser-0.7.0.tar.gz) = 10268
-SIZE (rust/../cargo/serde-0.9.12.tar.gz) = 53823
-SIZE (rust/../cargo/serde_codegen_internals-0.14.2.tar.gz) = 12379
-SIZE (rust/../cargo/serde_derive-0.9.12.tar.gz) = 20137
-SIZE (rust/../cargo/serde_ignored-0.0.2.tar.gz) = 9468
-SIZE (rust/../cargo/serde_json-0.9.9.tar.gz) = 46711
-SIZE (rust/../cargo/shell-escape-0.1.3.tar.gz) = 6441
-SIZE (rust/../cargo/strsim-0.6.0.tar.gz) = 8500
-SIZE (rust/../cargo/syn-0.11.9.tar.gz) = 62342
-SIZE (rust/../cargo/synom-0.11.3.tar.gz) = 17120
-SIZE (rust/../cargo/tar-0.4.10.tar.gz) = 36587
-SIZE (rust/../cargo/tempdir-0.3.5.tar.gz) = 10605
-SIZE (rust/../cargo/term-0.4.5.tar.gz) = 37496
-SIZE (rust/../cargo/thread-id-2.0.0.tar.gz) = 6108
-SIZE (rust/../cargo/thread-id-3.0.0.tar.gz) = 6240
-SIZE (rust/../cargo/thread_local-0.2.7.tar.gz) = 10954
-SIZE (rust/../cargo/thread_local-0.3.3.tar.gz) = 10964
-SIZE (rust/../cargo/time-0.1.36.tar.gz) = 28333
-SIZE (rust/../cargo/toml-0.3.2.tar.gz) = 54035
-SIZE (rust/../cargo/unicode-bidi-0.2.5.tar.gz) = 26886
-SIZE (rust/../cargo/unicode-normalization-0.1.4.tar.gz) = 278063
-SIZE (rust/../cargo/unicode-xid-0.0.4.tar.gz) = 16034
-SIZE (rust/../cargo/unreachable-0.1.1.tar.gz) = 1772
-SIZE (rust/../cargo/url-1.4.0.tar.gz) = 71598
-SIZE (rust/../cargo/user32-sys-0.2.0.tar.gz) = 10624
-SIZE (rust/../cargo/utf8-ranges-0.1.3.tar.gz) = 8422
-SIZE (rust/../cargo/utf8-ranges-1.0.0.tar.gz) = 8599
-SIZE (rust/../cargo/void-1.0.2.tar.gz) = 2356
-SIZE (rust/../cargo/winapi-0.2.8.tar.gz) = 455145
-SIZE (rust/../cargo/winapi-build-0.1.1.tar.gz) = 669
-SIZE (rust/../cargo/ws2_32-sys-0.2.1.tar.gz) = 4697
-SIZE (rust/cargo-bootstrap-amd64-0.19.0-20170611.tar.gz) = 7925141
-SIZE (rust/cargo-bootstrap-i386-0.19.0-20170611.tar.gz) = 7677538
-SIZE (rust/rustc-1.18.0-src.tar.gz) = 33111774
Index: devel/cargo/patches/patch-Makefile_in
===================================================================
RCS file: devel/cargo/patches/patch-Makefile_in
diff -N devel/cargo/patches/patch-Makefile_in
--- devel/cargo/patches/patch-Makefile_in 5 May 2017 11:42:27 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2017/05/05 11:42:27 landry Exp $
-Don't check style. Patches could make long lines.
---- Makefile.in.orig Thu Apr 27 09:00:03 2017
-+++ Makefile.in Thu Apr 27 09:01:19 2017
-@@ -129,7 +129,7 @@ $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TAR
-
- # === Tests
-
--test: style no-exes $(foreach target,$(CFG_TARGET),test-unit-$(target))
-+test: no-exes $(foreach target,$(CFG_TARGET),test-unit-$(target))
-
- style:
- (cd $(S) && sh tests/check-style.sh)
Index: devel/cargo/patches/patch-src_cargo_core_package_id_rs
===================================================================
RCS file: devel/cargo/patches/patch-src_cargo_core_package_id_rs
diff -N devel/cargo/patches/patch-src_cargo_core_package_id_rs
--- devel/cargo/patches/patch-src_cargo_core_package_id_rs 5 May 2017
11:42:27 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_cargo_core_package_id_rs,v 1.2 2017/05/05 11:42:27 landry
Exp $
-Don't rely on source_id for generating a hash as it could contains build
dependent information (full path of the build directory).
-See https://github.com/rust-lang/rust/issues/39786
---- src/cargo/core/package_id.rs.orig Mon Apr 24 20:56:45 2017
-+++ src/cargo/core/package_id.rs Wed Apr 26 11:23:10 2017
-@@ -75,7 +75,6 @@ impl Hash for PackageId {
- fn hash<S: hash::Hasher>(&self, state: &mut S) {
- self.inner.name.hash(state);
- self.inner.version.hash(state);
-- self.inner.source_id.hash(state);
- }
- }
-
Index: devel/cargo/patches/patch-src_cargo_util_config_rs
===================================================================
RCS file: devel/cargo/patches/patch-src_cargo_util_config_rs
diff -N devel/cargo/patches/patch-src_cargo_util_config_rs
--- devel/cargo/patches/patch-src_cargo_util_config_rs 17 Jun 2017 02:08:10
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_cargo_util_config_rs,v 1.2 2017/06/17 02:08:10 danj Exp $
-fallback to LOCALBASE as default path for cargo binary.
-Index: src/cargo/util/config.rs
---- src/cargo/util/config.rs.orig
-+++ src/cargo/util/config.rs
-@@ -99,7 +99,13 @@ impl Config {
-
- pub fn cargo_exe(&self) -> CargoResult<&Path> {
- self.cargo_exe.get_or_try_init(||
-- env::current_exe().and_then(|path| path.canonicalize())
-+ match env::current_exe() {
-+ Ok(path) => Ok(path),
-+ Err(_) => match option_env!("LOCALBASE") {
-+ Some(dir) =>
Ok(PathBuf::from(dir).join("bin").join("cargo")),
-+ None => panic!("invalid configuration at compile-time:
undefined LOCALBASE"),
-+ },
-+ }.and_then(|path| path.canonicalize())
- .chain_error(|| {
- human("couldn't get the path to cargo executable")
- })
Index: devel/cargo/patches/patch-tests_cargotest_support_paths_rs
===================================================================
RCS file: devel/cargo/patches/patch-tests_cargotest_support_paths_rs
diff -N devel/cargo/patches/patch-tests_cargotest_support_paths_rs
--- devel/cargo/patches/patch-tests_cargotest_support_paths_rs 15 Feb 2017
12:49:43 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-tests_cargotest_support_paths_rs,v 1.4 2017/02/15 12:49:43
landry Exp $
-use MODCARGO_TARGET_DIR as temporary directory for testing.
---- tests/cargotest/support/paths.rs.orig Fri Jan 27 08:50:00 2017
-+++ tests/cargotest/support/paths.rs Sat Feb 4 07:18:18 2017
-@@ -1,4 +1,3 @@
--use std::env;
- use std::cell::Cell;
- use std::fs;
- use std::io::{self, ErrorKind};
-@@ -30,19 +29,7 @@ fn init() {
- }
-
- fn global_root() -> PathBuf {
-- let mut path = t!(env::current_exe());
-- path.pop(); // chop off exe name
-- path.pop(); // chop off 'debug'
--
-- // If `cargo test` is run manually then our path looks like
-- // `target/debug/foo`, in which case our `path` is already pointing at
-- // `target`. If, however, `cargo test --target $target` is used then the
-- // output is `target/$target/debug/foo`, so our path is pointing at
-- // `target/$target`. Here we conditionally pop the `$target` name.
-- if path.file_name().and_then(|s| s.to_str()) != Some("target") {
-- path.pop();
-- }
--
-+ let path = PathBuf::from("${MODCARGO_TARGET_DIR}/debug");
- path.join(CARGO_INTEGRATION_TEST_DIR)
- }
-
Index: devel/cargo/pkg/DESCR
===================================================================
RCS file: devel/cargo/pkg/DESCR
diff -N devel/cargo/pkg/DESCR
--- devel/cargo/pkg/DESCR 30 May 2016 04:30:53 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-Cargo is a tool that allows Rust projects to declare their various
-dependencies, and ensure that you'll always get a repeatable build.
-
-To accomplish this goal, Cargo does four things:
-- Introduces two metadata files with various bits of project
- information.
-- Fetches and builds your project's dependencies.
-- Invokes rustc or another build tool with the correct parameters to
- build your project.
-- Introduces conventions, making working with Rust projects easier.
Index: devel/cargo/pkg/PLIST
===================================================================
RCS file: devel/cargo/pkg/PLIST
diff -N devel/cargo/pkg/PLIST
--- devel/cargo/pkg/PLIST 15 Feb 2017 12:49:43 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.4 2017/02/15 12:49:43 landry Exp $
-@bin bin/cargo
-@man man/man1/cargo-bench.1
-@man man/man1/cargo-build.1
-@man man/man1/cargo-check.1
-@man man/man1/cargo-clean.1
-@man man/man1/cargo-doc.1
-@man man/man1/cargo-fetch.1
-@man man/man1/cargo-generate-lockfile.1
-@man man/man1/cargo-init.1
-@man man/man1/cargo-install.1
-@man man/man1/cargo-login.1
-@man man/man1/cargo-metadata.1
-@man man/man1/cargo-new.1
-@man man/man1/cargo-owner.1
-@man man/man1/cargo-package.1
-@man man/man1/cargo-pkgid.1
-@man man/man1/cargo-publish.1
-@man man/man1/cargo-run.1
-@man man/man1/cargo-rustc.1
-@man man/man1/cargo-rustdoc.1
-@man man/man1/cargo-search.1
-@man man/man1/cargo-test.1
-@man man/man1/cargo-uninstall.1
-@man man/man1/cargo-update.1
-@man man/man1/cargo-version.1
-@man man/man1/cargo-yank.1
-@man man/man1/cargo.1
-@comment share/bash-completion/
-@comment share/bash-completion/completions/
-share/bash-completion/completions/cargo
-share/doc/cargo/
-share/doc/cargo/LICENSE-APACHE
-share/doc/cargo/LICENSE-MIT
-share/doc/cargo/LICENSE-THIRD-PARTY
-share/doc/cargo/README.md
-share/zsh/
-share/zsh/site-functions/
-share/zsh/site-functions/_cargo
Index: lang/rust/Makefile
===================================================================
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- lang/rust/Makefile 17 Jun 2017 02:06:53 -0000 1.45
+++ lang/rust/Makefile 28 Jul 2017 17:34:40 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2017/06/17 02:06:53 danj Exp $
+# $OpenBSD: Makefile,v 1.47 2017/07/28 09:54:12 sthen Exp $
# snapshots are only available for amd64 and i386, for now
ONLY_FOR_ARCHS = amd64 i386
@@ -8,18 +8,14 @@ DPB_PROPERTIES = parallel
COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
-V = 1.18.0
+V = 1.19.0
+CARGO_V = 0.20.0
DISTNAME = rustc-${V}-src
# rustc bootstrap version
-RBV-amd64 = 1.18.0-20170611
-RBV-i386 = 1.18.0-20170611
-RBV = ${RBV-${MACHINE_ARCH}}
-
-# cargo bootstrap version
-CBV-amd64 = 0.19.0-20170611
-CBV-i386 = 0.19.0-20170611
-CBV = ${CBV-${MACHINE_ARCH}}
+BV-amd64 = 1.19.0-20170721
+BV-i386 = 1.19.0-20170721
+BV = ${BV-${MACHINE_ARCH}}
PKGNAME = rust-${V}
PKGNAME-main = rust-${V}
@@ -36,25 +32,21 @@ MAINTAINER = Sebastien Marie <semarie@o
# with portions covered by various BSD-like licenses
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB-main = ${WANTLIB} c m pthread z
+WANTLIB-main = ${MODGCC4_CPPWANTLIB} c crypto curl git2 m pthread ssh2
ssl z
WANTLIB-doc =
-MASTER_SITES = https://static.rust-lang.org/dist/
+MASTER_SITES = https://static.rust-lang.org/dist/ \
+ https://dev-static.rust-lang.org/dist/
MASTER_SITES0 = http://kapouay.odns.fr/pub/rust/
-MASTER_SITES1 = http://kapouay.odns.fr/pub/cargo/
DIST_SUBDIR = rust
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- ${RBOOTSTRAP} \
- ${CBOOTSTRAP}
+ ${BOOTSTRAP}
-RBOOTSTRAP = ${RBOOTSTRAP-${MACHINE_ARCH}}
-CBOOTSTRAP = ${CBOOTSTRAP-${MACHINE_ARCH}}
+BOOTSTRAP = ${BOOTSTRAP-${MACHINE_ARCH}}
.for m in ${ONLY_FOR_ARCHS}
-RBOOTSTRAP-$m = rustc-bootstrap-${m}-${RBV-$m}.tar.gz:0
-CBOOTSTRAP-$m = cargo-bootstrap-${m}-${CBV-$m}.tar.gz:1
-SUPDISTFILES += ${RBOOTSTRAP-$m} \
- ${CBOOTSTRAP-$m}
+BOOTSTRAP-$m = rustc-bootstrap-${m}-${BV-$m}.tar.gz:0
+SUPDISTFILES += ${BOOTSTRAP-$m}
.endfor
# per MACHINE_ARCH configuration
@@ -73,6 +65,10 @@ MODPY_RUNDEP = No
BUILD_DEPENDS += devel/llvm \
devel/cmake
+LIB_DEPENDS += net/curl \
+ devel/libgit2/libgit2 \
+ security/libssh2
+
# libgcc.a path
CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
SYSV = 4.2.1
@@ -87,7 +83,8 @@ LIBESTDC_VERSION = 17.1
# note: RUSTFLAGS extra flags passed to rust
# -L modgcc-libs : disambiguate libestdc++.so
-MAKE_ENV = RUSTFLAGS="-L ${WRKDIR}/modgcc-libs"
+MAKE_ENV = RUSTFLAGS="-L ${WRKDIR}/modgcc-libs" \
+ LIBGIT2_SYS_USE_PKG_CONFIG=1
# build/configuration variables
SEPARATE_BUILD = Yes
@@ -114,6 +111,14 @@ TEST_TARGET ?= src/test/run-pass \
src/test/run-fail/pretty \
path/to/nowhere
+# - disable vendor checksum check on openssl-sys (as we patched it)
+# - SUBSTR cargo testsuite
+SUBST_VARS += WRKBUILD
+post-patch:
+ sed -ie 's/"files":{[^}]*}/"files":{}/' \
+ "${WRKSRC}/src/vendor/openssl-sys/.cargo-checksum.json"
+ ${SUBST_CMD} ${WRKSRC}/src/tools/cargo/tests/cargotest/support/paths.rs
+
# - check datasize limit before configuring (and building)
pre-configure:
@if [ `ulimit -d` -lt 2097152 ]; then \
@@ -126,15 +131,23 @@ pre-configure:
# at build time)
do-configure:
echo '[build]' >${WRKBUILD}/config.toml
- echo 'rustc =
"${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustc"' \
+ echo 'rustc =
"${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}/bin/rustc"' \
>>${WRKBUILD}/config.toml
- echo 'cargo = "${WRKDIR}/cargo-bootstrap-${MACHINE_ARCH}-${CBV}/cargo"'
\
+ echo 'cargo =
"${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}/bin/cargo"' \
>>${WRKBUILD}/config.toml
- echo 'prefix = "${LOCALBASE}"' >>${WRKBUILD}/config.toml
+ echo 'python = "${MODPY_BIN}"' >>${WRKBUILD}/config.toml
echo 'vendor = true' >>${WRKBUILD}/config.toml
+ echo 'extended = true' >>${WRKBUILD}/config.toml
+ echo 'verbose = 2' >>${WRKBUILD}/config.toml
+
+ echo '[install]' >>${WRKBUILD}/config.toml
+ echo 'prefix = "${LOCALBASE}"' >>${WRKBUILD}/config.toml
+ echo 'sysconfdir = "${SYSCONFDIR}"' >>${WRKBUILD}/config.toml
+ echo 'mandir = "man"' >>${WRKBUILD}/config.toml
echo '[rust]' >>${WRKBUILD}/config.toml
echo 'channel = "stable"' >>${WRKBUILD}/config.toml
+ echo 'rpath = false' >>${WRKBUILD}/config.toml
echo 'codegen-tests = false' >>${WRKBUILD}/config.toml
echo '[dist]' >>${WRKBUILD}/config.toml
@@ -150,19 +163,19 @@ do-configure:
${WRKDIR}/modgcc-libs
BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${MODPY_BIN} ${WRKSRC}/src/bootstrap/bootstrap.py
+ ${MODPY_BIN} ${WRKSRC}/x.py
do-build:
- ${BUILD_BIN} dist --verbose --jobs=${MAKE_JOBS}
+ ${BUILD_BIN} dist --jobs=${MAKE_JOBS}
-COMPONENTS ?= rustc rust-std rust-docs
+COMPONENTS ?= rustc-${V} rust-std-${V} rust-docs-${V} cargo-${CARGO_V}
do-install:
rm -rf ${WRKBUILD}/_extractdist
.for _c in ${COMPONENTS}
mkdir ${WRKBUILD}/_extractdist
cd ${WRKBUILD}/_extractdist && tar zxf \
- ${WRKBUILD}/build/dist/${_c}-${V}-${TRIPLE_ARCH}.tar.gz
- cd ${WRKBUILD}/_extractdist/${_c}-${V}-${TRIPLE_ARCH} && ./install.sh \
+ ${WRKBUILD}/build/dist/${_c}-${TRIPLE_ARCH}.tar.gz
+ cd ${WRKBUILD}/_extractdist/${_c}-${TRIPLE_ARCH} && ./install.sh \
--prefix="${PREFIX}" \
--mandir="${PREFIX}/man"
rm -rf ${WRKBUILD}/_extractdist
@@ -180,12 +193,20 @@ post-install:
${PREFIX}/lib/rustlib/{install.log,uninstall.sh,rust-installer-version} \
${PREFIX}/lib/rustlib/components \
${PREFIX}/lib/rustlib/manifest-*
+ # install cargo bash-completion
+ mkdir -p ${PREFIX}/share/bash-completion/completions
+ mv ${PREFIX}${SYSCONFDIR}/bash_completion.d/cargo \
+ ${PREFIX}/share/bash-completion/completions
+ rmdir ${PREFIX}${SYSCONFDIR}/bash_completion.d \
+ ${PREFIX}${SYSCONFDIR}
# make a link to libgcc.a inside rustlib
ln -fs ${SYSLIBPATH}/libgcc.a \
${PREFIX}/lib/rustlib/${TRIPLE_ARCH}/lib
+ # compile python stuff
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/lib/rustlib/etc
do-test:
- ${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS} ${TEST_TARGET}
+ ${BUILD_BIN} test --jobs=${MAKE_JOBS} ${TEST_TARGET}
# bootstrap target permits to regenerate the bootstrap archive
BOOTSTRAPDIR=${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${V}-new
@@ -195,22 +216,21 @@ bootstrap: build
${MAKE} clean=fake
${MAKE} fake \
PREFIX="${BOOTSTRAPDIR}" \
- COMPONENTS="rustc rust-std" \
+ COMPONENTS="rustc-${V} rust-std-${V} cargo-${CARGO_V}" \
FAKE_SETUP=""
rm -rf ${BOOTSTRAPDIR}/{man,share} \
${BOOTSTRAPDIR}/bin/rust-gdb
strip ${BOOTSTRAPDIR}/lib/lib*.so \
${BOOTSTRAPDIR}/lib/rustlib/${TRIPLE_ARCH}/lib/lib*.so
-.for _bin in rustc rustdoc
+.for _bin in rustc rustdoc cargo
mv ${BOOTSTRAPDIR}/bin/${_bin} \
${BOOTSTRAPDIR}/bin/${_bin}.bin
strip ${BOOTSTRAPDIR}/bin/${_bin}.bin
- cp ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/${_bin} \
+ cp ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}/bin/${_bin} \
${BOOTSTRAPDIR}/bin/${_bin}
LD_LIBRARY_PATH="${BOOTSTRAPDIR}/lib" \
ldd ${BOOTSTRAPDIR}/bin/${_bin}.bin \
| sed -ne 's,.* \(/.*/lib/lib.*\.so.[.0-9]*\)$$,\1,p' \
- | xargs -r -J % cp % \
- ${BOOTSTRAPDIR}/lib
+ | xargs -r -J % cp % ${BOOTSTRAPDIR}/lib || true
.endfor
.include <bsd.port.mk>
Index: lang/rust/distinfo
===================================================================
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- lang/rust/distinfo 17 Jun 2017 02:06:53 -0000 1.25
+++ lang/rust/distinfo 22 Jul 2017 12:07:17 -0000
@@ -1,10 +1,6 @@
-SHA256 (rust/cargo-bootstrap-amd64-0.19.0-20170611.tar.gz) =
mewH5qIC1Tvmab4Bt//1sgDkWqkMX8wtUWY+SDHMi9I=
-SHA256 (rust/cargo-bootstrap-i386-0.19.0-20170611.tar.gz) =
/dcGxnItU6WMo+9SsxaEhhEqhq6RLUkL0O67J/UZsQo=
-SHA256 (rust/rustc-1.18.0-src.tar.gz) =
0tw26ZueImlIiyvN3eQ8I05r3gPt9wy6gqAn/0nDYRE=
-SHA256 (rust/rustc-bootstrap-amd64-1.18.0-20170611.tar.gz) =
l30RLgusTCyevUiUI60MJu1/0tnl9Sf3rEqxe2PXyMk=
-SHA256 (rust/rustc-bootstrap-i386-1.18.0-20170611.tar.gz) =
HWG9XlpMHg3IHNukokIMIjudUTnben+O/p0KxwUpzzc=
-SIZE (rust/cargo-bootstrap-amd64-0.19.0-20170611.tar.gz) = 7925141
-SIZE (rust/cargo-bootstrap-i386-0.19.0-20170611.tar.gz) = 7677538
-SIZE (rust/rustc-1.18.0-src.tar.gz) = 33111774
-SIZE (rust/rustc-bootstrap-amd64-1.18.0-20170611.tar.gz) = 58923785
-SIZE (rust/rustc-bootstrap-i386-1.18.0-20170611.tar.gz) = 60321889
+SHA256 (rust/rustc-1.19.0-src.tar.gz) =
FSMfUFP7cq2CvpH1q/1qpgy3iYxQieTxrFkQpzEJDFE=
+SHA256 (rust/rustc-bootstrap-amd64-1.19.0-20170721.tar.gz) =
OIXGymWIx8k57zH1UQRx6WvevMw2kEDBRlvdlErKNbM=
+SHA256 (rust/rustc-bootstrap-i386-1.19.0-20170721.tar.gz) =
imXJ+9THpwwadNHaYJiISj3vo+fowJeYWvmal0/MpnM=
+SIZE (rust/rustc-1.19.0-src.tar.gz) = 50108626
+SIZE (rust/rustc-bootstrap-amd64-1.19.0-20170721.tar.gz) = 69399327
+SIZE (rust/rustc-bootstrap-i386-1.19.0-20170721.tar.gz) = 70816328
Index: lang/rust/patches/patch-src_bootstrap_flags_rs
===================================================================
RCS file: lang/rust/patches/patch-src_bootstrap_flags_rs
diff -N lang/rust/patches/patch-src_bootstrap_flags_rs
--- lang/rust/patches/patch-src_bootstrap_flags_rs 17 Jun 2017 02:06:53
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_bootstrap_flags_rs,v 1.1 2017/06/17 02:06:53 danj Exp $
-workaround for https://github.com/rust-lang/rust/issues/41779 in order to
build with verbose
-Index: src/bootstrap/flags.rs
---- src/bootstrap/flags.rs.orig
-+++ src/bootstrap/flags.rs
-@@ -232,7 +232,7 @@ Arguments:
-
-
- // All subcommands can have an optional "Available paths" section
-- if matches.opt_present("verbose") {
-+ if false && matches.opt_present("verbose") {
- let flags = Flags::parse(&["build".to_string()]);
- let mut config = Config::default();
- config.build = flags.build.clone();
Index: lang/rust/patches/patch-src_bootstrap_lib_rs
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_lib_rs,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_bootstrap_lib_rs
--- lang/rust/patches/patch-src_bootstrap_lib_rs 17 Jun 2017 02:06:53
-0000 1.4
+++ lang/rust/patches/patch-src_bootstrap_lib_rs 22 Jul 2017 12:07:17
-0000
@@ -3,7 +3,7 @@ Let us compilation choice to be honored.
Index: src/bootstrap/lib.rs
--- src/bootstrap/lib.rs.orig
+++ src/bootstrap/lib.rs
-@@ -872,7 +872,6 @@ impl Build {
+@@ -828,7 +828,6 @@ impl Build {
// gcc-rs because the build scripts will determine that for
themselves.
let mut base = self.cc[target].0.args().iter()
.map(|s| s.to_string_lossy().into_owned())
Index: lang/rust/patches/patch-src_librustc_session_filesearch_rs
===================================================================
RCS file:
/cvs/ports/lang/rust/patches/patch-src_librustc_session_filesearch_rs,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_librustc_session_filesearch_rs
--- lang/rust/patches/patch-src_librustc_session_filesearch_rs 15 Feb 2017
12:52:35 -0000 1.4
+++ lang/rust/patches/patch-src_librustc_session_filesearch_rs 22 Jul 2017
12:07:17 -0000
@@ -1,15 +1,16 @@
$OpenBSD: patch-src_librustc_session_filesearch_rs,v 1.4 2017/02/15 12:52:35
landry Exp $
fallback to LOCALBASE as default sysroot.
---- src/librustc/session/filesearch.rs.orig Mon Jul 4 20:04:09 2016
-+++ src/librustc/session/filesearch.rs Tue Jul 5 19:01:38 2016
-@@ -161,7 +161,10 @@ pub fn get_or_default_sysroot() -> PathBuf {
-
- match canonicalize(env::current_exe().ok()) {
- Some(mut p) => { p.pop(); p.pop(); p }
-- None => bug!("can't determine value for sysroot")
-+ None => match option_env!("LOCALBASE") {
-+ Some(dir) => PathBuf::from(dir),
-+ None => bug!("can't determine value for sysroot"),
+Index: src/librustc/session/filesearch.rs
+--- src/librustc/session/filesearch.rs.orig
++++ src/librustc/session/filesearch.rs
+@@ -166,7 +166,10 @@ pub fn get_or_default_sysroot() -> PathBuf {
+ None => bug!("can't determine value for sysroot")
+ }
+ }
+- Err(ref e) => panic!(format!("failed to get current_exe: {}", e))
++ Err(ref e) => match option_env!("LOCALBASE") {
++ Some(dir) => return PathBuf::from(dir),
++ None => panic!(format!("failed to get current_exe: {}", e))
+ }
}
}
Index: lang/rust/patches/patch-src_librustdoc_test_rs
===================================================================
RCS file: lang/rust/patches/patch-src_librustdoc_test_rs
diff -N lang/rust/patches/patch-src_librustdoc_test_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/rust/patches/patch-src_librustdoc_test_rs 22 Jul 2017 12:07:17
-0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+fallback to LOCALBASE as default sysroot.
+Index: src/librustdoc/test.rs
+--- src/librustdoc/test.rs.orig
++++ src/librustdoc/test.rs
+@@ -67,7 +67,10 @@ pub fn run(input: &str,
+
+ let sessopts = config::Options {
+ maybe_sysroot: maybe_sysroot.clone().or_else(
+- ||
Some(env::current_exe().unwrap().parent().unwrap().parent().unwrap().to_path_buf())),
++ || match option_env!("LOCALBASE") {
++ Some(dir) => return Some(PathBuf::from(dir)),
++ None => panic!("can't determine value for sysroot"),
++ }),
+ search_paths: libs.clone(),
+ crate_types: vec![config::CrateTypeDylib],
+ externs: externs.clone(),
+@@ -183,7 +186,10 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
+
+ let sessopts = config::Options {
+ maybe_sysroot: maybe_sysroot.or_else(
+- ||
Some(env::current_exe().unwrap().parent().unwrap().parent().unwrap().to_path_buf())),
++ || match option_env!("LOCALBASE") {
++ Some(dir) => return Some(PathBuf::from(dir)),
++ None => panic!("can't determine value for sysroot"),
++ }),
+ search_paths: libs,
+ crate_types: vec![config::CrateTypeExecutable],
+ output_types: outputs,
Index: lang/rust/patches/patch-src_tools_cargo_src_cargo_core_package_id_rs
===================================================================
RCS file: lang/rust/patches/patch-src_tools_cargo_src_cargo_core_package_id_rs
diff -N lang/rust/patches/patch-src_tools_cargo_src_cargo_core_package_id_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/rust/patches/patch-src_tools_cargo_src_cargo_core_package_id_rs
22 Jul 2017 12:07:17 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+Don't rely on source_id for generating a hash as it could contains build
dependent information (full path of the build directory).
+See https://github.com/rust-lang/rust/issues/39786
+Index: src/tools/cargo/src/cargo/core/package_id.rs
+--- src/tools/cargo/src/cargo/core/package_id.rs.orig
++++ src/tools/cargo/src/cargo/core/package_id.rs
+@@ -74,7 +74,6 @@ impl Hash for PackageId {
+ fn hash<S: hash::Hasher>(&self, state: &mut S) {
+ self.inner.name.hash(state);
+ self.inner.version.hash(state);
+- self.inner.source_id.hash(state);
+ }
+ }
+
Index: lang/rust/patches/patch-src_tools_cargo_src_cargo_util_config_rs
===================================================================
RCS file: lang/rust/patches/patch-src_tools_cargo_src_cargo_util_config_rs
diff -N lang/rust/patches/patch-src_tools_cargo_src_cargo_util_config_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/rust/patches/patch-src_tools_cargo_src_cargo_util_config_rs 22 Jul
2017 12:07:17 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+fallback to LOCALBASE as default path for cargo binary.
+Index: src/tools/cargo/src/cargo/util/config.rs
+--- src/tools/cargo/src/cargo/util/config.rs.orig
++++ src/tools/cargo/src/cargo/util/config.rs
+@@ -121,7 +121,13 @@ impl Config {
+
+ pub fn cargo_exe(&self) -> CargoResult<&Path> {
+ self.cargo_exe.get_or_try_init(||
+- env::current_exe().and_then(|path| path.canonicalize())
++ match env::current_exe() {
++ Ok(path) => Ok(path),
++ Err(_) => match option_env!("LOCALBASE") {
++ Some(dir) =>
Ok(PathBuf::from(dir).join("bin").join("cargo")),
++ None => panic!("invalid configuration at compile-time:
undefined LOCALBASE"),
++ },
++ }.and_then(|path| path.canonicalize())
+ .chain_err(|| "couldn't get the path to cargo executable")
+ ).map(AsRef::as_ref)
+ }
Index: lang/rust/patches/patch-src_tools_cargo_tests_cargotest_support_paths_rs
===================================================================
RCS file:
lang/rust/patches/patch-src_tools_cargo_tests_cargotest_support_paths_rs
diff -N lang/rust/patches/patch-src_tools_cargo_tests_cargotest_support_paths_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/rust/patches/patch-src_tools_cargo_tests_cargotest_support_paths_rs
22 Jul 2017 12:07:17 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+use WRKBUILD as temporary directory for testing.
+Index: src/tools/cargo/tests/cargotest/support/paths.rs
+--- src/tools/cargo/tests/cargotest/support/paths.rs.orig
++++ src/tools/cargo/tests/cargotest/support/paths.rs
+@@ -1,4 +1,3 @@
+-use std::env;
+ use std::cell::Cell;
+ use std::fs;
+ use std::io::{self, ErrorKind};
+@@ -30,19 +29,7 @@ fn init() {
+ }
+
+ fn global_root() -> PathBuf {
+- let mut path = t!(env::current_exe());
+- path.pop(); // chop off exe name
+- path.pop(); // chop off 'debug'
+-
+- // If `cargo test` is run manually then our path looks like
+- // `target/debug/foo`, in which case our `path` is already pointing at
+- // `target`. If, however, `cargo test --target $target` is used then the
+- // output is `target/$target/debug/foo`, so our path is pointing at
+- // `target/$target`. Here we conditionally pop the `$target` name.
+- if path.file_name().and_then(|s| s.to_str()) != Some("target") {
+- path.pop();
+- }
+-
++ let path = PathBuf::from("${WRKBUILD}/test-cargo");
+ path.join(CARGO_INTEGRATION_TEST_DIR)
+ }
+
Index: lang/rust/patches/patch-src_vendor_openssl-sys_build_rs
===================================================================
RCS file: lang/rust/patches/patch-src_vendor_openssl-sys_build_rs
diff -N lang/rust/patches/patch-src_vendor_openssl-sys_build_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/rust/patches/patch-src_vendor_openssl-sys_build_rs 22 Jul 2017
12:07:17 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+The LibreSSL version in -current isn't explicitly supported.
+Index: src/vendor/openssl-sys/build.rs
+--- src/vendor/openssl-sys/build.rs.orig
++++ src/vendor/openssl-sys/build.rs
+@@ -241,7 +241,7 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Versi
+ #include <openssl/opensslconf.h>
+
+ #if LIBRESSL_VERSION_NUMBER >= 0x20505000
+-RUST_LIBRESSL_NEW
++RUST_LIBRESSL_254
+ #elif LIBRESSL_VERSION_NUMBER >= 0x20504000
+ RUST_LIBRESSL_254
+ #elif LIBRESSL_VERSION_NUMBER >= 0x20503000
Index: lang/rust/pkg/PFRAG.amd64-main
===================================================================
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.amd64-main,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.amd64-main
--- lang/rust/pkg/PFRAG.amd64-main 17 Jun 2017 02:06:53 -0000 1.5
+++ lang/rust/pkg/PFRAG.amd64-main 22 Jul 2017 12:07:17 -0000
@@ -1,101 +1,103 @@
@comment $OpenBSD: PFRAG.amd64-main,v 1.5 2017/06/17 02:06:53 danj Exp $
-lib/libarena-93e3921cce131aef.so
-lib/libflate-5e41639e13c4434f.so
-lib/libfmt_macros-93a9b01ee93bdce9.so
-lib/libgetopts-012c584871db97d0.so
-lib/libgraphviz-1386fed25d8e472a.so
-lib/libproc_macro-7d5b4be48f58627e.so
-lib/libproc_macro_plugin-22b1c24bca33bda8.so
-lib/librustc-9f31feb2baff5b59.so
-lib/librustc_back-0b0942d4786ca15a.so
-lib/librustc_borrowck-fb5c6c9a1e1d428f.so
-lib/librustc_const_eval-1b7ffd0678c0ac18.so
-lib/librustc_const_math-21931a76cddafe83.so
-lib/librustc_data_structures-98606f5b5b2e7332.so
-lib/librustc_driver-152207bfa090503d.so
-lib/librustc_errors-a8d5a5de6ee87758.so
-lib/librustc_incremental-259f383c56a36b45.so
-lib/librustc_lint-fb30531919645c93.so
-lib/librustc_llvm-444a1eb13b19ff44.so
-lib/librustc_metadata-4a7492605e5ec1fa.so
-lib/librustc_mir-0d7ede501c8b9e2c.so
-lib/librustc_passes-f1a0598ee78a7ff7.so
-lib/librustc_platform_intrinsics-4e6d97357d6b51e8.so
-lib/librustc_plugin-91ed01083712eec4.so
-lib/librustc_privacy-9cdd14a408db4116.so
-lib/librustc_resolve-eedfc512aee6f7f1.so
-lib/librustc_save_analysis-aa5a7ac40a5082bc.so
-lib/librustc_trans-c039ecaeadf1c151.so
-lib/librustc_typeck-f9f14ee21da783e9.so
-lib/librustdoc-0a002c6d94f99f77.so
-lib/libserialize-20f22d1873bcda3b.so
-lib/libstd-1c45066ab375ebd7.so
-lib/libsyntax-36c1d060e395c36e.so
-lib/libsyntax_ext-c7c189ffbe048199.so
-lib/libsyntax_pos-6cc7ec91f3b515a9.so
-lib/libterm-ab77930f2fb0d3f4.so
-lib/libtest-b87c99e1107789f6.so
+lib/libarena-7208a4d24e58ee10.so
+lib/libflate-071f6da713fa0590.so
+lib/libfmt_macros-3113337fd699f0c2.so
+lib/libgetopts-d1f5cbdf4f22cd49.so
+lib/libgraphviz-cbaface7ffcc68be.so
+lib/libproc_macro-d8a2ddaa8cd3f9a3.so
+lib/libproc_macro_plugin-bf3f7fffda4b671f.so
+lib/librustc-011439a32a903962.so
+lib/librustc_back-49c45f7d8465520e.so
+lib/librustc_borrowck-f82786ce0c95106c.so
+lib/librustc_const_eval-ad301bb3604295d2.so
+lib/librustc_const_math-eb0fd3e2e620790f.so
+lib/librustc_data_structures-e51633dd5498e8da.so
+lib/librustc_driver-052b8dbae020bc96.so
+lib/librustc_errors-0e5921d7e9b9514e.so
+lib/librustc_incremental-f3f382e28117043c.so
+lib/librustc_lint-a65f3277c064a063.so
+lib/librustc_llvm-2410ef26499acc88.so
+lib/librustc_metadata-a779bce111997899.so
+lib/librustc_mir-3a2488f8814c22b7.so
+lib/librustc_passes-044f0e9b0e7917b1.so
+lib/librustc_platform_intrinsics-304f7a80490b3cfe.so
+lib/librustc_plugin-d4b12ed7b48fa77d.so
+lib/librustc_privacy-23260f672deea1dc.so
+lib/librustc_resolve-57d0581a08985128.so
+lib/librustc_save_analysis-19c1e90bc0a226b5.so
+lib/librustc_trans-40bb877c5e0b3f84.so
+lib/librustc_typeck-a0a711d61f99622b.so
+lib/librustdoc-9f8090844a1b265e.so
+lib/libserialize-eb6777bf7927afa6.so
+lib/libstd-2ce1d6a76eafdd05.so
+lib/libsyntax-36a6bcb049723580.so
+lib/libsyntax_ext-fae36a2605d5bd8f.so
+lib/libsyntax_pos-e1c2cc029bad7121.so
+lib/libterm-d69be74099635976.so
+lib/libtest-d91a4403c8f5d561.so
lib/rustlib/x86_64-unknown-openbsd/
lib/rustlib/x86_64-unknown-openbsd/lib/
-lib/rustlib/x86_64-unknown-openbsd/lib/liballoc-2204f9eae3e879c0.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/liballoc_jemalloc-de230249025f1d75.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/liballoc_system-641805ce3a04d533.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libarena-93e3921cce131aef.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libbitflags-7eae59beb429c353.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libcollections-ced0e47969817eb8.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libcompiler_builtins-f521c565836774e2.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libcore-c490791ff340c9a6.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libenv_logger-55c598e55b76957c.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libflate-5e41639e13c4434f.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libfmt_macros-93a9b01ee93bdce9.so
+lib/rustlib/x86_64-unknown-openbsd/lib/liballoc-c4a5517b56edc9bb.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/liballoc_jemalloc-373484c9896598ba.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/liballoc_system-501d3b38d942d003.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libarena-7208a4d24e58ee10.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libbitflags-c2dd70154f033746.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libcollections-d47076d9c64553ea.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libcompiler_builtins-e50391c94310c5c3.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libcore-32500e34c445841e.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libenv_logger-aa2d202faf7965de.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libflate-071f6da713fa0590.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libfmt_macros-3113337fd699f0c2.so
lib/rustlib/x86_64-unknown-openbsd/lib/libgcc.a
-lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-012c584871db97d0.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-012c584871db97d0.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libgraphviz-1386fed25d8e472a.so
-lib/rustlib/x86_64-unknown-openbsd/lib/liblibc-8d46a36ba970dccf.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/liblog-171e441f0b99061d.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libpanic_abort-9add4603edf3ef11.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libpanic_unwind-d99f53448c5cc41b.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro-7d5b4be48f58627e.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro_plugin-22b1c24bca33bda8.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libpulldown_cmark-7ada566bc0ba809c.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librand-b605d662ea6cecab.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librls_data-a7c59023b674a2af.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librls_span-bf7499949d334e04.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc-9f31feb2baff5b59.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_back-0b0942d4786ca15a.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_bitflags-e2e367ef663679ff.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_borrowck-fb5c6c9a1e1d428f.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_const_eval-1b7ffd0678c0ac18.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_const_math-21931a76cddafe83.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_data_structures-98606f5b5b2e7332.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_driver-152207bfa090503d.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_errors-a8d5a5de6ee87758.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_incremental-259f383c56a36b45.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_lint-fb30531919645c93.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_llvm-444a1eb13b19ff44.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_metadata-4a7492605e5ec1fa.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_mir-0d7ede501c8b9e2c.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_passes-f1a0598ee78a7ff7.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_platform_intrinsics-4e6d97357d6b51e8.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_plugin-91ed01083712eec4.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_privacy-9cdd14a408db4116.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_resolve-eedfc512aee6f7f1.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_save_analysis-aa5a7ac40a5082bc.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_serialize-425a1b42edb55639.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_trans-c039ecaeadf1c151.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustc_typeck-f9f14ee21da783e9.so
-lib/rustlib/x86_64-unknown-openbsd/lib/librustdoc-0a002c6d94f99f77.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libserialize-20f22d1873bcda3b.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libserialize-20f22d1873bcda3b.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libstd-1c45066ab375ebd7.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libstd-1c45066ab375ebd7.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libstd_unicode-946c297f746eb582.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax-36c1d060e395c36e.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax_ext-c7c189ffbe048199.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax_pos-6cc7ec91f3b515a9.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libterm-ab77930f2fb0d3f4.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libterm-ab77930f2fb0d3f4.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libtest-b87c99e1107789f6.rlib
-lib/rustlib/x86_64-unknown-openbsd/lib/libtest-b87c99e1107789f6.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libunwind-6af2e100c3095e9d.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-d1f5cbdf4f22cd49.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-d1f5cbdf4f22cd49.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libgraphviz-cbaface7ffcc68be.so
+lib/rustlib/x86_64-unknown-openbsd/lib/liblibc-52335ecd307b129e.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/liblog-d8ab26203cb7132d.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libowning_ref-8ce60505dbd3e4c1.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libpanic_abort-e050daec92ba61a4.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libpanic_unwind-abd5e58d6188c485.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro-d8a2ddaa8cd3f9a3.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro_plugin-bf3f7fffda4b671f.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libpulldown_cmark-444ee7bafe85603a.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librand-7454f04721c9260d.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librls_data-c8ffd9183616fefa.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librls_span-4464ad76ae0ef520.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc-011439a32a903962.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_back-49c45f7d8465520e.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_bitflags-6857199c7727e58a.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_borrowck-f82786ce0c95106c.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_const_eval-ad301bb3604295d2.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_const_math-eb0fd3e2e620790f.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_data_structures-e51633dd5498e8da.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_driver-052b8dbae020bc96.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_errors-0e5921d7e9b9514e.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_incremental-f3f382e28117043c.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_lint-a65f3277c064a063.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_llvm-2410ef26499acc88.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_metadata-a779bce111997899.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_mir-3a2488f8814c22b7.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_passes-044f0e9b0e7917b1.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_platform_intrinsics-304f7a80490b3cfe.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_plugin-d4b12ed7b48fa77d.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_privacy-23260f672deea1dc.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_resolve-57d0581a08985128.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_save_analysis-19c1e90bc0a226b5.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_serialize-ddc86ccfcc5e4fda.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_trans-40bb877c5e0b3f84.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_typeck-a0a711d61f99622b.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustdoc-9f8090844a1b265e.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libserialize-eb6777bf7927afa6.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libserialize-eb6777bf7927afa6.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libstable_deref_trait-169b9ded17bda496.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libstd-2ce1d6a76eafdd05.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libstd-2ce1d6a76eafdd05.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libstd_unicode-012d6e301282f6b1.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax-36a6bcb049723580.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax_ext-fae36a2605d5bd8f.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libsyntax_pos-e1c2cc029bad7121.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libterm-d69be74099635976.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libterm-d69be74099635976.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libtest-d91a4403c8f5d561.rlib
+lib/rustlib/x86_64-unknown-openbsd/lib/libtest-d91a4403c8f5d561.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libunwind-23589e63fa6b60fe.rlib
Index: lang/rust/pkg/PFRAG.i386-main
===================================================================
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.i386-main,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.i386-main
--- lang/rust/pkg/PFRAG.i386-main 17 Jun 2017 02:06:53 -0000 1.5
+++ lang/rust/pkg/PFRAG.i386-main 22 Jul 2017 12:07:17 -0000
@@ -1,101 +1,103 @@
@comment $OpenBSD: PFRAG.i386-main,v 1.5 2017/06/17 02:06:53 danj Exp $
-lib/libarena-ffc66dd649996853.so
-lib/libflate-e4dfe4df94ab8269.so
-lib/libfmt_macros-55d8ac42b77bdfaf.so
-lib/libgetopts-ab907dce2e616df0.so
-lib/libgraphviz-1ad34192b6945a9f.so
-lib/libproc_macro-a667352ecc6c908f.so
-lib/libproc_macro_plugin-d2a8417d4a277a18.so
-lib/librustc-dc1a88a5a72301d7.so
-lib/librustc_back-1ed1a593c5be59fa.so
-lib/librustc_borrowck-63edd976bc6af7b4.so
-lib/librustc_const_eval-a450ed88ff1c482a.so
-lib/librustc_const_math-5bfb58fd7f2706da.so
-lib/librustc_data_structures-cb864a4fb18cd405.so
-lib/librustc_driver-1b01b25381318186.so
-lib/librustc_errors-01c65d14961f7ca8.so
-lib/librustc_incremental-a443b21aebb46a3e.so
-lib/librustc_lint-7a3056feaaaff0ef.so
-lib/librustc_llvm-886aeab528a617df.so
-lib/librustc_metadata-9e9f9ded511a8c2c.so
-lib/librustc_mir-c97a66c88a168322.so
-lib/librustc_passes-a31722bfb3774359.so
-lib/librustc_platform_intrinsics-fd7ae0525f1e723d.so
-lib/librustc_plugin-3730d12a2121da31.so
-lib/librustc_privacy-396bbfaf2c222b49.so
-lib/librustc_resolve-9f482d375d34d580.so
-lib/librustc_save_analysis-4df96e00f4cc5ada.so
-lib/librustc_trans-44a2aa39fda1ec27.so
-lib/librustc_typeck-f47eeb9eb37ed84a.so
-lib/librustdoc-90dadf10ee2c4f95.so
-lib/libserialize-cdec391e6199629f.so
-lib/libstd-17fcdf59d67bea14.so
-lib/libsyntax-02537596263f1216.so
-lib/libsyntax_ext-7513382783f0f904.so
-lib/libsyntax_pos-4ca1c103715c3013.so
-lib/libterm-2cae6b1d3edf5f01.so
-lib/libtest-4f995153b76cd659.so
+lib/libarena-fd3540dd947db0f1.so
+lib/libflate-9a12c0cd1f17159a.so
+lib/libfmt_macros-3fa21c546152a55c.so
+lib/libgetopts-e1cf665aaaf961a0.so
+lib/libgraphviz-f18120990b721214.so
+lib/libproc_macro-6d74293000454ae6.so
+lib/libproc_macro_plugin-b1f7e7049a3163c3.so
+lib/librustc-a023363afee3f2dd.so
+lib/librustc_back-d76060d8bb261c9c.so
+lib/librustc_borrowck-bcfa70634e163a87.so
+lib/librustc_const_eval-5ac2e3b6ed71e72e.so
+lib/librustc_const_math-6b3a00dee201e8fe.so
+lib/librustc_data_structures-abe95b161889fc49.so
+lib/librustc_driver-673cf02822f7a3c3.so
+lib/librustc_errors-8912d9dac1bca509.so
+lib/librustc_incremental-56da9bf9647d5bd2.so
+lib/librustc_lint-42feadef9367bf63.so
+lib/librustc_llvm-5bf5ce6442bbd026.so
+lib/librustc_metadata-341792978cf26c9e.so
+lib/librustc_mir-93d411ba8d74aa1d.so
+lib/librustc_passes-9dac8ee0d758b527.so
+lib/librustc_platform_intrinsics-aaddefce4cd3e648.so
+lib/librustc_plugin-fbfd817ad7784e0e.so
+lib/librustc_privacy-1f676f018995ebc5.so
+lib/librustc_resolve-6afd7b3952c89acc.so
+lib/librustc_save_analysis-d1003e9934e2c1e7.so
+lib/librustc_trans-59b9c89d4aa969fe.so
+lib/librustc_typeck-40ced7518718cc60.so
+lib/librustdoc-28211d2f952a00b4.so
+lib/libserialize-2e9cb4428e83935f.so
+lib/libstd-698e40d47b16c90f.so
+lib/libsyntax-22f989b0832bf7c2.so
+lib/libsyntax_ext-cf3890e6029ce73e.so
+lib/libsyntax_pos-dac744fa36cc0f88.so
+lib/libterm-283e68cf1a757e05.so
+lib/libtest-4de59441f5597a88.so
lib/rustlib/i686-unknown-openbsd/
lib/rustlib/i686-unknown-openbsd/lib/
-lib/rustlib/i686-unknown-openbsd/lib/liballoc-f71fdcfff3bc27b9.rlib
-lib/rustlib/i686-unknown-openbsd/lib/liballoc_jemalloc-91f63e93c2cc9539.rlib
-lib/rustlib/i686-unknown-openbsd/lib/liballoc_system-e2f2a7f080d49566.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libarena-ffc66dd649996853.so
-lib/rustlib/i686-unknown-openbsd/lib/libbitflags-ad09b7517b78e5dc.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libcollections-69ee63fbbefbd08f.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libcompiler_builtins-cd3637b6b855347a.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libcore-09fd0e7f71f28b75.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libenv_logger-d6e3f0d14d8696be.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libflate-e4dfe4df94ab8269.so
-lib/rustlib/i686-unknown-openbsd/lib/libfmt_macros-55d8ac42b77bdfaf.so
+lib/rustlib/i686-unknown-openbsd/lib/liballoc-c4fe33fd48fec987.rlib
+lib/rustlib/i686-unknown-openbsd/lib/liballoc_jemalloc-0d8390be4e29ca08.rlib
+lib/rustlib/i686-unknown-openbsd/lib/liballoc_system-3bb8566c05748e97.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libarena-fd3540dd947db0f1.so
+lib/rustlib/i686-unknown-openbsd/lib/libbitflags-36e19cc53ad83359.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libcollections-89d7823173bae488.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libcompiler_builtins-1ddc3796f22c2fd8.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libcore-5a5be74021c898f3.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libenv_logger-1155da0285fe8b53.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libflate-9a12c0cd1f17159a.so
+lib/rustlib/i686-unknown-openbsd/lib/libfmt_macros-3fa21c546152a55c.so
lib/rustlib/i686-unknown-openbsd/lib/libgcc.a
-lib/rustlib/i686-unknown-openbsd/lib/libgetopts-ab907dce2e616df0.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libgetopts-ab907dce2e616df0.so
-lib/rustlib/i686-unknown-openbsd/lib/libgraphviz-1ad34192b6945a9f.so
-lib/rustlib/i686-unknown-openbsd/lib/liblibc-ab9237b0c63da5ba.rlib
-lib/rustlib/i686-unknown-openbsd/lib/liblog-dbd0713e43367063.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libpanic_abort-5e0b12bc3f450726.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libpanic_unwind-7bbd64123fd4e209.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libproc_macro-a667352ecc6c908f.so
-lib/rustlib/i686-unknown-openbsd/lib/libproc_macro_plugin-d2a8417d4a277a18.so
-lib/rustlib/i686-unknown-openbsd/lib/libpulldown_cmark-afcd0fa82c4295f5.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librand-efd1d9542e6ab229.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librls_data-1a86cb2db19a78ef.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librls_span-badb28746f68b455.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librustc-dc1a88a5a72301d7.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_back-1ed1a593c5be59fa.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_bitflags-3a22608957a3a56f.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librustc_borrowck-63edd976bc6af7b4.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_const_eval-a450ed88ff1c482a.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_const_math-5bfb58fd7f2706da.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_data_structures-cb864a4fb18cd405.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_driver-1b01b25381318186.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_errors-01c65d14961f7ca8.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_incremental-a443b21aebb46a3e.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_lint-7a3056feaaaff0ef.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_llvm-886aeab528a617df.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_metadata-9e9f9ded511a8c2c.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_mir-c97a66c88a168322.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_passes-a31722bfb3774359.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_platform_intrinsics-fd7ae0525f1e723d.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_plugin-3730d12a2121da31.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_privacy-396bbfaf2c222b49.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_resolve-9f482d375d34d580.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_save_analysis-4df96e00f4cc5ada.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_serialize-f8685a53e1b4306e.rlib
-lib/rustlib/i686-unknown-openbsd/lib/librustc_trans-44a2aa39fda1ec27.so
-lib/rustlib/i686-unknown-openbsd/lib/librustc_typeck-f47eeb9eb37ed84a.so
-lib/rustlib/i686-unknown-openbsd/lib/librustdoc-90dadf10ee2c4f95.so
-lib/rustlib/i686-unknown-openbsd/lib/libserialize-cdec391e6199629f.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libserialize-cdec391e6199629f.so
-lib/rustlib/i686-unknown-openbsd/lib/libstd-17fcdf59d67bea14.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libstd-17fcdf59d67bea14.so
-lib/rustlib/i686-unknown-openbsd/lib/libstd_unicode-4cc0c53b17b8e1f2.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libsyntax-02537596263f1216.so
-lib/rustlib/i686-unknown-openbsd/lib/libsyntax_ext-7513382783f0f904.so
-lib/rustlib/i686-unknown-openbsd/lib/libsyntax_pos-4ca1c103715c3013.so
-lib/rustlib/i686-unknown-openbsd/lib/libterm-2cae6b1d3edf5f01.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libterm-2cae6b1d3edf5f01.so
-lib/rustlib/i686-unknown-openbsd/lib/libtest-4f995153b76cd659.rlib
-lib/rustlib/i686-unknown-openbsd/lib/libtest-4f995153b76cd659.so
-lib/rustlib/i686-unknown-openbsd/lib/libunwind-aa508074dcde49a0.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libgetopts-e1cf665aaaf961a0.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libgetopts-e1cf665aaaf961a0.so
+lib/rustlib/i686-unknown-openbsd/lib/libgraphviz-f18120990b721214.so
+lib/rustlib/i686-unknown-openbsd/lib/liblibc-89c05d640b05b95d.rlib
+lib/rustlib/i686-unknown-openbsd/lib/liblog-4c203eca310845ae.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libowning_ref-6e192d11cc425b3a.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libpanic_abort-103f8e691ad2c14c.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libpanic_unwind-1014997b8df1a131.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libproc_macro-6d74293000454ae6.so
+lib/rustlib/i686-unknown-openbsd/lib/libproc_macro_plugin-b1f7e7049a3163c3.so
+lib/rustlib/i686-unknown-openbsd/lib/libpulldown_cmark-f8ad7264d364d164.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librand-c6d1763464806c44.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librls_data-d2ef815ad973f1a8.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librls_span-bdc9ca3a2b17cc7c.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librustc-a023363afee3f2dd.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_back-d76060d8bb261c9c.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_bitflags-a29112b3b754c74e.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librustc_borrowck-bcfa70634e163a87.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_const_eval-5ac2e3b6ed71e72e.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_const_math-6b3a00dee201e8fe.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_data_structures-abe95b161889fc49.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_driver-673cf02822f7a3c3.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_errors-8912d9dac1bca509.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_incremental-56da9bf9647d5bd2.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_lint-42feadef9367bf63.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_llvm-5bf5ce6442bbd026.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_metadata-341792978cf26c9e.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_mir-93d411ba8d74aa1d.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_passes-9dac8ee0d758b527.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_platform_intrinsics-aaddefce4cd3e648.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_plugin-fbfd817ad7784e0e.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_privacy-1f676f018995ebc5.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_resolve-6afd7b3952c89acc.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_save_analysis-d1003e9934e2c1e7.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_serialize-d00cecffc2113f4f.rlib
+lib/rustlib/i686-unknown-openbsd/lib/librustc_trans-59b9c89d4aa969fe.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_typeck-40ced7518718cc60.so
+lib/rustlib/i686-unknown-openbsd/lib/librustdoc-28211d2f952a00b4.so
+lib/rustlib/i686-unknown-openbsd/lib/libserialize-2e9cb4428e83935f.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libserialize-2e9cb4428e83935f.so
+lib/rustlib/i686-unknown-openbsd/lib/libstable_deref_trait-dbdd78ce6e457768.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libstd-698e40d47b16c90f.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libstd-698e40d47b16c90f.so
+lib/rustlib/i686-unknown-openbsd/lib/libstd_unicode-50db280cf7ba7989.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libsyntax-22f989b0832bf7c2.so
+lib/rustlib/i686-unknown-openbsd/lib/libsyntax_ext-cf3890e6029ce73e.so
+lib/rustlib/i686-unknown-openbsd/lib/libsyntax_pos-dac744fa36cc0f88.so
+lib/rustlib/i686-unknown-openbsd/lib/libterm-283e68cf1a757e05.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libterm-283e68cf1a757e05.so
+lib/rustlib/i686-unknown-openbsd/lib/libtest-4de59441f5597a88.rlib
+lib/rustlib/i686-unknown-openbsd/lib/libtest-4de59441f5597a88.so
+lib/rustlib/i686-unknown-openbsd/lib/libunwind-049a0587d07437e8.rlib
Index: lang/rust/pkg/PLIST-doc
===================================================================
RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST-doc
--- lang/rust/pkg/PLIST-doc 17 Jun 2017 02:06:53 -0000 1.21
+++ lang/rust/pkg/PLIST-doc 22 Jul 2017 12:07:21 -0000
@@ -80,6 +80,11 @@ share/doc/rust/html/alloc/rc/sidebar-ite
share/doc/rust/html/alloc/rc/struct.Rc.html
share/doc/rust/html/alloc/rc/struct.Weak.html
share/doc/rust/html/alloc/sidebar-items.js
+share/doc/rust/html/alloc/str/
+share/doc/rust/html/alloc/str/fn.from_boxed_utf8_unchecked.html
+share/doc/rust/html/alloc/str/from_boxed_utf8_unchecked.v.html
+share/doc/rust/html/alloc/str/index.html
+share/doc/rust/html/alloc/str/sidebar-items.js
share/doc/rust/html/book/
share/doc/rust/html/book/README.html
share/doc/rust/html/book/SUMMARY.html
@@ -236,7 +241,9 @@ share/doc/rust/html/book/second-edition/
share/doc/rust/html/book/second-edition/ch04-02-references-and-borrowing.html
share/doc/rust/html/book/second-edition/ch04-03-slices.html
share/doc/rust/html/book/second-edition/ch05-00-structs.html
-share/doc/rust/html/book/second-edition/ch05-01-method-syntax.html
+share/doc/rust/html/book/second-edition/ch05-01-defining-structs.html
+share/doc/rust/html/book/second-edition/ch05-02-example-structs.html
+share/doc/rust/html/book/second-edition/ch05-03-method-syntax.html
share/doc/rust/html/book/second-edition/ch06-00-enums.html
share/doc/rust/html/book/second-edition/ch06-01-defining-an-enum.html
share/doc/rust/html/book/second-edition/ch06-02-match.html
@@ -306,10 +313,17 @@ share/doc/rust/html/book/second-edition/
share/doc/rust/html/book/second-edition/ch19-04-advanced-types.html
share/doc/rust/html/book/second-edition/ch19-05-advanced-functions-and-closures.html
share/doc/rust/html/book/second-edition/ch20-00-final-project-a-web-server.html
+share/doc/rust/html/book/second-edition/ch20-01-single-threaded.html
+share/doc/rust/html/book/second-edition/ch20-02-slow-requests.html
+share/doc/rust/html/book/second-edition/ch20-03-designing-the-interface.html
+share/doc/rust/html/book/second-edition/ch20-04-storing-threads.html
+share/doc/rust/html/book/second-edition/ch20-05-sending-requests-via-channels.html
+share/doc/rust/html/book/second-edition/ch20-06-graceful-shutdown-and-cleanup.html
share/doc/rust/html/book/second-edition/favicon.png
share/doc/rust/html/book/second-edition/highlight.css
share/doc/rust/html/book/second-edition/highlight.js
share/doc/rust/html/book/second-edition/img/
+share/doc/rust/html/book/second-edition/img/hello.png
share/doc/rust/html/book/second-edition/img/trpl04-01.svg
share/doc/rust/html/book/second-edition/img/trpl04-02.svg
share/doc/rust/html/book/second-edition/img/trpl04-03.svg
@@ -600,10 +614,14 @@ share/doc/rust/html/collections/str/Spli
share/doc/rust/html/collections/str/SplitTerminator.t.html
share/doc/rust/html/collections/str/SplitWhitespace.t.html
share/doc/rust/html/collections/str/Utf8Error.t.html
+share/doc/rust/html/collections/str/fn.from_boxed_utf8_unchecked.html
share/doc/rust/html/collections/str/fn.from_utf8.html
+share/doc/rust/html/collections/str/fn.from_utf8_mut.html
share/doc/rust/html/collections/str/fn.from_utf8_unchecked.html
share/doc/rust/html/collections/str/fn.from_utf8_unchecked_mut.html
+share/doc/rust/html/collections/str/from_boxed_utf8_unchecked.v.html
share/doc/rust/html/collections/str/from_utf8.v.html
+share/doc/rust/html/collections/str/from_utf8_mut.v.html
share/doc/rust/html/collections/str/from_utf8_unchecked.v.html
share/doc/rust/html/collections/str/from_utf8_unchecked_mut.v.html
share/doc/rust/html/collections/str/index.html
@@ -654,6 +672,7 @@ share/doc/rust/html/collections/string/D
share/doc/rust/html/collections/string/FromUtf16Error.t.html
share/doc/rust/html/collections/string/FromUtf8Error.t.html
share/doc/rust/html/collections/string/ParseError.t.html
+share/doc/rust/html/collections/string/Splice.t.html
share/doc/rust/html/collections/string/String.t.html
share/doc/rust/html/collections/string/ToString.t.html
share/doc/rust/html/collections/string/enum.ParseError.html
@@ -662,6 +681,7 @@ share/doc/rust/html/collections/string/s
share/doc/rust/html/collections/string/struct.Drain.html
share/doc/rust/html/collections/string/struct.FromUtf16Error.html
share/doc/rust/html/collections/string/struct.FromUtf8Error.html
+share/doc/rust/html/collections/string/struct.Splice.html
share/doc/rust/html/collections/string/struct.String.html
share/doc/rust/html/collections/string/trait.ToString.html
share/doc/rust/html/collections/vec/
@@ -669,12 +689,14 @@ share/doc/rust/html/collections/vec.m.ht
share/doc/rust/html/collections/vec/Drain.t.html
share/doc/rust/html/collections/vec/IntoIter.t.html
share/doc/rust/html/collections/vec/PlaceBack.t.html
+share/doc/rust/html/collections/vec/Splice.t.html
share/doc/rust/html/collections/vec/Vec.t.html
share/doc/rust/html/collections/vec/index.html
share/doc/rust/html/collections/vec/sidebar-items.js
share/doc/rust/html/collections/vec/struct.Drain.html
share/doc/rust/html/collections/vec/struct.IntoIter.html
share/doc/rust/html/collections/vec/struct.PlaceBack.html
+share/doc/rust/html/collections/vec/struct.Splice.html
share/doc/rust/html/collections/vec/struct.Vec.html
share/doc/rust/html/collections/vec_deque/
share/doc/rust/html/collections/vec_deque/Drain.t.html
@@ -1333,6 +1355,10 @@ share/doc/rust/html/core/intrinsics/fn.p
share/doc/rust/html/core/intrinsics/fn.powif32.html
share/doc/rust/html/core/intrinsics/fn.powif64.html
share/doc/rust/html/core/intrinsics/fn.pref_align_of.html
+share/doc/rust/html/core/intrinsics/fn.prefetch_read_data.html
+share/doc/rust/html/core/intrinsics/fn.prefetch_read_instruction.html
+share/doc/rust/html/core/intrinsics/fn.prefetch_write_data.html
+share/doc/rust/html/core/intrinsics/fn.prefetch_write_instruction.html
share/doc/rust/html/core/intrinsics/fn.rintf32.html
share/doc/rust/html/core/intrinsics/fn.rintf64.html
share/doc/rust/html/core/intrinsics/fn.roundf32.html
@@ -1391,6 +1417,10 @@ share/doc/rust/html/core/intrinsics/powf
share/doc/rust/html/core/intrinsics/powif32.v.html
share/doc/rust/html/core/intrinsics/powif64.v.html
share/doc/rust/html/core/intrinsics/pref_align_of.v.html
+share/doc/rust/html/core/intrinsics/prefetch_read_data.v.html
+share/doc/rust/html/core/intrinsics/prefetch_read_instruction.v.html
+share/doc/rust/html/core/intrinsics/prefetch_write_data.v.html
+share/doc/rust/html/core/intrinsics/prefetch_write_instruction.v.html
share/doc/rust/html/core/intrinsics/rintf32.v.html
share/doc/rust/html/core/intrinsics/rintf64.v.html
share/doc/rust/html/core/intrinsics/roundf32.v.html
@@ -1434,6 +1464,7 @@ share/doc/rust/html/core/iter/
share/doc/rust/html/core/iter/Chain.t.html
share/doc/rust/html/core/iter/Cloned.t.html
share/doc/rust/html/core/iter/Cycle.t.html
+share/doc/rust/html/core/iter/DeprecatedStepBy.t.html
share/doc/rust/html/core/iter/DoubleEndedIterator.t.html
share/doc/rust/html/core/iter/Empty.t.html
share/doc/rust/html/core/iter/Enumerate.t.html
@@ -1496,6 +1527,7 @@ share/doc/rust/html/core/iter/sources/st
share/doc/rust/html/core/iter/struct.Chain.html
share/doc/rust/html/core/iter/struct.Cloned.html
share/doc/rust/html/core/iter/struct.Cycle.html
+share/doc/rust/html/core/iter/struct.DeprecatedStepBy.html
share/doc/rust/html/core/iter/struct.Empty.html
share/doc/rust/html/core/iter/struct.Enumerate.html
share/doc/rust/html/core/iter/struct.Filter.html
@@ -1627,6 +1659,7 @@ share/doc/rust/html/core/mem/fn.drop.htm
share/doc/rust/html/core/mem/fn.forget.html
share/doc/rust/html/core/mem/fn.min_align_of.html
share/doc/rust/html/core/mem/fn.min_align_of_val.html
+share/doc/rust/html/core/mem/fn.needs_drop.html
share/doc/rust/html/core/mem/fn.replace.html
share/doc/rust/html/core/mem/fn.size_of.html
share/doc/rust/html/core/mem/fn.size_of_val.html
@@ -1638,6 +1671,7 @@ share/doc/rust/html/core/mem/forget.v.ht
share/doc/rust/html/core/mem/index.html
share/doc/rust/html/core/mem/min_align_of.v.html
share/doc/rust/html/core/mem/min_align_of_val.v.html
+share/doc/rust/html/core/mem/needs_drop.v.html
share/doc/rust/html/core/mem/replace.v.html
share/doc/rust/html/core/mem/sidebar-items.js
share/doc/rust/html/core/mem/size_of.v.html
@@ -1683,7 +1717,6 @@ share/doc/rust/html/core/ops/BitXor.t.ht
share/doc/rust/html/core/ops/BitXorAssign.t.html
share/doc/rust/html/core/ops/BoxPlace.t.html
share/doc/rust/html/core/ops/Boxed.t.html
-share/doc/rust/html/core/ops/Carrier.t.html
share/doc/rust/html/core/ops/CoerceUnsized.t.html
share/doc/rust/html/core/ops/Deref.t.html
share/doc/rust/html/core/ops/DerefMut.t.html
@@ -1716,12 +1749,13 @@ share/doc/rust/html/core/ops/Shr.t.html
share/doc/rust/html/core/ops/ShrAssign.t.html
share/doc/rust/html/core/ops/Sub.t.html
share/doc/rust/html/core/ops/SubAssign.t.html
-share/doc/rust/html/core/ops/enum.RangeInclusive.html
+share/doc/rust/html/core/ops/Try.t.html
share/doc/rust/html/core/ops/index.html
share/doc/rust/html/core/ops/sidebar-items.js
share/doc/rust/html/core/ops/struct.Range.html
share/doc/rust/html/core/ops/struct.RangeFrom.html
share/doc/rust/html/core/ops/struct.RangeFull.html
+share/doc/rust/html/core/ops/struct.RangeInclusive.html
share/doc/rust/html/core/ops/struct.RangeTo.html
share/doc/rust/html/core/ops/struct.RangeToInclusive.html
share/doc/rust/html/core/ops/trait.Add.html
@@ -1734,7 +1768,6 @@ share/doc/rust/html/core/ops/trait.BitXo
share/doc/rust/html/core/ops/trait.BitXorAssign.html
share/doc/rust/html/core/ops/trait.BoxPlace.html
share/doc/rust/html/core/ops/trait.Boxed.html
-share/doc/rust/html/core/ops/trait.Carrier.html
share/doc/rust/html/core/ops/trait.CoerceUnsized.html
share/doc/rust/html/core/ops/trait.Deref.html
share/doc/rust/html/core/ops/trait.DerefMut.html
@@ -1761,6 +1794,7 @@ share/doc/rust/html/core/ops/trait.Shr.h
share/doc/rust/html/core/ops/trait.ShrAssign.html
share/doc/rust/html/core/ops/trait.Sub.html
share/doc/rust/html/core/ops/trait.SubAssign.html
+share/doc/rust/html/core/ops/trait.Try.html
share/doc/rust/html/core/option/
share/doc/rust/html/core/option/IntoIter.t.html
share/doc/rust/html/core/option/Iter.t.html
@@ -1987,6 +2021,8 @@ share/doc/rust/html/core/sync/atomic/enu
share/doc/rust/html/core/sync/atomic/fence.v.html
share/doc/rust/html/core/sync/atomic/fn.compiler_fence.html
share/doc/rust/html/core/sync/atomic/fn.fence.html
+share/doc/rust/html/core/sync/atomic/fn.hint_core_should_pause.html
+share/doc/rust/html/core/sync/atomic/hint_core_should_pause.v.html
share/doc/rust/html/core/sync/atomic/index.html
share/doc/rust/html/core/sync/atomic/sidebar-items.js
share/doc/rust/html/core/sync/atomic/struct.AtomicBool.html
@@ -2181,7 +2217,6 @@ share/doc/rust/html/implementors/core/op
share/doc/rust/html/implementors/core/ops/trait.BitXorAssign.js
share/doc/rust/html/implementors/core/ops/trait.BoxPlace.js
share/doc/rust/html/implementors/core/ops/trait.Boxed.js
-share/doc/rust/html/implementors/core/ops/trait.Carrier.js
share/doc/rust/html/implementors/core/ops/trait.CoerceUnsized.js
share/doc/rust/html/implementors/core/ops/trait.Deref.js
share/doc/rust/html/implementors/core/ops/trait.DerefMut.js
@@ -2208,6 +2243,7 @@ share/doc/rust/html/implementors/core/op
share/doc/rust/html/implementors/core/ops/trait.ShrAssign.js
share/doc/rust/html/implementors/core/ops/trait.Sub.js
share/doc/rust/html/implementors/core/ops/trait.SubAssign.js
+share/doc/rust/html/implementors/core/ops/trait.Try.js
share/doc/rust/html/implementors/core/slice/
share/doc/rust/html/implementors/core/slice/trait.SliceExt.js
share/doc/rust/html/implementors/core/slice/trait.SliceIndex.js
@@ -2307,7 +2343,6 @@ share/doc/rust/html/implementors/std/ops
share/doc/rust/html/implementors/std/ops/trait.BitXorAssign.js
share/doc/rust/html/implementors/std/ops/trait.BoxPlace.js
share/doc/rust/html/implementors/std/ops/trait.Boxed.js
-share/doc/rust/html/implementors/std/ops/trait.Carrier.js
share/doc/rust/html/implementors/std/ops/trait.CoerceUnsized.js
share/doc/rust/html/implementors/std/ops/trait.Deref.js
share/doc/rust/html/implementors/std/ops/trait.DerefMut.js
@@ -2334,6 +2369,7 @@ share/doc/rust/html/implementors/std/ops
share/doc/rust/html/implementors/std/ops/trait.ShrAssign.js
share/doc/rust/html/implementors/std/ops/trait.Sub.js
share/doc/rust/html/implementors/std/ops/trait.SubAssign.js
+share/doc/rust/html/implementors/std/ops/trait.Try.js
share/doc/rust/html/implementors/std/os/
share/doc/rust/html/implementors/std/os/openbsd/
share/doc/rust/html/implementors/std/os/openbsd/fs/
@@ -2381,7 +2417,6 @@ share/doc/rust/html/implementors/std_uni
share/doc/rust/html/implementors/std_unicode/u_str/trait.UnicodeStr.js
share/doc/rust/html/index.html
share/doc/rust/html/intro.html
-share/doc/rust/html/jquery.js
share/doc/rust/html/main.css
share/doc/rust/html/main.js
share/doc/rust/html/nomicon/
@@ -2415,9 +2450,12 @@ share/doc/rust/html/nomicon/dropck.html
share/doc/rust/html/nomicon/exception-safety.html
share/doc/rust/html/nomicon/exotic-sizes.html
share/doc/rust/html/nomicon/favicon.png
+share/doc/rust/html/nomicon/ffi.html
share/doc/rust/html/nomicon/highlight.css
share/doc/rust/html/nomicon/highlight.js
share/doc/rust/html/nomicon/hrtb.html
+share/doc/rust/html/nomicon/img/
+share/doc/rust/html/nomicon/img/safeandunsafe.svg
share/doc/rust/html/nomicon/index.html
share/doc/rust/html/nomicon/jquery.js
share/doc/rust/html/nomicon/leaking.html
@@ -2549,6 +2587,7 @@ share/doc/rust/html/src/alloc/macros.rs.
share/doc/rust/html/src/alloc/oom.rs.html
share/doc/rust/html/src/alloc/raw_vec.rs.html
share/doc/rust/html/src/alloc/rc.rs.html
+share/doc/rust/html/src/alloc/str.rs.html
share/doc/rust/html/src/collections/
share/doc/rust/html/src/collections/binary_heap.rs.html
share/doc/rust/html/src/collections/borrow.rs.html
@@ -2615,7 +2654,6 @@ share/doc/rust/html/src/core/num/dec2flt
share/doc/rust/html/src/core/num/diy_float.rs.html
share/doc/rust/html/src/core/num/f32.rs.html
share/doc/rust/html/src/core/num/f64.rs.html
-share/doc/rust/html/src/core/num/float_macros.rs.html
share/doc/rust/html/src/core/num/flt2dec/
share/doc/rust/html/src/core/num/flt2dec/decoder.rs.html
share/doc/rust/html/src/core/num/flt2dec/estimator.rs.html
@@ -2650,6 +2688,7 @@ share/doc/rust/html/src/core/raw.rs.html
share/doc/rust/html/src/core/result.rs.html
share/doc/rust/html/src/core/slice/
share/doc/rust/html/src/core/slice/mod.rs.html
+share/doc/rust/html/src/core/slice/rotate.rs.html
share/doc/rust/html/src/core/slice/sort.rs.html
share/doc/rust/html/src/core/str/
share/doc/rust/html/src/core/str/mod.rs.html
@@ -3241,6 +3280,8 @@ share/doc/rust/html/std/env/var.v.html
share/doc/rust/html/std/env/var_os.v.html
share/doc/rust/html/std/env/vars.v.html
share/doc/rust/html/std/env/vars_os.v.html
+share/doc/rust/html/std/eprint.m.html
+share/doc/rust/html/std/eprintln.m.html
share/doc/rust/html/std/error/
share/doc/rust/html/std/error/Error.t.html
share/doc/rust/html/std/error/index.html
@@ -3840,6 +3881,10 @@ share/doc/rust/html/std/intrinsics/fn.po
share/doc/rust/html/std/intrinsics/fn.powif32.html
share/doc/rust/html/std/intrinsics/fn.powif64.html
share/doc/rust/html/std/intrinsics/fn.pref_align_of.html
+share/doc/rust/html/std/intrinsics/fn.prefetch_read_data.html
+share/doc/rust/html/std/intrinsics/fn.prefetch_read_instruction.html
+share/doc/rust/html/std/intrinsics/fn.prefetch_write_data.html
+share/doc/rust/html/std/intrinsics/fn.prefetch_write_instruction.html
share/doc/rust/html/std/intrinsics/fn.rintf32.html
share/doc/rust/html/std/intrinsics/fn.rintf64.html
share/doc/rust/html/std/intrinsics/fn.roundf32.html
@@ -3898,6 +3943,10 @@ share/doc/rust/html/std/intrinsics/powf6
share/doc/rust/html/std/intrinsics/powif32.v.html
share/doc/rust/html/std/intrinsics/powif64.v.html
share/doc/rust/html/std/intrinsics/pref_align_of.v.html
+share/doc/rust/html/std/intrinsics/prefetch_read_data.v.html
+share/doc/rust/html/std/intrinsics/prefetch_read_instruction.v.html
+share/doc/rust/html/std/intrinsics/prefetch_write_data.v.html
+share/doc/rust/html/std/intrinsics/prefetch_write_instruction.v.html
share/doc/rust/html/std/intrinsics/rintf32.v.html
share/doc/rust/html/std/intrinsics/rintf64.v.html
share/doc/rust/html/std/intrinsics/roundf32.v.html
@@ -4073,6 +4122,7 @@ share/doc/rust/html/std/iter/
share/doc/rust/html/std/iter/Chain.t.html
share/doc/rust/html/std/iter/Cloned.t.html
share/doc/rust/html/std/iter/Cycle.t.html
+share/doc/rust/html/std/iter/DeprecatedStepBy.t.html
share/doc/rust/html/std/iter/DoubleEndedIterator.t.html
share/doc/rust/html/std/iter/Empty.t.html
share/doc/rust/html/std/iter/Enumerate.t.html
@@ -4114,6 +4164,7 @@ share/doc/rust/html/std/iter/sidebar-ite
share/doc/rust/html/std/iter/struct.Chain.html
share/doc/rust/html/std/iter/struct.Cloned.html
share/doc/rust/html/std/iter/struct.Cycle.html
+share/doc/rust/html/std/iter/struct.DeprecatedStepBy.html
share/doc/rust/html/std/iter/struct.Empty.html
share/doc/rust/html/std/iter/struct.Enumerate.html
share/doc/rust/html/std/iter/struct.Filter.html
@@ -4167,6 +4218,10 @@ share/doc/rust/html/std/macro.debug_asse
share/doc/rust/html/std/macro.debug_assert_ne.html
share/doc/rust/html/std/macro.env!.html
share/doc/rust/html/std/macro.env.html
+share/doc/rust/html/std/macro.eprint!.html
+share/doc/rust/html/std/macro.eprint.html
+share/doc/rust/html/std/macro.eprintln!.html
+share/doc/rust/html/std/macro.eprintln.html
share/doc/rust/html/std/macro.file!.html
share/doc/rust/html/std/macro.file.html
share/doc/rust/html/std/macro.format!.html
@@ -4238,6 +4293,7 @@ share/doc/rust/html/std/mem/fn.drop.html
share/doc/rust/html/std/mem/fn.forget.html
share/doc/rust/html/std/mem/fn.min_align_of.html
share/doc/rust/html/std/mem/fn.min_align_of_val.html
+share/doc/rust/html/std/mem/fn.needs_drop.html
share/doc/rust/html/std/mem/fn.replace.html
share/doc/rust/html/std/mem/fn.size_of.html
share/doc/rust/html/std/mem/fn.size_of_val.html
@@ -4250,6 +4306,7 @@ share/doc/rust/html/std/mem/forget.v.htm
share/doc/rust/html/std/mem/index.html
share/doc/rust/html/std/mem/min_align_of.v.html
share/doc/rust/html/std/mem/min_align_of_val.v.html
+share/doc/rust/html/std/mem/needs_drop.v.html
share/doc/rust/html/std/mem/replace.v.html
share/doc/rust/html/std/mem/sidebar-items.js
share/doc/rust/html/std/mem/size_of.v.html
@@ -4352,7 +4409,6 @@ share/doc/rust/html/std/ops/BitXor.t.htm
share/doc/rust/html/std/ops/BitXorAssign.t.html
share/doc/rust/html/std/ops/BoxPlace.t.html
share/doc/rust/html/std/ops/Boxed.t.html
-share/doc/rust/html/std/ops/Carrier.t.html
share/doc/rust/html/std/ops/CoerceUnsized.t.html
share/doc/rust/html/std/ops/Deref.t.html
share/doc/rust/html/std/ops/DerefMut.t.html
@@ -4385,12 +4441,13 @@ share/doc/rust/html/std/ops/Shr.t.html
share/doc/rust/html/std/ops/ShrAssign.t.html
share/doc/rust/html/std/ops/Sub.t.html
share/doc/rust/html/std/ops/SubAssign.t.html
-share/doc/rust/html/std/ops/enum.RangeInclusive.html
+share/doc/rust/html/std/ops/Try.t.html
share/doc/rust/html/std/ops/index.html
share/doc/rust/html/std/ops/sidebar-items.js
share/doc/rust/html/std/ops/struct.Range.html
share/doc/rust/html/std/ops/struct.RangeFrom.html
share/doc/rust/html/std/ops/struct.RangeFull.html
+share/doc/rust/html/std/ops/struct.RangeInclusive.html
share/doc/rust/html/std/ops/struct.RangeTo.html
share/doc/rust/html/std/ops/struct.RangeToInclusive.html
share/doc/rust/html/std/ops/trait.Add.html
@@ -4403,7 +4460,6 @@ share/doc/rust/html/std/ops/trait.BitXor
share/doc/rust/html/std/ops/trait.BitXorAssign.html
share/doc/rust/html/std/ops/trait.BoxPlace.html
share/doc/rust/html/std/ops/trait.Boxed.html
-share/doc/rust/html/std/ops/trait.Carrier.html
share/doc/rust/html/std/ops/trait.CoerceUnsized.html
share/doc/rust/html/std/ops/trait.Deref.html
share/doc/rust/html/std/ops/trait.DerefMut.html
@@ -4430,6 +4486,7 @@ share/doc/rust/html/std/ops/trait.Shr.ht
share/doc/rust/html/std/ops/trait.ShrAssign.html
share/doc/rust/html/std/ops/trait.Sub.html
share/doc/rust/html/std/ops/trait.SubAssign.html
+share/doc/rust/html/std/ops/trait.Try.html
share/doc/rust/html/std/option/
share/doc/rust/html/std/option/IntoIter.t.html
share/doc/rust/html/std/option/Iter.t.html
@@ -4879,10 +4936,14 @@ share/doc/rust/html/std/str/SplitN.t.htm
share/doc/rust/html/std/str/SplitTerminator.t.html
share/doc/rust/html/std/str/SplitWhitespace.t.html
share/doc/rust/html/std/str/Utf8Error.t.html
+share/doc/rust/html/std/str/fn.from_boxed_utf8_unchecked.html
share/doc/rust/html/std/str/fn.from_utf8.html
+share/doc/rust/html/std/str/fn.from_utf8_mut.html
share/doc/rust/html/std/str/fn.from_utf8_unchecked.html
share/doc/rust/html/std/str/fn.from_utf8_unchecked_mut.html
+share/doc/rust/html/std/str/from_boxed_utf8_unchecked.v.html
share/doc/rust/html/std/str/from_utf8.v.html
+share/doc/rust/html/std/str/from_utf8_mut.v.html
share/doc/rust/html/std/str/from_utf8_unchecked.v.html
share/doc/rust/html/std/str/from_utf8_unchecked_mut.v.html
share/doc/rust/html/std/str/index.html
@@ -4933,6 +4994,7 @@ share/doc/rust/html/std/string/Drain.t.h
share/doc/rust/html/std/string/FromUtf16Error.t.html
share/doc/rust/html/std/string/FromUtf8Error.t.html
share/doc/rust/html/std/string/ParseError.t.html
+share/doc/rust/html/std/string/Splice.t.html
share/doc/rust/html/std/string/String.t.html
share/doc/rust/html/std/string/ToString.t.html
share/doc/rust/html/std/string/enum.ParseError.html
@@ -4941,6 +5003,7 @@ share/doc/rust/html/std/string/sidebar-i
share/doc/rust/html/std/string/struct.Drain.html
share/doc/rust/html/std/string/struct.FromUtf16Error.html
share/doc/rust/html/std/string/struct.FromUtf8Error.html
+share/doc/rust/html/std/string/struct.Splice.html
share/doc/rust/html/std/string/struct.String.html
share/doc/rust/html/std/string/trait.ToString.html
share/doc/rust/html/std/stringify.m.html
@@ -5004,6 +5067,8 @@ share/doc/rust/html/std/sync/atomic/enum
share/doc/rust/html/std/sync/atomic/fence.v.html
share/doc/rust/html/std/sync/atomic/fn.compiler_fence.html
share/doc/rust/html/std/sync/atomic/fn.fence.html
+share/doc/rust/html/std/sync/atomic/fn.hint_core_should_pause.html
+share/doc/rust/html/std/sync/atomic/hint_core_should_pause.v.html
share/doc/rust/html/std/sync/atomic/index.html
share/doc/rust/html/std/sync/atomic/sidebar-items.js
share/doc/rust/html/std/sync/atomic/struct.AtomicBool.html
@@ -5301,12 +5366,14 @@ share/doc/rust/html/std/vec.m.html
share/doc/rust/html/std/vec/Drain.t.html
share/doc/rust/html/std/vec/IntoIter.t.html
share/doc/rust/html/std/vec/PlaceBack.t.html
+share/doc/rust/html/std/vec/Splice.t.html
share/doc/rust/html/std/vec/Vec.t.html
share/doc/rust/html/std/vec/index.html
share/doc/rust/html/std/vec/sidebar-items.js
share/doc/rust/html/std/vec/struct.Drain.html
share/doc/rust/html/std/vec/struct.IntoIter.html
share/doc/rust/html/std/vec/struct.PlaceBack.html
+share/doc/rust/html/std/vec/struct.Splice.html
share/doc/rust/html/std/vec/struct.Vec.html
share/doc/rust/html/std/write.m.html
share/doc/rust/html/std/writeln.m.html
@@ -5406,6 +5473,7 @@ share/doc/rust/html/unstable-book/book.j
share/doc/rust/html/unstable-book/compiler-flags/
share/doc/rust/html/unstable-book/compiler-flags.html
share/doc/rust/html/unstable-book/compiler-flags/linker-flavor.html
+share/doc/rust/html/unstable-book/compiler-flags/remap-path-prefix.html
share/doc/rust/html/unstable-book/favicon.png
share/doc/rust/html/unstable-book/highlight.css
share/doc/rust/html/unstable-book/highlight.js
@@ -5416,6 +5484,7 @@ share/doc/rust/html/unstable-book/langua
share/doc/rust/html/unstable-book/language-features/abi-msp430-interrupt.html
share/doc/rust/html/unstable-book/language-features/abi-ptx.html
share/doc/rust/html/unstable-book/language-features/abi-sysv64.html
+share/doc/rust/html/unstable-book/language-features/abi-thiscall.html
share/doc/rust/html/unstable-book/language-features/abi-unadjusted.html
share/doc/rust/html/unstable-book/language-features/abi-vectorcall.html
share/doc/rust/html/unstable-book/language-features/abi-x86-interrupt.html
@@ -5433,7 +5502,6 @@ share/doc/rust/html/unstable-book/langua
share/doc/rust/html/unstable-book/language-features/cfg-target-has-atomic.html
share/doc/rust/html/unstable-book/language-features/cfg-target-thread-local.html
share/doc/rust/html/unstable-book/language-features/cfg-target-vendor.html
-share/doc/rust/html/unstable-book/language-features/closure-to-fn-coercion.html
share/doc/rust/html/unstable-book/language-features/compiler-builtins.html
share/doc/rust/html/unstable-book/language-features/concat-idents.html
share/doc/rust/html/unstable-book/language-features/conservative-impl-trait.html
@@ -5458,7 +5526,6 @@ share/doc/rust/html/unstable-book/langua
share/doc/rust/html/unstable-book/language-features/link-llvm-intrinsics.html
share/doc/rust/html/unstable-book/language-features/linkage.html
share/doc/rust/html/unstable-book/language-features/log-syntax.html
-share/doc/rust/html/unstable-book/language-features/loop-break-value.html
share/doc/rust/html/unstable-book/language-features/macro-reexport.html
share/doc/rust/html/unstable-book/language-features/macro-vis-matcher.html
share/doc/rust/html/unstable-book/language-features/main.html
@@ -5481,7 +5548,6 @@ share/doc/rust/html/unstable-book/langua
share/doc/rust/html/unstable-book/language-features/prelude-import.html
share/doc/rust/html/unstable-book/language-features/proc-macro.html
share/doc/rust/html/unstable-book/language-features/quote.html
-share/doc/rust/html/unstable-book/language-features/relaxed-adts.html
share/doc/rust/html/unstable-book/language-features/repr-align.html
share/doc/rust/html/unstable-book/language-features/repr-simd.html
share/doc/rust/html/unstable-book/language-features/rustc-attrs.html
@@ -5521,7 +5587,6 @@ share/doc/rust/html/unstable-book/librar
share/doc/rust/html/unstable-book/library-features/collection-placement.html
share/doc/rust/html/unstable-book/library-features/collections-range.html
share/doc/rust/html/unstable-book/library-features/collections.html
-share/doc/rust/html/unstable-book/library-features/command-envs.html
share/doc/rust/html/unstable-book/library-features/compiler-builtins-lib.html
share/doc/rust/html/unstable-book/library-features/compiler-fences.html
share/doc/rust/html/unstable-book/library-features/concat-idents-macro.html
@@ -5554,6 +5619,7 @@ share/doc/rust/html/unstable-book/librar
share/doc/rust/html/unstable-book/library-features/future-atomic-orderings.html
share/doc/rust/html/unstable-book/library-features/get-type-id.html
share/doc/rust/html/unstable-book/library-features/heap-api.html
+share/doc/rust/html/unstable-book/library-features/hint-core-should-pause.html
share/doc/rust/html/unstable-book/library-features/i128.html
share/doc/rust/html/unstable-book/library-features/inclusive-range.html
share/doc/rust/html/unstable-book/library-features/integer-atomics.html
@@ -5564,12 +5630,14 @@ share/doc/rust/html/unstable-book/librar
share/doc/rust/html/unstable-book/library-features/io.html
share/doc/rust/html/unstable-book/library-features/ip.html
share/doc/rust/html/unstable-book/library-features/iter-rfind.html
+share/doc/rust/html/unstable-book/library-features/iterator-step-by.html
share/doc/rust/html/unstable-book/library-features/libstd-io-internals.html
share/doc/rust/html/unstable-book/library-features/libstd-sys-internals.html
share/doc/rust/html/unstable-book/library-features/libstd-thread-internals.html
share/doc/rust/html/unstable-book/library-features/linked-list-extras.html
share/doc/rust/html/unstable-book/library-features/lookup-host.html
share/doc/rust/html/unstable-book/library-features/manually-drop.html
+share/doc/rust/html/unstable-book/library-features/more-io-inner-methods.html
share/doc/rust/html/unstable-book/library-features/mpsc-select.html
share/doc/rust/html/unstable-book/library-features/n16.html
share/doc/rust/html/unstable-book/library-features/never-type-impls.html
@@ -5578,19 +5646,17 @@ share/doc/rust/html/unstable-book/librar
share/doc/rust/html/unstable-book/library-features/once-poison.html
share/doc/rust/html/unstable-book/library-features/oom.html
share/doc/rust/html/unstable-book/library-features/option-entry.html
-share/doc/rust/html/unstable-book/library-features/osstring-shrink-to-fit.html
share/doc/rust/html/unstable-book/library-features/panic-abort.html
share/doc/rust/html/unstable-book/library-features/panic-unwind.html
share/doc/rust/html/unstable-book/library-features/pattern.html
share/doc/rust/html/unstable-book/library-features/placement-in.html
share/doc/rust/html/unstable-book/library-features/placement-new-protocol.html
-share/doc/rust/html/unstable-book/library-features/print.html
+share/doc/rust/html/unstable-book/library-features/print-internals.html
share/doc/rust/html/unstable-book/library-features/proc-macro-internals.html
share/doc/rust/html/unstable-book/library-features/question-mark-carrier.html
share/doc/rust/html/unstable-book/library-features/rand.html
share/doc/rust/html/unstable-book/library-features/range-contains.html
share/doc/rust/html/unstable-book/library-features/raw.html
-share/doc/rust/html/unstable-book/library-features/reverse-cmp-key.html
share/doc/rust/html/unstable-book/library-features/rt.html
share/doc/rust/html/unstable-book/library-features/rustc-private.html
share/doc/rust/html/unstable-book/library-features/sanitizer-runtime-lib.html
@@ -5599,27 +5665,31 @@ share/doc/rust/html/unstable-book/librar
share/doc/rust/html/unstable-book/library-features/sip-hash-13.html
share/doc/rust/html/unstable-book/library-features/slice-concat-ext.html
share/doc/rust/html/unstable-book/library-features/slice-get-slice.html
+share/doc/rust/html/unstable-book/library-features/slice-rotate.html
share/doc/rust/html/unstable-book/library-features/slice-rsplit.html
share/doc/rust/html/unstable-book/library-features/sort-internals.html
share/doc/rust/html/unstable-book/library-features/sort-unstable.html
+share/doc/rust/html/unstable-book/library-features/splice.html
share/doc/rust/html/unstable-book/library-features/step-by.html
share/doc/rust/html/unstable-book/library-features/step-trait.html
+share/doc/rust/html/unstable-book/library-features/str-box-extras.html
share/doc/rust/html/unstable-book/library-features/str-checked-slicing.html
share/doc/rust/html/unstable-book/library-features/str-escape.html
share/doc/rust/html/unstable-book/library-features/str-internals.html
share/doc/rust/html/unstable-book/library-features/str-mut-extras.html
share/doc/rust/html/unstable-book/library-features/test.html
-share/doc/rust/html/unstable-book/library-features/thread-id.html
share/doc/rust/html/unstable-book/library-features/thread-local-internals.html
share/doc/rust/html/unstable-book/library-features/thread-local-state.html
share/doc/rust/html/unstable-book/library-features/toowned-clone-into.html
share/doc/rust/html/unstable-book/library-features/trusted-len.html
share/doc/rust/html/unstable-book/library-features/try-from.html
+share/doc/rust/html/unstable-book/library-features/try-trait.html
share/doc/rust/html/unstable-book/library-features/unicode.html
share/doc/rust/html/unstable-book/library-features/unique.html
share/doc/rust/html/unstable-book/library-features/unsize.html
share/doc/rust/html/unstable-book/library-features/utf8-error-error-len.html
share/doc/rust/html/unstable-book/library-features/vec-remove-item.html
+share/doc/rust/html/unstable-book/library-features/vec-resize-default.html
share/doc/rust/html/unstable-book/library-features/windows-c.html
share/doc/rust/html/unstable-book/library-features/windows-handle.html
share/doc/rust/html/unstable-book/library-features/windows-net.html
Index: lang/rust/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/rust/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- lang/rust/pkg/PLIST-main 15 Feb 2017 12:52:35 -0000 1.12
+++ lang/rust/pkg/PLIST-main 22 Jul 2017 12:07:21 -0000
@@ -1,19 +1,63 @@
@comment $OpenBSD: PLIST-main,v 1.12 2017/02/15 12:52:35 landry Exp $
+@conflict cargo-<0.20.0
+@pkgpath devel/cargo
+@bin bin/cargo
bin/rust-gdb
@bin bin/rustc
@bin bin/rustdoc
lib/rustlib/
lib/rustlib/etc/
lib/rustlib/etc/debugger_pretty_printers_common.py
+lib/rustlib/etc/debugger_pretty_printers_common.pyc
lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+lib/rustlib/etc/gdb_load_rust_pretty_printers.pyc
lib/rustlib/etc/gdb_rust_pretty_printing.py
+lib/rustlib/etc/gdb_rust_pretty_printing.pyc
lib/rustlib/etc/lldb_rust_formatters.py
+lib/rustlib/etc/lldb_rust_formatters.pyc
%%amd64%%
%%i386%%
+@man man/man1/cargo-bench.1
+@man man/man1/cargo-build.1
+@man man/man1/cargo-check.1
+@man man/man1/cargo-clean.1
+@man man/man1/cargo-doc.1
+@man man/man1/cargo-fetch.1
+@man man/man1/cargo-generate-lockfile.1
+@man man/man1/cargo-init.1
+@man man/man1/cargo-install.1
+@man man/man1/cargo-login.1
+@man man/man1/cargo-metadata.1
+@man man/man1/cargo-new.1
+@man man/man1/cargo-owner.1
+@man man/man1/cargo-package.1
+@man man/man1/cargo-pkgid.1
+@man man/man1/cargo-publish.1
+@man man/man1/cargo-run.1
+@man man/man1/cargo-rustc.1
+@man man/man1/cargo-rustdoc.1
+@man man/man1/cargo-search.1
+@man man/man1/cargo-test.1
+@man man/man1/cargo-uninstall.1
+@man man/man1/cargo-update.1
+@man man/man1/cargo-version.1
+@man man/man1/cargo-yank.1
+@man man/man1/cargo.1
@man man/man1/rustc.1
@man man/man1/rustdoc.1
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/cargo
+share/doc/cargo/
+share/doc/cargo/LICENSE-APACHE
+share/doc/cargo/LICENSE-MIT
+share/doc/cargo/LICENSE-THIRD-PARTY
+share/doc/cargo/README.md
share/doc/rust/
share/doc/rust/COPYRIGHT
share/doc/rust/LICENSE-APACHE
share/doc/rust/LICENSE-MIT
share/doc/rust/README.md
+share/zsh/
+share/zsh/site-functions/
+share/zsh/site-functions/_cargo
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.498
diff -u -p -r1.498 Makefile
--- devel/quirks/Makefile 17 Jul 2017 21:09:01 -0000 1.498
+++ devel/quirks/Makefile 22 Jul 2017 12:07:21 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.343
+PKGNAME = quirks-2.344
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.510
diff -u -p -r1.510 Quirks.pm
--- devel/quirks/files/Quirks.pm 17 Jul 2017 21:09:01 -0000 1.510
+++ devel/quirks/files/Quirks.pm 22 Jul 2017 12:07:22 -0000
@@ -412,6 +412,7 @@ my $stem_extensions = {
'markdown' => 'py-markdown',
'netperf-wrapper' => 'flent',
'kamailio-xmlrpc' => 'kamailio-xml',
+ 'cargo' => 'rust',
};
my $obsolete_reason = {
Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.322
diff -u -p -r1.322 Makefile
--- www/mozilla-firefox/Makefile 16 Jul 2017 19:19:03 -0000 1.322
+++ www/mozilla-firefox/Makefile 22 Jul 2017 12:07:22 -0000
@@ -33,8 +33,8 @@ MODCLANG_ARCHS = amd64 i386
MOZILLA_USE_BUNDLED_LIBEVENT = Yes
# firefox >= 46 defaults to gtk+3
MOZILLA_USE_GTK3 = Yes
-# firefox >= 53 needs rust and cargo
-BUILD_DEPENDS += lang/rust devel/cargo
+# firefox >= 53 needs rust
+BUILD_DEPENDS += lang/rust
WANTLIB += X11-xcb pixman-1 pthread-stubs xcb xcb-shm ${COMPILER_LIBCXX}
