Skip to content

Commit 83d396c

Browse files
committed
Auto merge of rust-lang#138127 - compiler-errors:rollup-kcarqrz, r=compiler-errors
Rollup of 17 pull requests Successful merges: - rust-lang#137827 (Add timestamp to unstable feature usage metrics) - rust-lang#138041 (bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported) - rust-lang#138046 (trim channel value in `get_closest_merge_commit`) - rust-lang#138053 (Increase the max. custom try jobs requested to `20`) - rust-lang#138061 (triagebot: add a `compiler_leads` ad-hoc group) - rust-lang#138064 (Remove - from xtensa targets cpu names) - rust-lang#138075 (Use final path segment for diagnostic) - rust-lang#138078 (Reduce the noise of bootstrap changelog warnings in --dry-run mode) - rust-lang#138081 (Move `yield` expressions behind their own feature gate) - rust-lang#138090 (`librustdoc`: flatten nested ifs) - rust-lang#138092 (Re-add `DynSend` and `DynSync` impls for `TyCtxt`) - rust-lang#138094 (a small borrowck cleanup) - rust-lang#138098 (Stabilize feature `const_copy_from_slice`) - rust-lang#138103 (Git ignore citool's target directory) - rust-lang#138105 (Fix broken link to Miri intrinsics in documentation) - rust-lang#138108 (Mention me (WaffleLapkin) when changes to `rustc_codegen_ssa` occur) - rust-lang#138117 ([llvm/PassWrapper] use `size_t` when building arg strings) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ace5e0f + 168b9ce commit 83d396c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

core/src/intrinsics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//!
1111
//! In order to make an intrinsic usable at compile-time, it needs to be declared in the "new"
1212
//! style, i.e. as a `#[rustc_intrinsic]` function, not inside an `extern` block. Then copy the
13-
//! implementation from <https://github.com/rust-lang/miri/blob/master/src/shims/intrinsics> to
13+
//! implementation from <https://github.com/rust-lang/miri/blob/master/src/intrinsics> to
1414
//! <https://github.com/rust-lang/rust/blob/master/compiler/rustc_const_eval/src/interpret/intrinsics.rs>
1515
//! and make the intrinsic declaration a `const fn`.
1616
//!

core/src/slice/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3732,8 +3732,7 @@ impl<T> [T] {
37323732
#[doc(alias = "memcpy")]
37333733
#[inline]
37343734
#[stable(feature = "copy_from_slice", since = "1.9.0")]
3735-
#[rustc_const_unstable(feature = "const_copy_from_slice", issue = "131415")]
3736-
#[rustc_const_stable_indirect]
3735+
#[rustc_const_stable(feature = "const_copy_from_slice", since = "CURRENT_RUSTC_VERSION")]
37373736
#[track_caller]
37383737
pub const fn copy_from_slice(&mut self, src: &[T])
37393738
where

0 commit comments

Comments
 (0)