Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libstd uses core::panic::Location where possible. #67137

Merged
merged 5 commits into from
Jan 4, 2020
Merged

libstd uses core::panic::Location where possible. #67137

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaccda0
core and std macros and panic internals use panic::Location::caller.
anp Dec 7, 2019
e218da4
Test cleanups to match #[track_caller] in panic!.
anp Dec 8, 2019
612c4c6
Update ABI in const impls of panic_fn/begin_panic_fn.
anp Dec 24, 2019
b76a5be
Clean up comments in panicking infra.
anp Jan 4, 2020
27b25eb
Restrict visibility of location_triple_for_span.
anp Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Restrict visibility of location_triple_for_span.
  • Loading branch information
@anp
anp committed Jan 4, 2020
commit 27b25eb822d32911b73991c7fd6921fea609f825
2 changes: 1 addition & 1 deletion src/librustc_mir/interpret/intrinsics/caller_location.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
self.alloc_caller_location(file, line, column)
}

pub fn location_triple_for_span(&self, span: Span) -> (Symbol, u32, u32) {
pub(super) fn location_triple_for_span(&self, span: Span) -> (Symbol, u32, u32) {
let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span);
let caller = self.tcx.sess.source_map().lookup_char_pos(topmost.lo());
(
Expand Down