diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-07 01:59:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 01:59:24 +0200 |
| commit | b22df08bb0e05d4a26f205cccf46b191df7797e5 (patch) | |
| tree | 1f67511ddfe1deaf160767a9845f47d17b63c573 | |
| parent | 687e40a959417c9713f04cc88a7ab73672778165 (diff) | |
| parent | 6a7ff98a99b9bfc4f3c47da55c3f5d4e8a59f2a3 (diff) | |
| download | rust-b22df08bb0e05d4a26f205cccf46b191df7797e5.tar.gz rust-b22df08bb0e05d4a26f205cccf46b191df7797e5.zip | |
Rollup merge of #95735 - bjorn3:revert_inline_location_caller, r=compiler-errors
Revert "Mark Location::caller() as #[inline]" This reverts https://github.com/rust-lang/rust/pull/95619. As noted in https://github.com/rust-lang/rust/pull/95619#issuecomment-1088548140 this seems to break several tests with cg_clif.
| -rw-r--r-- | library/core/src/panic/location.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/library/core/src/panic/location.rs b/library/core/src/panic/location.rs index a018ad9eab3..714e9b73c78 100644 --- a/library/core/src/panic/location.rs +++ b/library/core/src/panic/location.rs @@ -83,7 +83,6 @@ impl<'a> Location<'a> { #[stable(feature = "track_caller", since = "1.46.0")] #[rustc_const_unstable(feature = "const_caller_location", issue = "76156")] #[track_caller] - #[inline] pub const fn caller() -> &'static Location<'static> { crate::intrinsics::caller_location() } |