Merge remote-tracking branch 'upstream/master' into updated-toolchain

4 jobs for updated-toolchain in 38 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Build
failed #31046
build:linux

00:00:38

failed #31047
build:redox

00:00:36

 
  Test
skipped #31048
test:linux
skipped #31049
test:redox
 
Name Stage Failure
failed
build:linux Build
For more information about an error, try `rustc --explain E0277`.
error: could not compile `redoxfs`.

Caused by:
process didn't exit successfully: `rustc --crate-name redoxfs src/bin/mount.rs --error-format=json --json=diagnostic-rendered-ansi --crate-type bin --emit=dep-info,link -Cembed-bitcode=no -C debuginfo=2 -C metadata=c2ff3aae47e12202 -C extra-filename=-c2ff3aae47e12202 --out-dir /builds/4lDO2/redoxfs/target/debug/deps -C incremental=/builds/4lDO2/redoxfs/target/debug/incremental -L dependency=/builds/4lDO2/redoxfs/target/debug/deps --extern fuse=/builds/4lDO2/redoxfs/target/debug/deps/libfuse-a893582fda415d6d.rlib --extern libc=/builds/4lDO2/redoxfs/target/debug/deps/liblibc-4263668f4beab7d2.rlib --extern syscall=/builds/4lDO2/redoxfs/target/debug/deps/libsyscall-fd28133f608e269d.rlib --extern redoxfs=/builds/4lDO2/redoxfs/target/debug/deps/libredoxfs-c6d589293c2d26a3.rlib --extern time=/builds/4lDO2/redoxfs/target/debug/deps/libtime-de2a39b20cdfb5e9.rlib --extern uuid=/builds/4lDO2/redoxfs/target/debug/deps/libuuid-7c5229f7ea793061.rlib -L native=/usr/lib/x86_64-linux-gnu` (exit code: 1)
warning: build failed, waiting for other jobs to finish...
error: build failed
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
build:redox Build
error: could not compile `redoxfs`.

Caused by:
process didn't exit successfully: `rustc --crate-name redoxfs src/lib.rs --error-format=json --json=diagnostic-rendered-ansi --crate-type lib --emit=dep-info,metadata,link -Cembed-bitcode=no -C debuginfo=2 -C metadata=37d5f3f2ae96a8de -C extra-filename=-37d5f3f2ae96a8de --out-dir /builds/4lDO2/redoxfs/target/x86_64-unknown-redox/debug/deps --target x86_64-unknown-redox -C linker=x86_64-unknown-redox-gcc -C incremental=/builds/4lDO2/redoxfs/target/x86_64-unknown-redox/debug/incremental -L dependency=/builds/4lDO2/redoxfs/target/x86_64-unknown-redox/debug/deps -L dependency=/builds/4lDO2/redoxfs/target/debug/deps --extern syscall=/builds/4lDO2/redoxfs/target/x86_64-unknown-redox/debug/deps/libsyscall-3e69fdb6b7d0ef2e.rmeta --extern uuid=/builds/4lDO2/redoxfs/target/x86_64-unknown-redox/debug/deps/libuuid-6010c8db7e64d3b5.rmeta -L /root/.redoxer/toolchain/x86_64-unknown-redox/lib` (exit code: 1)
warning: build failed, waiting for other jobs to finish...
error: build failed
redoxer cargo: exit code: 101
Cleaning up file based variables
ERROR: Job failed: exit code 1