diff options
| -rwxr-xr-x | src/ci/docker/run.sh | 6 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/mem.rs | 8 | ||||
| -rw-r--r-- | src/libstd/Cargo.toml | 7 | ||||
| m--------- | src/stdsimd | 0 | ||||
| -rwxr-xr-x | src/tools/publish_toolstate.py | 6 |
6 files changed, 13 insertions, 15 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index ad6188568cf..25d4d73c7fe 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -20,9 +20,9 @@ travis_time_start if [ -f "$docker_dir/$image/Dockerfile" ]; then if [ "$CI" != "" ]; then hash_key=/tmp/.docker-hash-key.txt - find $docker_dir/$image $docker_dir/scripts -type f | \ - sort | \ - xargs cat >> $hash_key + rm -f "${hash_key}" + echo $image >> $hash_key + find $docker_dir -type f | sort | xargs cat >> $hash_key docker --version >> $hash_key cksum=$(sha512sum $hash_key | \ awk '{print $1}') diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index d046236b535..f2165c676fd 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -124,6 +124,7 @@ #![feature(adx_target_feature)] #![feature(maybe_uninit, maybe_uninit_slice, maybe_uninit_array)] #![feature(unrestricted_attribute_tokens)] +#![feature(external_doc)] #[prelude_import] #[allow(unused)] diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index e0b0e72ff9b..43afc9a522a 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -1185,14 +1185,6 @@ impl<T> MaybeUninit<T> { ManuallyDrop::into_inner(self.value) } - /// Deprecated alternative to `into_initialized`. Will never get stabilized. - /// Exists only to transition stdsimd to `into_initialized`. - #[inline(always)] - #[allow(unused)] - pub(crate) unsafe fn into_inner(self) -> T { - self.into_initialized() - } - /// Gets a reference to the contained value. /// /// # Unsafety diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 92876f7f2d8..7d60a170422 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -47,7 +47,7 @@ fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] } cc = "1.0" [features] -default = ["compiler_builtins_c"] +default = ["compiler_builtins_c", "std_detect_file_io", "std_detect_dlsym_getauxval"] backtrace = ["backtrace-sys"] panic-unwind = ["panic_unwind"] @@ -66,3 +66,8 @@ wasm_syscall = [] # the environment for hooking up some thread-related information like the # current thread id and accessing/getting the current thread's TCB wasm-bindgen-threads = [] + +# Enable std_detect default features for stdsimd: +# https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/Cargo.toml +std_detect_file_io = [] +std_detect_dlsym_getauxval = [] diff --git a/src/stdsimd b/src/stdsimd -Subproject b23541340b5941749e5fbb1930e666bbd137524 +Subproject 9a60697044088f6704a40da78dee25eb6d55fd6 diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py index ef17d6fbd5d..abcf14d90be 100755 --- a/src/tools/publish_toolstate.py +++ b/src/tools/publish_toolstate.py @@ -171,7 +171,7 @@ if __name__ == '__main__': # assume that PR authors are also owners of the repo where the branch lives relevant_pr_match = re.search( - 'Auto merge of #([0-9]+) - ([^:]+):[^,]+ r=([^\s]+)', + r'Auto merge of #([0-9]+) - ([^:]+):[^,]+, r=(\S+)', cur_commit_msg, ) if relevant_pr_match: @@ -182,10 +182,10 @@ if __name__ == '__main__': pr_reviewer = relevant_pr_match.group(3) else: number = '-1' - relevant_pr_user = '<unknown user>' + relevant_pr_user = 'ghost' relevant_pr_number = '<unknown PR>' relevant_pr_url = '<unknown>' - pr_reviewer = '<unknown reviewer>' + pr_reviewer = 'ghost' message = update_latest( cur_commit, |