Skip to content

Commit 3fe56a8

Browse files
committed
Auto merge of rust-lang#116923 - fmease:rollup-ev7q387, r=fmease
Rollup of 7 pull requests Successful merges: - rust-lang#116663 (Don't ICE when encountering unresolved regions in `fully_resolve`) - rust-lang#116761 (Fix podman detection in CI scripts) - rust-lang#116795 (Add `#[track_caller]` to `Option::unwrap_or_else`) - rust-lang#116829 (Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd`) - rust-lang#116883 (Change my name in mailmap) - rust-lang#116908 (Tweak wording of type errors involving type params) - rust-lang#116912 (Some renaming nits for `rustc_type_ir`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ec5e4c1 + 21a856b commit 3fe56a8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

core/src/option.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ impl<T> Option<T> {
959959
/// assert_eq!(None.unwrap_or_else(|| 2 * k), 20);
960960
/// ```
961961
#[inline]
962+
#[track_caller]
962963
#[stable(feature = "rust1", since = "1.0.0")]
963964
pub fn unwrap_or_else<F>(self, f: F) -> T
964965
where

0 commit comments

Comments
 (0)