Skip to content

Commit 083489d

Browse files
committed
Auto merge of rust-lang#137164 - matthiaskrgr:rollup-dj5826k, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#137095 (Replace some u64 hashes with Hash64) - rust-lang#137100 (HIR analysis: Remove unnecessary abstraction over list of clauses) - rust-lang#137105 (Restrict DerefPure for Cow<T> impl to T = impl Clone, [impl Clone], str.) - rust-lang#137120 (Enable `relative-path-include-bytes-132203` rustdoc-ui test on Windows) - rust-lang#137125 (Re-add missing empty lines in the releases notes) - rust-lang#137145 (use add-core-stubs / minicore for a few more tests) - rust-lang#137149 (Remove SSE ABI from i586-pc-windows-msvc) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ebcf8a3 + 4888488 commit 083489d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

Diff for: alloc/src/borrow.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,18 @@ where
340340
}
341341
}
342342

343+
// `Cow<'_, T>` can only implement `DerefPure` if `<T::Owned as Borrow<T>>` (and `BorrowMut<T>`) is trusted.
344+
// For now, we restrict `DerefPure for Cow<T>` to `T: Sized` (`T as Borrow<T>` is trusted),
345+
// `str` (`String as Borrow<str>` is trusted) and `[T]` (`Vec<T> as Borrow<[T]>` is trusted).
346+
// In the future, a `BorrowPure<T>` trait analogous to `DerefPure` might generalize this.
343347
#[unstable(feature = "deref_pure_trait", issue = "87121")]
344-
unsafe impl<B: ?Sized + ToOwned> DerefPure for Cow<'_, B> where B::Owned: Borrow<B> {}
348+
unsafe impl<T: Clone> DerefPure for Cow<'_, T> {}
349+
#[cfg(not(no_global_oom_handling))]
350+
#[unstable(feature = "deref_pure_trait", issue = "87121")]
351+
unsafe impl DerefPure for Cow<'_, str> {}
352+
#[cfg(not(no_global_oom_handling))]
353+
#[unstable(feature = "deref_pure_trait", issue = "87121")]
354+
unsafe impl<T: Clone> DerefPure for Cow<'_, [T]> {}
345355

346356
#[stable(feature = "rust1", since = "1.0.0")]
347357
impl<B: ?Sized> Eq for Cow<'_, B> where B: Eq + ToOwned {}

0 commit comments

Comments
 (0)