Merge branch '3.5' into 3.6

3 files changed, 246 insertions, 48 deletions

diff --git a/rust/.footprint b/rust/.footprint
index a69ad3dd7..e73af5ea8 100644
--- a/rust/.footprint
+++ b/rust/.footprint
@@ -6,9 +6,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cargo
 -rwxr-xr-x	root/root	usr/bin/cargo-clippy
 -rwxr-xr-x	root/root	usr/bin/cargo-fmt
--rwxr-xr-x	root/root	usr/bin/cargo-miri
 -rwxr-xr-x	root/root	usr/bin/clippy-driver
--rwxr-xr-x	root/root	usr/bin/miri
 -rwxr-xr-x	root/root	usr/bin/rls
 -rwxr-xr-x	root/root	usr/bin/rust-gdb
 -rwxr-xr-x	root/root	usr/bin/rust-gdbgui
@@ -17,19 +15,9 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/rustdoc
 -rwxr-xr-x	root/root	usr/bin/rustfmt
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/rustlib/
-drwxr-xr-x	root/root	usr/lib/rustlib/etc/
--rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_lookup.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/gdb_providers.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_commands
--rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_lookup.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/lldb_providers.py
--rw-r--r--	root/root	usr/lib/rustlib/etc/rust_types.py
 -rw-r--r--	root/root	usr/lib/rustlib/install.log
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-cargo
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-clippy-preview
--rw-r--r--	root/root	usr/lib/rustlib/manifest-miri-preview
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rls-preview
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu
 -rw-r--r--	root/root	usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu
@@ -44,6 +32,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/Cargo.toml
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/benches/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/benches/binary_heap.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/benches/btree/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/benches/btree/map.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/benches/btree/mod.rs
@@ -65,6 +54,9 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/alloc/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/binary_heap.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/borrow/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/alloc/src/collections/btree/map/tests.rs
@@ -318,6 +310,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/num/dec2flt/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/dec2flt/rawfp.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/dec2flt/table.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/diy_float.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/error.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/f32.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/f64.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/num/flt2dec/
@@ -327,24 +320,29 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/num/flt2dec/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/num/flt2dec/strategy/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/flt2dec/strategy/dragon.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/flt2dec/strategy/grisu.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/i128.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/i16.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/i32.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/i64.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/i8.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/int_macros.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/isize.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/mod.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/u128.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/u16.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/u32.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/u64.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/u8.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/usize.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/nonzero.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/i128.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/i16.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/i32.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/i64.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/i8.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/int_macros.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/isize.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/u128.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/u16.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/u32.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/u64.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/u8.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/shells/usize.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/uint_macros.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/num/wrapping.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/arith.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/bit.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/control_flow.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/deref.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/drop.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/ops/function.rs
@@ -371,14 +369,26 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/ptr/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/raw.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/result.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/ascii.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/cmp.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/index.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/iter.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/iter/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/iter/macros.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/memchr.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/mod.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/raw.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/rotate.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/slice/sort.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/str/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/converts.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/error.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/iter.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/lossy.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/pattern.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/traits.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/str/validations.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/src/sync/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/sync/atomic.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/src/sync/mod.rs
@@ -445,9 +455,11 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/u64.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/u8.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/uint_macros.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/num/wrapping.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/ops.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/option.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/pattern.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/pin.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/ptr.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/result.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/core/tests/slice.rs
@@ -522,46 +534,95 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/alloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ascii.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/backtrace.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/backtrace/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/backtrace/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/map.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/map/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/map/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/set.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/set/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/hash/set/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/collections/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/env.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/env/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/env/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/error.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/error/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/error/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/f32.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/f32/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/f32/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/f64.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/f64/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/f64/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/c_str.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/c_str/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/c_str/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/os_str.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/os_str/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/ffi/os_str/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/fs.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/fs/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/fs/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/future.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/buffered.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/buffered/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/buffered/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/cursor.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/cursor/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/cursor/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/error.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/error/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/error/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/impls.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/lazy.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/impls/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/impls/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/prelude.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/stdio.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/stdio/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/stdio/tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/util.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/io/util/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/io/util/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/keyword_docs.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/lazy.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/lazy/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/lazy/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/lib.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/macros.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/memchr.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/memchr/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/memchr/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/addr.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/addr/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/addr/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/ip.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/ip/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/ip/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/parser.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/parser/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/parser/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/tcp.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/tcp/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/tcp/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/test.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/udp.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/net/udp/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/net/udp/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/num.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/num/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/num/benches.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/num/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/os/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/os/android/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/android/fs.rs
@@ -624,6 +685,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/schar.md
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/short.md
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/uchar.md
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/uint.md
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/raw/ulong.md
@@ -643,31 +705,53 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/os/vxworks/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/vxworks/raw.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/os/wasi.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/panic.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/panic/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/panic/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/panicking.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/path.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/path/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/path/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/prelude/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/prelude/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/prelude/v1.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/primitive_docs.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/process.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/process/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/process/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/rt.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/barrier.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/barrier/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/barrier/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/condvar.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/condvar/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/condvar/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mod.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/blocking.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/cache_aligned.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/oneshot.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/shared.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/stream.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/sync.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/sync_tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mutex.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mutex/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/mutex/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/once.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/once/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/once/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/rwlock.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/rwlock/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sync/rwlock/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/cloudabi/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/cloudabi/abi/
@@ -731,6 +815,10 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/reloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/thread.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/tls/sync_bitset/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/usercalls/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/usercalls/alloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/usercalls/mod.rs
@@ -746,23 +834,29 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/io.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/fd.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/fs.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/io.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/memchr.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/os.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/path.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/pipe.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/process.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/stack_overflow.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/stdio.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread_local_key.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/time.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/spin_mutex/tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/unsafe_list.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/unsafe_list/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/sgx/waitqueue/unsafe_list/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/alloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/android.rs
@@ -776,11 +870,19 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/io.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/net/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/process.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/raw.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/thread.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/ucred/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/fd/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/fs.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/futex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/io.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/l4re.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/memchr.rs
@@ -788,11 +890,15 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/os.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/os/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/os/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/path.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/pipe.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_common.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_common/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_common/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_fuchsia.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/zircon.rs
@@ -818,7 +924,6 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/os.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/path.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/pipe.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/process.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/rwlock.rs
@@ -848,6 +953,8 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/net/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/os.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/path.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/pipe.rs
@@ -864,7 +971,6 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/proces
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/thread_local_key.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/time.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/alloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/args.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/env.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/
@@ -878,9 +984,6 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/os.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/path.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/pipe.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/process.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/stdio.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/thread.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasi/time.rs
@@ -896,6 +999,8 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/wasm/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/args.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/args/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/args/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/c.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/cmath.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/compat.rs
@@ -917,12 +1022,16 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/ext/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/net.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/os.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/os/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/os/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/os_str.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/path.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/path/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/path/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/pipe.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/process.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/process/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/process/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/rand.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/rwlock.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys/windows/stack_overflow.rs
@@ -938,27 +1047,48 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/at_exit_imp.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/backtrace.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/fs.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/io.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/mutex.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/net.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/net/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/net/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/os_str_bytes.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/poison.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/process.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/rwlock.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_info.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_dtor.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_local_key/tests.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/futex.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/generic.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/util.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/local.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/local/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/local/dynamic_tests.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/local/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/mod.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/thread/tests.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/time.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/src/time/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/src/time/tests.rs
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/std/tests/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/tests/env.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/std/tests/run-time-detect.rs
@@ -1034,6 +1164,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/LICENSE-APACHE
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/LICENSE-MIT
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/README.md
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512f.md
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/build.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/rustfmt.toml
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/
@@ -1044,6 +1175,7 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/neon/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/neon/generated.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/prefetch.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/test_support.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/tme.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/aarch64/v8.rs
@@ -1119,7 +1251,6 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/fma.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/fxsr.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/macros.rs
--rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/mmx.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/mod.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/pclmulqdq.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/rdrand.rs
@@ -1292,6 +1423,73 @@ drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/unwind/
 drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/library/unwind/src/
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/unwind/src/lib.rs
 -rw-r--r--	root/root	usr/lib/rustlib/src/rust/library/unwind/src/libunwind.rs
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/.clang-format
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/LICENSE.TXT
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/README_RUST_SGX.md
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/cmake/
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/cmake/Modules/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/cmake/Modules/HandleCompilerRT.cmake
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/cmake/Modules/HandleLibunwindFlags.cmake
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/cmake/config-ix.cmake
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/BuildingLibunwind.rst
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/README.txt
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/conf.py
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/docs/index.rst
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/__libunwind_config.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/libunwind.h
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/mach-o/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/mach-o/compact_unwind_encoding.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/include/unwind.h
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/AddressSpace.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/CompactUnwinder.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/DwarfInstructions.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/DwarfParser.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/EHHeaderParser.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/FrameHeaderCache.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/RWMutex.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Registers.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind-EHABI.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind-EHABI.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind-seh.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind-sjlj.c
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindCursor.hpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindLevel1.c
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRegistersRestore.S
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRegistersSave.S
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRustSgx.c
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/UnwindRustSgx.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/Unwind_AppleExtras.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/assembly.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/config.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/dwarf2.h
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/libunwind.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/src/libunwind_ext.h
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/alignment.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/frameheadercache_test.pass.cpp
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/__init__.py (EMPTY)
+drwxr-xr-x	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/test/
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/test/__init__.py (EMPTY)
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind/test/config.py
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind_01.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/libunwind_02.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/lit.cfg.py
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/lit.site.cfg.in
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/remember_state_leak.pass.sh.s
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/signal_frame.pass.cpp
+-rw-r--r--	root/root	usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/unw_getcontext.pass.cpp
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/rust/.signature b/rust/.signature
index b687dd902..9470b7fc8 100644
--- a/rust/.signature
+++ b/rust/.signature
@@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/S9DzDN5hvc/S0Vyf08LWMgizb/a/K7SU6wB/AWE+hmQcFQflkKMFb7sXMZbzwJ/6Kt1de1rldqeYBSOn7MRugg=
-SHA256 (Pkgfile) = 48bc0ddd6f63df60b5c40f27890808ccfa8af7832c7601a169785b4edaf7f4c6
-SHA256 (.footprint) = 5d9e7cc30839212995b3d4d73510e8895712e6a883db274fba8393a324782b70
-SHA256 (rustc-1.47.0-src.tar.xz) = ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2
-SHA256 (rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.xz) = e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c
-SHA256 (rustc-1.46.0-x86_64-unknown-linux-gnu.tar.xz) = 6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12
-SHA256 (cargo-0.47.0-x86_64-unknown-linux-gnu.tar.xz) = 9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d
-SHA256 (compiler-rt-10.0.1.src.tar.xz) = d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa
+RWSE3ohX2g5d/YLB31dX/8Vdy5706uosq/+EvGAlxaY97DawZRTjpT8tqeEMdGYwsHlosovuecNz0VnP5L553zjrJD6ZqPMukw8=
+SHA256 (Pkgfile) = 8257f80347cfc9a6f3d121f271b04c9792fca773600273c674500332b589c071
+SHA256 (.footprint) = 6723dc85447caa15b2681bdc2d0a27307601e18e9b908a33f363bc2fab15396e
+SHA256 (rustc-1.48.0-src.tar.xz) = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908
+SHA256 (rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.xz) = a469db59f7df3a5e4003421d853b274e828b537d2d56fd5ce6bba8ba73266f02
+SHA256 (rustc-1.47.0-x86_64-unknown-linux-gnu.tar.xz) = 6effe67c3461335eabba2334f4747260bd479c938e635899a60ed094beec7481
+SHA256 (cargo-0.48.0-x86_64-unknown-linux-gnu.tar.xz) = 6958f9797b7acacb708423c61f5e8b23c63d9e96fdc7c07fdb0a3feafeaf27e9
+SHA256 (compiler-rt-11.0.0.src.tar.xz) = 374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234
diff --git a/rust/Pkgfile b/rust/Pkgfile
index 7a6aaba6f..e0b659728 100644
--- a/rust/Pkgfile
+++ b/rust/Pkgfile
@@ -5,11 +5,11 @@
 # Optional: sccache
 
 name=rust
-version=1.47.0
-_date=2020-08-27
-_rustc=1.46.0
-_cargo=0.47.0
-_llvm=10.0.1
+version=1.48.0
+_date=2020-10-08
+_rustc=1.47.0
+_cargo=0.48.0
+_llvm=11.0.0
 release=1
 source=(
 	https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz