Hi,

On Tue, Mar 21, 2017 at 06:22:05PM +0100, Landry Breuil wrote:
> From what i understand, it's more work to keep rustdoc in the bootstrap
> so that we can generate the docs at package build time.

Well, time to cut my losses.

The diff I had been preparing today simply added back rustdoc into the
bootstrap. rustdoc is (uncompressed) an 8KB binary, so I figured it's
not really a burden upon us to have it in the bootstrap.

As Landry says, it's ultimately up to the maintainer and I don't feel
strongly enough to argue further.

FWIW, the diff follows. A new amd64 bootstrap is here:
http://theunixzoo.co.uk/random/rustc-bootstrap-amd64-1.16.0-20170321.tar.gz

The diff also kills some trailing whitespace.

Seeya!

Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile    18 Feb 2017 13:15:48 -0000      1.38
+++ Makefile    21 Mar 2017 16:13:04 -0000
@@ -3,16 +3,15 @@
 # snapshots are only available for amd64 and i386, for now
 ONLY_FOR_ARCHS =       amd64 i386
 
-COMMENT-main =         compiler for Rust Language
-COMMENT-doc =          html documentation for rustc
+COMMENT-main =         compiler for Rust Language
+COMMENT-doc =          html documentation for rustc
 
-V =                    1.15.1
+V =                    1.16.0
 DISTNAME =             rustc-${V}-src
-REVISION =             0
 
 # rustc bootstrap version
-RBV-amd64 =            1.15.0-20170203
-RBV-i386 =             1.15.0-20170204
+RBV-amd64 =            1.16.0-20170321
+RBV-i386 =             1.16.0-20170312
 RBV =                  ${RBV-${MACHINE_ARCH}}
 
 # cargo bootstrap version
@@ -95,9 +94,24 @@ USE_GMAKE =          Yes
 # need for libbacktrace
 USE_LIBTOOL =          gnu
 
-TEST_DEPENDS +=                ${FULLPKGNAME-main}:${BUILD_PKGPATH} \
+TEST_DEPENDS +=                ${FULLPKGNAME}:${BUILD_PKGPATH} \
                        devel/git
 
+TEST_TARGET ?= src/test/run-pass \
+               src/test/compile-fail \
+               src/test/parse-fail \
+               src/test/run-fail \
+               src/test/mir-opt \
+               src/test/incremental \
+               src/test/ui \
+               src/test/compile-fail-fulldeps \
+               src/test/run-make \
+               src/test/rustdoc \
+               src/test/pretty \
+               src/test/run-pass/pretty \
+               src/test/run-fail/pretty \
+               path/to/nowhere
+
 # - check datasize limit before configuring (and building)
 pre-configure:
        @if [ `ulimit -d` -lt 1572864 ]; then \
@@ -116,11 +130,14 @@ do-configure:
                >>${WRKBUILD}/config.toml
        echo 'prefix = "${LOCALBASE}"' >>${WRKBUILD}/config.toml
        echo 'vendor = true' >>${WRKBUILD}/config.toml
-       
+
        echo '[rust]' >>${WRKBUILD}/config.toml
        echo 'channel = "stable"' >>${WRKBUILD}/config.toml
        echo 'codegen-tests = false' >>${WRKBUILD}/config.toml
-       
+
+       echo '[dist]' >>${WRKBUILD}/config.toml
+       echo 'src-tarball = false' >>${WRKBUILD}/config.toml
+
 .if ${PORTS_LLVM:L:Myes}
        echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml
        echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
@@ -130,7 +147,7 @@ do-configure:
        echo 'static-libstdcpp = false' >>${WRKBUILD}/config.toml
        echo 'ninja = true' >>${WRKBUILD}/config.toml
 .endif
-       
+
        rm -rf ${WRKDIR}/modgcc-libs
        mkdir -p ${WRKDIR}/modgcc-libs
        cp ${LOCALBASE}/lib/libestdc++.so.${LIBESTDC_VERSION} \
@@ -142,10 +159,9 @@ BUILD_BIN = cd ${WRKBUILD} && exec ${SET
 do-build:
        ${BUILD_BIN} dist --verbose --jobs=${MAKE_JOBS}
 
-COMPONENTS ?=  rustc rust-std rust-docs
 do-install:
        rm -rf ${WRKBUILD}/_extractdist
-.for _c in ${COMPONENTS}
+.for _c in rustc rust-std rust-docs
        mkdir ${WRKBUILD}/_extractdist
        cd ${WRKBUILD}/_extractdist && tar zxf \
                ${WRKBUILD}/build/dist/${_c}-${V}-${TRIPLE_ARCH}.tar.gz
@@ -169,7 +185,7 @@ post-install:
                ${PREFIX}/lib/rustlib/manifest-*
 
 do-test:
-       ${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS}
+       ${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS} ${TEST_TARGET}
 
 # bootstrap target permits to regenerate the bootstrap archive
 BOOTSTRAPDIR=${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${V}-new
@@ -179,10 +195,9 @@ bootstrap: build
        ${MAKE} clean=fake
        ${MAKE} fake \
                PREFIX="${BOOTSTRAPDIR}" \
-               COMPONENTS="rustc rust-std" \
                FAKE_SETUP=""
        rm -rf ${BOOTSTRAPDIR}/{man,share} \
-               ${BOOTSTRAPDIR}/bin/{rust-gdb,rustdoc}
+               ${BOOTSTRAPDIR}/bin/rust-gdb
        mv ${BOOTSTRAPDIR}/bin/rustc{,.bin}
        strip ${BOOTSTRAPDIR}/bin/rustc.bin \
                ${BOOTSTRAPDIR}/lib/lib*.so \
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo    15 Feb 2017 12:52:35 -0000      1.22
+++ distinfo    21 Mar 2017 12:17:09 -0000
@@ -1,10 +1,10 @@
 SHA256 (rust/../cargo/cargo-bootstrap-amd64-0.16.0-20170213.tar.gz) = 
lmzvwW5K+GVu+HHcB1Y54RrVbWDrqi/XucuMJO0jQws=
 SHA256 (rust/../cargo/cargo-bootstrap-i386-0.16.0-20170213.tar.gz) = 
BM+GckVYHmVQQkL4W02lZjUJtQyh1LbbataTVJ90Kzk=
-SHA256 (rust/rustc-1.15.1-src.tar.gz) = 
Ln2q1BioMLRbl3zX7PGBtl8w9z32P/NuEk6l/l0a8yc=
-SHA256 (rust/rustc-bootstrap-amd64-1.15.0-20170203.tar.gz) = 
NFx/Mp665nROWNh7xSYY9A8NH5sPRDGYItBd/BjlsfE=
-SHA256 (rust/rustc-bootstrap-i386-1.15.0-20170204.tar.gz) = 
lre23VEqIuQwJfNgUvQdJ+RECxbJkn4vqC4IkpzgtgY=
+SHA256 (rust/rustc-1.16.0-src.tar.gz) = 
+WazHrHNm9LfgXw5GjOO61uSU64KGb+KEZYMVg+W6LQ=
+SHA256 (rust/rustc-bootstrap-amd64-1.16.0-20170321.tar.gz) = 
ljCnRAR59U2VbrUwATp8I5mDw5RZ4mggzflNZ2xFPcI=
+SHA256 (rust/rustc-bootstrap-i386-1.16.0-20170312.tar.gz) = 
nA1I2SaKREoO0ymnPIktdCcCw+fFoJScAjb552Z68zQ=
 SIZE (rust/../cargo/cargo-bootstrap-amd64-0.16.0-20170213.tar.gz) = 7512634
 SIZE (rust/../cargo/cargo-bootstrap-i386-0.16.0-20170213.tar.gz) = 7261464
-SIZE (rust/rustc-1.15.1-src.tar.gz) = 28100203
-SIZE (rust/rustc-bootstrap-amd64-1.15.0-20170203.tar.gz) = 46336655
-SIZE (rust/rustc-bootstrap-i386-1.15.0-20170204.tar.gz) = 47619584
+SIZE (rust/rustc-1.16.0-src.tar.gz) = 28470372
+SIZE (rust/rustc-bootstrap-amd64-1.16.0-20170321.tar.gz) = 47078101
+SIZE (rust/rustc-bootstrap-i386-1.16.0-20170312.tar.gz) = 48478769
Index: patches/patch-src_bootstrap_lib_rs
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/patches/patch-src_bootstrap_lib_rs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_bootstrap_lib_rs
--- patches/patch-src_bootstrap_lib_rs  18 Feb 2017 13:15:48 -0000      1.1
+++ patches/patch-src_bootstrap_lib_rs  21 Mar 2017 09:41:06 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-src_bootstrap_lib_rs,v 1.1 2017/02/18 13:15:48 landry Exp $
 Let us compilation choice to be honored.
---- src/bootstrap/lib.rs.orig  Thu Feb 16 12:26:21 2017
-+++ src/bootstrap/lib.rs       Thu Feb 16 12:26:27 2017
-@@ -791,7 +791,6 @@ impl Build {
+--- src/bootstrap/lib.rs.orig  Fri Mar 10 23:55:21 2017
++++ src/bootstrap/lib.rs       Sun Mar 12 07:15:33 2017
+@@ -822,7 +822,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: patches/patch-src_bootstrap_native_rs
===================================================================
RCS file: 
/home/edd/cvsync/ports/lang/rust/patches/patch-src_bootstrap_native_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_bootstrap_native_rs
--- patches/patch-src_bootstrap_native_rs       18 Feb 2017 13:15:48 -0000      
1.2
+++ patches/patch-src_bootstrap_native_rs       21 Mar 2017 09:41:06 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-src_bootstrap_native_rs,v 1.2 2017/02/18 13:15:48 landry Exp $
 use default settings from devel/llvm to local embedded version
---- src/bootstrap/native.rs.orig       Thu Feb  9 02:37:48 2017
-+++ src/bootstrap/native.rs    Thu Feb 16 12:22:02 2017
-@@ -85,16 +85,21 @@ pub fn llvm(build: &Build, target: &str) {
+--- src/bootstrap/native.rs.orig       Fri Mar 10 23:55:21 2017
++++ src/bootstrap/native.rs    Sun Mar 12 09:08:11 2017
+@@ -90,16 +90,21 @@ pub fn llvm(build: &Build, target: &str) {
         .define("LLVM_INCLUDE_EXAMPLES", "OFF")
         .define("LLVM_INCLUDE_TESTS", "OFF")
         .define("LLVM_INCLUDE_DOCS", "OFF")
@@ -22,7 +22,7 @@ use default settings from devel/llvm to 
 +    }
 +
 +    // propagate verbose flag to llvm build
-+    if build.flags.verbose {
++    if build.flags.verbose > 0 {
 +        cfg.define("CMAKE_VERBOSE_MAKEFILE", "ON");
      }
  
Index: patches/patch-src_librustdoc_test_rs
===================================================================
RCS file: patches/patch-src_librustdoc_test_rs
diff -N patches/patch-src_librustdoc_test_rs
--- patches/patch-src_librustdoc_test_rs        15 Feb 2017 12:52:35 -0000      
1.7
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-src_librustdoc_test_rs,v 1.7 2017/02/15 12:52:35 landry Exp $
-fallback to LOCALBASE as default sysroot.
---- src/librustdoc/test.rs.orig        Fri Jan 20 21:38:38 2017
-+++ src/librustdoc/test.rs     Mon Jan 30 20:13:43 2017
-@@ -59,9 +59,16 @@ pub fn run(input: &str,
-     let input_path = PathBuf::from(input);
-     let input = config::Input::File(input_path.clone());
- 
-+    let sysroot = match env::current_exe().ok() {
-+        Some(mut p) => { p.pop(); p.pop(); p }
-+        None => match option_env!("LOCALBASE") {
-+            Some(dir) => PathBuf::from(dir),
-+            None => panic!("can't determine value for sysroot"),
-+        }
-+    };
-+
-     let sessopts = config::Options {
--        maybe_sysroot: Some(env::current_exe().unwrap().parent().unwrap()
--                                              
.parent().unwrap().to_path_buf()),
-+        maybe_sysroot: Some(sysroot),
-         search_paths: libs.clone(),
-         crate_types: vec![config::CrateTypeDylib],
-         externs: externs.clone(),
-@@ -167,9 +174,16 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
-     };
-     let outputs = OutputTypes::new(&[(OutputType::Exe, None)]);
- 
-+    let sysroot = match env::current_exe().ok() {
-+        Some(mut p) => { p.pop(); p.pop(); p }
-+        None => match option_env!("LOCALBASE") {
-+            Some(dir) => PathBuf::from(dir),
-+            None => panic!("can't determine value for sysroot"),
-+        }
-+    };
-+
-     let sessopts = config::Options {
--        maybe_sysroot: Some(env::current_exe().unwrap().parent().unwrap()
--                                              
.parent().unwrap().to_path_buf()),
-+        maybe_sysroot: Some(sysroot),
-         search_paths: libs,
-         crate_types: vec![config::CrateTypeExecutable],
-         output_types: outputs,
Index: patches/patch-src_libstd_sys_unix_ext_net_rs
===================================================================
RCS file: 
/home/edd/cvsync/ports/lang/rust/patches/patch-src_libstd_sys_unix_ext_net_rs,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libstd_sys_unix_ext_net_rs
--- patches/patch-src_libstd_sys_unix_ext_net_rs        26 Dec 2016 13:52:46 
-0000      1.4
+++ patches/patch-src_libstd_sys_unix_ext_net_rs        21 Mar 2017 09:41:07 
-0000
@@ -1,8 +1,35 @@
 $OpenBSD: patch-src_libstd_sys_unix_ext_net_rs,v 1.4 2016/12/26 13:52:46 
landry Exp $
-Disable 2 failing tests. Needs more investigation.
---- src/libstd/sys/unix/ext/net.rs.orig        Sun Dec 18 00:40:11 2016
-+++ src/libstd/sys/unix/ext/net.rs     Wed Dec 21 11:18:23 2016
-@@ -817,6 +817,7 @@ mod test {
+Disable 4 failing tests (related to unix socket). Needs more investigation.
+--- src/libstd/sys/unix/ext/net.rs.orig        Fri Mar 10 23:55:21 2017
++++ src/libstd/sys/unix/ext/net.rs     Thu Mar 16 05:40:27 2017
+@@ -1231,7 +1231,7 @@ impl UnixDatagram {
+     ///
+     /// # Examples
+     ///
+-    /// ```
++    /// ```no_run
+     /// use std::os::unix::net::UnixDatagram;
+     /// use std::time::Duration;
+     ///
+@@ -1248,7 +1248,7 @@ impl UnixDatagram {
+     ///
+     /// # Examples
+     ///
+-    /// ```
++    /// ```no_run
+     /// use std::os::unix::net::UnixDatagram;
+     /// use std::time::Duration;
+     ///
+@@ -1341,7 +1341,7 @@ mod test {
+     use thread;
+     use io;
+     use io::prelude::*;
+-    use time::Duration;
++    //use time::Duration;
+     use sys_common::io::test::tmpdir;
+ 
+     use super::*;
+@@ -1356,6 +1356,7 @@ mod test {
      }
  
      #[test]
@@ -10,7 +37,7 @@ Disable 2 failing tests. Needs more inve
      fn basic() {
          let dir = tmpdir();
          let socket_path = dir.path().join("sock");
-@@ -941,6 +942,7 @@ mod test {
+@@ -1480,6 +1481,7 @@ mod test {
      }
  
      #[test]
Index: pkg/DESCR-doc
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/pkg/DESCR-doc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-doc
--- pkg/DESCR-doc       6 Apr 2015 16:01:05 -0000       1.1.1.1
+++ pkg/DESCR-doc       21 Mar 2017 20:46:10 -0000
@@ -1,4 +1,4 @@
 Rust is a systems programming language that runs blazingly fast, prevents
 almost all crashes, and eliminates data races.
 
-This package include html documentation.
+This package contains the HTML documentation.
Index: pkg/PFRAG.amd64-main
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/pkg/PFRAG.amd64-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.amd64-main
--- pkg/PFRAG.amd64-main        15 Feb 2017 12:52:35 -0000      1.1
+++ pkg/PFRAG.amd64-main        21 Mar 2017 09:41:07 -0000
@@ -7,7 +7,6 @@ lib/libgraphviz-405c42de9dbd8060.so
 lib/liblog-10e131c9710c4616.so
 lib/libproc_macro-d227dda69b7f6844.so
 lib/libproc_macro_plugin-0fe4934fae94e846.so
-lib/libproc_macro_tokens-d715c2b9eaa1f98f.so
 lib/librustc-3e62541ac92a2a57.so
 lib/librustc_back-4dbce09646909121.so
 lib/librustc_borrowck-a7bde671bbfe2e74.so
@@ -58,7 +57,6 @@ lib/rustlib/x86_64-unknown-openbsd/lib/l
 lib/rustlib/x86_64-unknown-openbsd/lib/libpanic_unwind-f99521716a81d87e.rlib
 lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro-d227dda69b7f6844.so
 lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro_plugin-0fe4934fae94e846.so
-lib/rustlib/x86_64-unknown-openbsd/lib/libproc_macro_tokens-d715c2b9eaa1f98f.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librand-fa1e64256580f121.rlib
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc-3e62541ac92a2a57.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_back-4dbce09646909121.so
@@ -69,6 +67,7 @@ lib/rustlib/x86_64-unknown-openbsd/lib/l
 
lib/rustlib/x86_64-unknown-openbsd/lib/librustc_data_structures-4fd0964d090ce553.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_driver-be81d0b7172df003.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_errors-014027489d874466.so
+lib/rustlib/x86_64-unknown-openbsd/lib/librustc_i128-473c466875877959.rlib
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_incremental-f9346bea442d9bfc.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_lint-3ba673556bf687ed.so
 lib/rustlib/x86_64-unknown-openbsd/lib/librustc_llvm-1132aef09c4b778f.so
Index: pkg/PFRAG.i386-main
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/pkg/PFRAG.i386-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.i386-main
--- pkg/PFRAG.i386-main 15 Feb 2017 12:52:35 -0000      1.1
+++ pkg/PFRAG.i386-main 21 Mar 2017 09:41:07 -0000
@@ -7,7 +7,6 @@ lib/libgraphviz-0996c64ed0d164c8.so
 lib/liblog-1bdf50b11ac51d61.so
 lib/libproc_macro-2bcd4cc67250a3c6.so
 lib/libproc_macro_plugin-075014c550476d3f.so
-lib/libproc_macro_tokens-4e171438614a4837.so
 lib/librustc-8a90c4600504e360.so
 lib/librustc_back-9a6db5050b3e4861.so
 lib/librustc_borrowck-71ef7ce0af8740ab.so
@@ -58,7 +57,6 @@ lib/rustlib/i686-unknown-openbsd/lib/lib
 lib/rustlib/i686-unknown-openbsd/lib/libpanic_unwind-454979856f8d9ffa.rlib
 lib/rustlib/i686-unknown-openbsd/lib/libproc_macro-2bcd4cc67250a3c6.so
 lib/rustlib/i686-unknown-openbsd/lib/libproc_macro_plugin-075014c550476d3f.so
-lib/rustlib/i686-unknown-openbsd/lib/libproc_macro_tokens-4e171438614a4837.so
 lib/rustlib/i686-unknown-openbsd/lib/librand-a27596c5b33125cb.rlib
 lib/rustlib/i686-unknown-openbsd/lib/librustc-8a90c4600504e360.so
 lib/rustlib/i686-unknown-openbsd/lib/librustc_back-9a6db5050b3e4861.so
@@ -69,6 +67,7 @@ lib/rustlib/i686-unknown-openbsd/lib/lib
 
lib/rustlib/i686-unknown-openbsd/lib/librustc_data_structures-16a96096216afc13.so
 lib/rustlib/i686-unknown-openbsd/lib/librustc_driver-1de59cf7f254186e.so
 lib/rustlib/i686-unknown-openbsd/lib/librustc_errors-ebfa8756ab220e28.so
+lib/rustlib/i686-unknown-openbsd/lib/librustc_i128-08e78454d9c49eae.rlib
 lib/rustlib/i686-unknown-openbsd/lib/librustc_incremental-2be56285b1e8a530.so
 lib/rustlib/i686-unknown-openbsd/lib/librustc_lint-3fc9d8f3daef359b.so
 lib/rustlib/i686-unknown-openbsd/lib/librustc_llvm-819941fff501e0f0.so
Index: pkg/PLIST-doc
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/pkg/PLIST-doc,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST-doc
--- pkg/PLIST-doc       15 Feb 2017 12:52:35 -0000      1.18
+++ pkg/PLIST-doc       21 Mar 2017 16:00:23 -0000
@@ -1,5 +1,8 @@
-@comment $OpenBSD: PLIST-doc,v 1.18 2017/02/15 12:52:35 landry Exp $
 share/doc/rust/
+share/doc/rust/COPYRIGHT
+share/doc/rust/LICENSE-APACHE
+share/doc/rust/LICENSE-MIT
+share/doc/rust/README.md
 share/doc/rust/html/
 share/doc/rust/html/.lock
 share/doc/rust/html/.stamp
@@ -154,6 +157,7 @@ share/doc/rust/html/collections/
 share/doc/rust/html/collections/Bound.t.html
 share/doc/rust/html/collections/binary_heap/
 share/doc/rust/html/collections/binary_heap/BinaryHeap.t.html
+share/doc/rust/html/collections/binary_heap/BinaryHeapPlace.t.html
 share/doc/rust/html/collections/binary_heap/Drain.t.html
 share/doc/rust/html/collections/binary_heap/IntoIter.t.html
 share/doc/rust/html/collections/binary_heap/Iter.t.html
@@ -161,6 +165,7 @@ share/doc/rust/html/collections/binary_h
 share/doc/rust/html/collections/binary_heap/index.html
 share/doc/rust/html/collections/binary_heap/sidebar-items.js
 share/doc/rust/html/collections/binary_heap/struct.BinaryHeap.html
+share/doc/rust/html/collections/binary_heap/struct.BinaryHeapPlace.html
 share/doc/rust/html/collections/binary_heap/struct.Drain.html
 share/doc/rust/html/collections/binary_heap/struct.IntoIter.html
 share/doc/rust/html/collections/binary_heap/struct.Iter.html
@@ -480,11 +485,13 @@ share/doc/rust/html/collections/vec/
 share/doc/rust/html/collections/vec.m.html
 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/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.Vec.html
 share/doc/rust/html/collections/vec_deque/
 share/doc/rust/html/collections/vec_deque/Drain.t.html
@@ -833,6 +840,13 @@ share/doc/rust/html/core/hash/struct.Sip
 share/doc/rust/html/core/hash/trait.BuildHasher.html
 share/doc/rust/html/core/hash/trait.Hash.html
 share/doc/rust/html/core/hash/trait.Hasher.html
+share/doc/rust/html/core/i128/
+share/doc/rust/html/core/i128/MAX.v.html
+share/doc/rust/html/core/i128/MIN.v.html
+share/doc/rust/html/core/i128/constant.MAX.html
+share/doc/rust/html/core/i128/constant.MIN.html
+share/doc/rust/html/core/i128/index.html
+share/doc/rust/html/core/i128/sidebar-items.js
 share/doc/rust/html/core/i16/
 share/doc/rust/html/core/i16/MAX.v.html
 share/doc/rust/html/core/i16/MIN.v.html
@@ -1400,7 +1414,6 @@ share/doc/rust/html/core/macro.writeln.h
 share/doc/rust/html/core/marker/
 share/doc/rust/html/core/marker/Copy.t.html
 share/doc/rust/html/core/marker/PhantomData.t.html
-share/doc/rust/html/core/marker/Reflect.t.html
 share/doc/rust/html/core/marker/Send.t.html
 share/doc/rust/html/core/marker/Sized.t.html
 share/doc/rust/html/core/marker/Sync.t.html
@@ -1409,7 +1422,6 @@ share/doc/rust/html/core/marker/index.ht
 share/doc/rust/html/core/marker/sidebar-items.js
 share/doc/rust/html/core/marker/struct.PhantomData.html
 share/doc/rust/html/core/marker/trait.Copy.html
-share/doc/rust/html/core/marker/trait.Reflect.html
 share/doc/rust/html/core/marker/trait.Send.html
 share/doc/rust/html/core/marker/trait.Sized.html
 share/doc/rust/html/core/marker/trait.Sync.html
@@ -1793,6 +1805,13 @@ share/doc/rust/html/core/sync/atomic/str
 share/doc/rust/html/core/sync/index.html
 share/doc/rust/html/core/sync/sidebar-items.js
 share/doc/rust/html/core/try.m.html
+share/doc/rust/html/core/u128/
+share/doc/rust/html/core/u128/MAX.v.html
+share/doc/rust/html/core/u128/MIN.v.html
+share/doc/rust/html/core/u128/constant.MAX.html
+share/doc/rust/html/core/u128/constant.MIN.html
+share/doc/rust/html/core/u128/index.html
+share/doc/rust/html/core/u128/sidebar-items.js
 share/doc/rust/html/core/u16/
 share/doc/rust/html/core/u16/MAX.v.html
 share/doc/rust/html/core/u16/MIN.v.html
@@ -2321,6 +2340,7 @@ share/doc/rust/html/src/core/num/flt2dec
 share/doc/rust/html/src/core/num/flt2dec/strategy/
 share/doc/rust/html/src/core/num/flt2dec/strategy/dragon.rs.html
 share/doc/rust/html/src/core/num/flt2dec/strategy/grisu.rs.html
+share/doc/rust/html/src/core/num/i128.rs.html
 share/doc/rust/html/src/core/num/i16.rs.html
 share/doc/rust/html/src/core/num/i32.rs.html
 share/doc/rust/html/src/core/num/i64.rs.html
@@ -2328,6 +2348,7 @@ share/doc/rust/html/src/core/num/i8.rs.h
 share/doc/rust/html/src/core/num/int_macros.rs.html
 share/doc/rust/html/src/core/num/isize.rs.html
 share/doc/rust/html/src/core/num/mod.rs.html
+share/doc/rust/html/src/core/num/u128.rs.html
 share/doc/rust/html/src/core/num/u16.rs.html
 share/doc/rust/html/src/core/num/u32.rs.html
 share/doc/rust/html/src/core/num/u64.rs.html
@@ -2638,6 +2659,7 @@ share/doc/rust/html/std/collections/Link
 share/doc/rust/html/std/collections/VecDeque.t.html
 share/doc/rust/html/std/collections/binary_heap/
 share/doc/rust/html/std/collections/binary_heap/BinaryHeap.t.html
+share/doc/rust/html/std/collections/binary_heap/BinaryHeapPlace.t.html
 share/doc/rust/html/std/collections/binary_heap/Drain.t.html
 share/doc/rust/html/std/collections/binary_heap/IntoIter.t.html
 share/doc/rust/html/std/collections/binary_heap/Iter.t.html
@@ -2645,6 +2667,7 @@ share/doc/rust/html/std/collections/bina
 share/doc/rust/html/std/collections/binary_heap/index.html
 share/doc/rust/html/std/collections/binary_heap/sidebar-items.js
 share/doc/rust/html/std/collections/binary_heap/struct.BinaryHeap.html
+share/doc/rust/html/std/collections/binary_heap/struct.BinaryHeapPlace.html
 share/doc/rust/html/std/collections/binary_heap/struct.Drain.html
 share/doc/rust/html/std/collections/binary_heap/struct.IntoIter.html
 share/doc/rust/html/std/collections/binary_heap/struct.Iter.html
@@ -3210,6 +3233,14 @@ share/doc/rust/html/std/hash/struct.SipH
 share/doc/rust/html/std/hash/trait.BuildHasher.html
 share/doc/rust/html/std/hash/trait.Hash.html
 share/doc/rust/html/std/hash/trait.Hasher.html
+share/doc/rust/html/std/i128/
+share/doc/rust/html/std/i128.t.html
+share/doc/rust/html/std/i128/MAX.v.html
+share/doc/rust/html/std/i128/MIN.v.html
+share/doc/rust/html/std/i128/constant.MAX.html
+share/doc/rust/html/std/i128/constant.MIN.html
+share/doc/rust/html/std/i128/index.html
+share/doc/rust/html/std/i128/sidebar-items.js
 share/doc/rust/html/std/i16/
 share/doc/rust/html/std/i16.t.html
 share/doc/rust/html/std/i16/MAX.v.html
@@ -3885,7 +3916,6 @@ share/doc/rust/html/std/macro.writeln.ht
 share/doc/rust/html/std/marker/
 share/doc/rust/html/std/marker/Copy.t.html
 share/doc/rust/html/std/marker/PhantomData.t.html
-share/doc/rust/html/std/marker/Reflect.t.html
 share/doc/rust/html/std/marker/Send.t.html
 share/doc/rust/html/std/marker/Sized.t.html
 share/doc/rust/html/std/marker/Sync.t.html
@@ -3894,7 +3924,6 @@ share/doc/rust/html/std/marker/index.htm
 share/doc/rust/html/std/marker/sidebar-items.js
 share/doc/rust/html/std/marker/struct.PhantomData.html
 share/doc/rust/html/std/marker/trait.Copy.html
-share/doc/rust/html/std/marker/trait.Reflect.html
 share/doc/rust/html/std/marker/trait.Send.html
 share/doc/rust/html/std/marker/trait.Sized.html
 share/doc/rust/html/std/marker/trait.Sync.html
@@ -4356,6 +4385,8 @@ share/doc/rust/html/std/prim_f32/
 share/doc/rust/html/std/prim_f32/index.html
 share/doc/rust/html/std/prim_f64/
 share/doc/rust/html/std/prim_f64/index.html
+share/doc/rust/html/std/prim_i128/
+share/doc/rust/html/std/prim_i128/index.html
 share/doc/rust/html/std/prim_i16/
 share/doc/rust/html/std/prim_i16/index.html
 share/doc/rust/html/std/prim_i32/
@@ -4374,6 +4405,8 @@ share/doc/rust/html/std/prim_str/
 share/doc/rust/html/std/prim_str/index.html
 share/doc/rust/html/std/prim_tuple/
 share/doc/rust/html/std/prim_tuple/index.html
+share/doc/rust/html/std/prim_u128/
+share/doc/rust/html/std/prim_u128/index.html
 share/doc/rust/html/std/prim_u16/
 share/doc/rust/html/std/prim_u16/index.html
 share/doc/rust/html/std/prim_u32/
@@ -4389,6 +4422,7 @@ share/doc/rust/html/std/primitive.bool.h
 share/doc/rust/html/std/primitive.char.html
 share/doc/rust/html/std/primitive.f32.html
 share/doc/rust/html/std/primitive.f64.html
+share/doc/rust/html/std/primitive.i128.html
 share/doc/rust/html/std/primitive.i16.html
 share/doc/rust/html/std/primitive.i32.html
 share/doc/rust/html/std/primitive.i64.html
@@ -4398,6 +4432,7 @@ share/doc/rust/html/std/primitive.pointe
 share/doc/rust/html/std/primitive.slice.html
 share/doc/rust/html/std/primitive.str.html
 share/doc/rust/html/std/primitive.tuple.html
+share/doc/rust/html/std/primitive.u128.html
 share/doc/rust/html/std/primitive.u16.html
 share/doc/rust/html/std/primitive.u32.html
 share/doc/rust/html/std/primitive.u64.html
@@ -4909,6 +4944,14 @@ share/doc/rust/html/std/time/struct.Syst
 share/doc/rust/html/std/time/struct.SystemTimeError.html
 share/doc/rust/html/std/try.m.html
 share/doc/rust/html/std/tuple.t.html
+share/doc/rust/html/std/u128/
+share/doc/rust/html/std/u128.t.html
+share/doc/rust/html/std/u128/MAX.v.html
+share/doc/rust/html/std/u128/MIN.v.html
+share/doc/rust/html/std/u128/constant.MAX.html
+share/doc/rust/html/std/u128/constant.MIN.html
+share/doc/rust/html/std/u128/index.html
+share/doc/rust/html/std/u128/sidebar-items.js
 share/doc/rust/html/std/u16/
 share/doc/rust/html/std/u16.t.html
 share/doc/rust/html/std/u16/MAX.v.html
@@ -4955,11 +4998,13 @@ share/doc/rust/html/std/vec/
 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/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.Vec.html
 share/doc/rust/html/std/write.m.html
 share/doc/rust/html/std/writeln.m.html
Index: pkg/PLIST-main
===================================================================
RCS file: /home/edd/cvsync/ports/lang/rust/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- pkg/PLIST-main      15 Feb 2017 12:52:35 -0000      1.12
+++ pkg/PLIST-main      21 Mar 2017 15:59:52 -0000
@@ -1,4 +1,7 @@
 @comment $OpenBSD: PLIST-main,v 1.12 2017/02/15 12:52:35 landry Exp $
+@conflict rust-doc-*
+@pkgpath lang/rust,-main
+@pkgpath lang/rust,-doc
 bin/rust-gdb
 @bin bin/rustc
 @bin bin/rustdoc
@@ -12,8 +15,3 @@ lib/rustlib/etc/lldb_rust_formatters.py
 %%i386%%
 @man man/man1/rustc.1
 @man man/man1/rustdoc.1
-share/doc/rust/
-share/doc/rust/COPYRIGHT
-share/doc/rust/LICENSE-APACHE
-share/doc/rust/LICENSE-MIT
-share/doc/rust/README.md

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply via email to