Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 436487) +++ head/lang/rust/Makefile (revision 436488) @@ -1,229 +1,229 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.15.1 +PORTVERSION?= 1.16.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ https://static.rust-lang.org/dist/:rust_bootstrap \ https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \ LOCAL/marino:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src BOOTSTRAP_FILES=${RUSTC_BOOTSTRAP}:rust_bootstrap \ ${RUST_STD_BOOTSTRAP}:rust_bootstrap \ ${CARGO_BOOTSTRAP}:cargo_bootstrap DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:src \ ${BOOTSTRAP_FILES} .if !defined(SKIP_CARGO_REGISTRY) MASTER_SITES+= LOCAL/riggs/rust:registry \ LOCAL/dumbbell/rust:registry DISTFILES+= ${CARGO_REGISTRY}:registry .endif DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} MAINTAINER?= riggs@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT LICENSE_COMB= dual # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake ONLY_FOR_ARCHS?= amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of # the LDFLAGS. When stage0's rustc is linked, it picks the installed # librust*so and fails. CONFLICTS_BUILD?= rust-nightly CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly -RUST_BOOTSTRAP_DIR?= 2016-12-18 -RUST_BOOTSTRAP_VERSION?= 1.14.0 +RUST_BOOTSTRAP_DIR?= 2017-02-09 +RUST_BOOTSTRAP_VERSION?= 1.15.1 RUSTC_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rustc-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_DIR?= fbeea902d2c9a5be6d99cc35681565d8f7832592 +CARGO_BOOTSTRAP_DIR?= 6e0c18cccc8b0c06fba8a8d76486f81a792fb420 CARGO_BOOTSTRAP_VERSION?= nightly CARGO_BOOTSTRAP= ${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz .if defined(.PARSEDIR) # fixes |make describe| on 9.x (which is BROKEN) RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} .endif # Rust's target arch string is different from *BSD arch strings RUST_ARCH_x86_64= x86_64 # dragonfly RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit python:2,build HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-valgrind \ ${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \ --prefix=${PREFIX} \ --musl-root=${PREFIX} \ --local-rust-root=${PREFIX} \ --mandir=${MANPREFIX}/man \ --release-channel=${RUST_CHANNEL} MAKE_ARGS+= VERBOSE=1 OPTIONS_DEFINE= DOCS GDB LLNEXTGEN PORT_LLVM GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification DOCS_CONFIGURE_ENABLE= docs GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen # Rust may pass more regression tests with bundled LLVM PORT_LLVM_DESC= Build against devel/llvm${LLVM_VER} instead of bundled version PORT_LLVM_BUILD_DEPENDS= ${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER} PORT_LLVM_CONFIGURE_ON= --llvm-root=${LLVM_PREFIX} LLVM_VER?= 39 LLVM_PREFIX= ${LOCALBASE}/llvm${LLVM_VER} # Note that make test does not work when rust is already installed TEST_TARGET= check TEST_ENV+= ALLOW_NONZERO_RLIMIT_CORE=1 # Rust manifests list all files and directories installed by rust-installer. # We use them in: # - pre-install to cleanup the ${STAGEDIR} # - post-install to populate the ${TMPPLIST} RUST_MANIFESTS= lib/rustlib/manifest-rustc \ lib/rustlib/manifest-rust-std-${RUST_TARGET} RUST_DOCS_MANIFESTS= lib/rustlib/manifest-rust-docs DOCS_VARS= rust_manifests+=${RUST_DOCS_MANIFESTS} PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version pre-fetch: # FIXME: This is the same check for CONFLICTS as the standard # one, except port origins are not compared. This allows # the port to conflict with itself, because Rust would pick # installed Rust libraries instead of freshly built ones. @conflicts_with=$$( \ { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ for entry in $${conflicts_with}; do \ ${ECHO_MSG} " $${entry}"; \ done; \ ${ECHO_MSG}; \ ${ECHO_MSG} " They will not build together."; \ ${ECHO_MSG} " Please remove them first with pkg delete."; \ exit 1;\ fi post-extract: @${MKDIR} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} post-patch: @test ! -f ${WRKSRC}/mk/main.mk || \ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mk/main.mk @${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \ ${WRKSRC}/src/etc/rust-gdb # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: @for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFESTS}; do \ if test -f "${STAGEDIR}${PREFIX}/$$f"; then \ ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ < "${STAGEDIR}${PREFIX}/$$f" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ fi; \ done @for f in ${PLIST_FILES}; do \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ done # In post-install, we use the manifests generated during Rust install # to in turn generate the PLIST. We do that, instead of the regular # `pkg-plist`, because several libraries have a computed filename based # on the absolute path of the source files. As it is user-specific, we # can't know their filename in advance. # # We fix manpage entries in the generated manifests because Rust # installs them uncompressed but the Ports framework compresses them. post-install: for f in ${RUST_MANIFESTS}; do \ ${REINPLACE_CMD} -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ ${STAGEDIR}${PREFIX}/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \ ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \ ${AWK} '\ /^file:/ { \ file=$$0; \ sub(/^file:/, "", file); \ print file; \ } \ /^dir:/ { \ dir=$$0; \ sub(/^dir:/, "", dir); \ system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \ }' \ ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \ done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, # but they contain non-object files which make strip(1) unhappy. @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so .include # "make gen-registry" is a special target to ease this port update. # # After changing the version number and the Git revision, you can run # "make gen-registry" to update the distinfo and create a new snapshot of # the registry. The new registry is written to ${DISTDIR} and can be # uploaded. gen-registry: ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY makesum ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY ${TAR} cJvf ${_DISTDIR}/${DIST_SUBDIR}/${CARGO_REGISTRY} -C${WRKDIR} \ --uid 0 --gid 0 \ --exclude 'src/*/benches/' \ --exclude 'src/*/ci/' \ --exclude 'src/*/examples/' \ --exclude 'src/*/tests/' \ --exclude 'index/github.com-*/.git/' \ .cargo ${MAKE} -C${.CURDIR} makesum Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 436487) +++ head/lang/rust/distinfo (revision 436488) @@ -1,17 +1,17 @@ -TIMESTAMP = 1486996201 -SHA256 (rust/rustc-1.15.1-src.tar.gz) = 2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 -SIZE (rust/rustc-1.15.1-src.tar.gz) = 28100203 -SHA256 (rust/2016-12-18/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 837459a52ced646cb3af9af3dbd9929694517ccedd3b47656ecb4db1b3575c25 -SIZE (rust/2016-12-18/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 51458608 -SHA256 (rust/2016-12-18/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 93763e8732477646f8a7e5e4f329da511ca34ca2e8a932811055a0cc8bc606a6 -SIZE (rust/2016-12-18/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 65210098 -SHA256 (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 1982409533dc06e32195325e7dabaf372834665d6ab11a07a0029d04d7e3da4a -SIZE (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4584208 -SHA256 (rust/2016-12-18/rustc-1.14.0-i686-unknown-freebsd.tar.gz) = 73e69c57d10763b406e68b1a529426d236722cc72d4b89594f60f723c58ce4eb -SIZE (rust/2016-12-18/rustc-1.14.0-i686-unknown-freebsd.tar.gz) = 54045887 -SHA256 (rust/2016-12-18/rust-std-1.14.0-i686-unknown-freebsd.tar.gz) = 6da24c6cc5e241ec0d8bdbf9d0574acb4d01e6d4b2753974a05dd4d2e27f2de6 -SIZE (rust/2016-12-18/rust-std-1.14.0-i686-unknown-freebsd.tar.gz) = 67176400 -SHA256 (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = ed027f7fae62001c6bcc3682143d77faac336acde72aa8e539662bb4c5691259 -SIZE (rust/fbeea902d2c9a5be6d99cc35681565d8f7832592/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4500714 -SHA256 (rust/rust-registry-1.15.1.tar.xz) = 79a27c31e121fdf4dcb94720ffc1ec4f0775bdd2876093f3d8915d4ef8374ccd -SIZE (rust/rust-registry-1.15.1.tar.xz) = 2752956 +TIMESTAMP = 1489847181 +SHA256 (rust/rustc-1.16.0-src.tar.gz) = f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 +SIZE (rust/rustc-1.16.0-src.tar.gz) = 28470372 +SHA256 (rust/2017-02-09/rustc-1.15.1-x86_64-unknown-freebsd.tar.gz) = 29803d1ca5cf87a2cd6fca30863ebc92287642e2f8c1d2ca707dd9ec843df210 +SIZE (rust/2017-02-09/rustc-1.15.1-x86_64-unknown-freebsd.tar.gz) = 40550338 +SHA256 (rust/2017-02-09/rust-std-1.15.1-x86_64-unknown-freebsd.tar.gz) = b248153c40700e3837e99a8ff3b02c80b29119587badd7312b2394e2e3117a07 +SIZE (rust/2017-02-09/rust-std-1.15.1-x86_64-unknown-freebsd.tar.gz) = 54025347 +SHA256 (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = b6212dc5342a471cba2ee2442d10c00065ed02e630355f2210eabd11933cbd00 +SIZE (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4982238 +SHA256 (rust/2017-02-09/rustc-1.15.1-i686-unknown-freebsd.tar.gz) = 87475427fcb216c516e47322119271b6044ca6f0d137926af9f040062ec6185f +SIZE (rust/2017-02-09/rustc-1.15.1-i686-unknown-freebsd.tar.gz) = 42144420 +SHA256 (rust/2017-02-09/rust-std-1.15.1-i686-unknown-freebsd.tar.gz) = b1512971948dc66b09597748848ee9704cec9cc3632b03d90e5bf841ebbb7608 +SIZE (rust/2017-02-09/rust-std-1.15.1-i686-unknown-freebsd.tar.gz) = 55111077 +SHA256 (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-i686-unknown-freebsd.tar.gz) = 1c638142658cefda26a35fcec92674e57ee6b45ea4e21b8ec46c3bde93a96cfa +SIZE (rust/6e0c18cccc8b0c06fba8a8d76486f81a792fb420/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4796346 +SHA256 (rust/rust-registry-1.16.0.tar.xz) = 79a27c31e121fdf4dcb94720ffc1ec4f0775bdd2876093f3d8915d4ef8374ccd +SIZE (rust/rust-registry-1.16.0.tar.xz) = 2752956 Index: head/lang/rust/files/patch-src_bootstrap_compile.rs =================================================================== --- head/lang/rust/files/patch-src_bootstrap_compile.rs (revision 436487) +++ head/lang/rust/files/patch-src_bootstrap_compile.rs (nonexistent) @@ -1,11 +0,0 @@ ---- src/bootstrap/compile.rs.orig 2017-02-09 01:37:48 UTC -+++ src/bootstrap/compile.rs -@@ -187,7 +187,7 @@ pub fn rustc<'a>(build: &'a Build, targe - cargo.env("CFG_RELEASE", &build.release) - .env("CFG_RELEASE_CHANNEL", &build.config.channel) - .env("CFG_VERSION", &build.version) -- .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(String::new())) -+ .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or(PathBuf::new())) - .env("CFG_LIBDIR_RELATIVE", "lib"); - - // If we're not building a compiler with debugging information then remove Property changes on: head/lang/rust/files/patch-src_bootstrap_compile.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_bootstrap_config.rs =================================================================== --- head/lang/rust/files/patch-src_bootstrap_config.rs (revision 436487) +++ head/lang/rust/files/patch-src_bootstrap_config.rs (nonexistent) @@ -1,38 +0,0 @@ ---- src/bootstrap/config.rs.orig 2017-02-09 01:37:48 UTC -+++ src/bootstrap/config.rs -@@ -85,10 +85,10 @@ pub struct Config { - pub quiet_tests: bool, - // Fallback musl-root for all targets - pub musl_root: Option, -- pub prefix: Option, -- pub docdir: Option, -- pub libdir: Option, -- pub mandir: Option, -+ pub prefix: Option, -+ pub docdir: Option, -+ pub libdir: Option, -+ pub mandir: Option, - pub codegen_tests: bool, - pub nodejs: Option, - pub gdb: Option, -@@ -443,16 +443,16 @@ impl Config { - self.channel = value.to_string(); - } - "CFG_PREFIX" => { -- self.prefix = Some(value.to_string()); -+ self.prefix = Some(PathBuf::from(value)); - } - "CFG_DOCDIR" => { -- self.docdir = Some(value.to_string()); -+ self.docdir = Some(PathBuf::from(value)); - } - "CFG_LIBDIR" => { -- self.libdir = Some(value.to_string()); -+ self.libdir = Some(PathBuf::from(value)); - } - "CFG_MANDIR" => { -- self.mandir = Some(value.to_string()); -+ self.mandir = Some(PathBuf::from(value)); - } - "CFG_LLVM_ROOT" if value.len() > 0 => { - let target = self.target_config.entry(self.build.clone()) Property changes on: head/lang/rust/files/patch-src_bootstrap_config.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_bootstrap_install.rs =================================================================== --- head/lang/rust/files/patch-src_bootstrap_install.rs (revision 436487) +++ head/lang/rust/files/patch-src_bootstrap_install.rs (nonexistent) @@ -1,79 +0,0 @@ ---- src/bootstrap/install.rs.orig 2017-02-09 01:37:48 UTC -+++ src/bootstrap/install.rs -@@ -13,9 +13,9 @@ - //! This module is responsible for installing the standard library, - //! compiler, and documentation. - -+use std::env; - use std::fs; --use std::borrow::Cow; --use std::path::Path; -+use std::path::{Path, PathBuf, Component}; - use std::process::Command; - - use Build; -@@ -23,23 +23,35 @@ use dist::{package_vers, sanitize_sh, tm - - /// Installs everything. - pub fn install(build: &Build, stage: u32, host: &str) { -- let prefix = build.config.prefix.as_ref().clone().map(|x| Path::new(x)) -- .unwrap_or(Path::new("/usr/local")); -- let docdir = build.config.docdir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x))) -- .unwrap_or(Cow::Owned(prefix.join("share/doc/rust"))); -- let libdir = build.config.libdir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x))) -- .unwrap_or(Cow::Owned(prefix.join("lib"))); -- let mandir = build.config.mandir.as_ref().clone().map(|x| Cow::Borrowed(Path::new(x))) -- .unwrap_or(Cow::Owned(prefix.join("share/man"))); -+ let prefix_default = PathBuf::from("/usr/local"); -+ let docdir_default = PathBuf::from("share/doc/rust"); -+ let mandir_default = PathBuf::from("share/man"); -+ let libdir_default = PathBuf::from("lib"); -+ let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default); -+ let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default); -+ let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default); -+ let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default); -+ -+ let docdir = prefix.join(docdir); -+ let libdir = prefix.join(libdir); -+ let mandir = prefix.join(mandir); -+ -+ let destdir = env::var_os("DESTDIR").map(PathBuf::from); -+ -+ let prefix = add_destdir(&prefix, &destdir); -+ let docdir = add_destdir(&docdir, &destdir); -+ let libdir = add_destdir(&libdir, &destdir); -+ let mandir = add_destdir(&mandir, &destdir); -+ - let empty_dir = build.out.join("tmp/empty_dir"); - t!(fs::create_dir_all(&empty_dir)); - if build.config.docs { -- install_sh(&build, "docs", "rust-docs", stage, host, prefix, -+ install_sh(&build, "docs", "rust-docs", stage, host, &prefix, - &docdir, &libdir, &mandir, &empty_dir); - } -- install_sh(&build, "std", "rust-std", stage, host, prefix, -+ install_sh(&build, "std", "rust-std", stage, host, &prefix, - &docdir, &libdir, &mandir, &empty_dir); -- install_sh(&build, "rustc", "rustc", stage, host, prefix, -+ install_sh(&build, "rustc", "rustc", stage, host, &prefix, - &docdir, &libdir, &mandir, &empty_dir); - t!(fs::remove_dir_all(&empty_dir)); - } -@@ -59,3 +71,17 @@ fn install_sh(build: &Build, package: &s - .arg("--disable-ldconfig"); - build.run(&mut cmd); - } -+ -+fn add_destdir(path: &Path, destdir: &Option) -> PathBuf { -+ let mut ret = match *destdir { -+ Some(ref dest) => dest.clone(), -+ None => return path.to_path_buf(), -+ }; -+ for part in path.components() { -+ match part { -+ Component::Normal(s) => ret.push(s), -+ _ => {} -+ } -+ } -+ return ret -+} Property changes on: head/lang/rust/files/patch-src_bootstrap_install.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property