Skip to content

cleanup: always enable #[track_caller] #2101

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

Merged
merged 1 commit into from
Jan 16, 2022
Merged

cleanup: always enable #[track_caller] #2101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ fn configure_pyo3() -> Result<()> {

let rustc_minor_version = rustc_minor_version().unwrap_or(0);

// Enable use of #[track_caller] on Rust 1.46 and greater
if rustc_minor_version >= 46 {
println!("cargo:rustc-cfg=track_caller");
}

// Enable use of const generics on Rust 1.51 and greater
if rustc_minor_version >= 51 {
println!("cargo:rustc-cfg=min_const_generics");
Expand Down
22 changes: 11 additions & 11 deletions src/internal_tricks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ macro_rules! index_impls {
// Always PyAny output (even if the slice operation returns something else)
type Output = PyAny;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(&self, index: usize) -> &Self::Output {
self.get_item(index).unwrap_or_else(|_| {
crate::internal_tricks::index_len_fail(index, $ty_name, $len(self))
Expand All @@ -76,7 +76,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::Range<usize>> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(
&self,
std::ops::Range { start, end }: std::ops::Range<usize>,
Expand All @@ -97,7 +97,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::RangeFrom<usize>> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(
&self,
std::ops::RangeFrom { start }: std::ops::RangeFrom<usize>,
Expand All @@ -114,7 +114,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::RangeFull> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(&self, _: std::ops::RangeFull) -> &Self::Output {
let len = $len(self);
$get_slice(self, 0, len)
Expand All @@ -124,7 +124,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::RangeInclusive<usize>> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(&self, range: std::ops::RangeInclusive<usize>) -> &Self::Output {
let exclusive_end = range
.end()
Expand All @@ -137,7 +137,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::RangeTo<usize>> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(&self, std::ops::RangeTo { end }: std::ops::RangeTo<usize>) -> &Self::Output {
&self[0..end]
}
Expand All @@ -146,7 +146,7 @@ macro_rules! index_impls {
impl std::ops::Index<std::ops::RangeToInclusive<usize>> for $ty {
type Output = $ty;

#[cfg_attr(track_caller, track_caller)]
#[track_caller]
fn index(
&self,
std::ops::RangeToInclusive { end }: std::ops::RangeToInclusive<usize>,
Expand All @@ -161,7 +161,7 @@ macro_rules! index_impls {

#[inline(never)]
#[cold]
#[cfg_attr(track_caller, track_caller)]
#[track_caller]
pub(crate) fn index_len_fail(index: usize, ty_name: &str, len: usize) -> ! {
panic!(
"index {} out of range for {} of length {}",
Expand All @@ -171,7 +171,7 @@ pub(crate) fn index_len_fail(index: usize, ty_name: &str, len: usize) -> ! {

#[inline(never)]
#[cold]
#[cfg_attr(track_caller, track_caller)]
#[track_caller]
pub(crate) fn slice_start_index_len_fail(index: usize, ty_name: &str, len: usize) -> ! {
panic!(
"range start index {} out of range for {} of length {}",
Expand All @@ -181,7 +181,7 @@ pub(crate) fn slice_start_index_len_fail(index: usize, ty_name: &str, len: usize

#[inline(never)]
#[cold]
#[cfg_attr(track_caller, track_caller)]
#[track_caller]
pub(crate) fn slice_end_index_len_fail(index: usize, ty_name: &str, len: usize) -> ! {
panic!(
"range end index {} out of range for {} of length {}",
Expand All @@ -191,7 +191,7 @@ pub(crate) fn slice_end_index_len_fail(index: usize, ty_name: &str, len: usize)

#[inline(never)]
#[cold]
#[cfg_attr(track_caller, track_caller)]
#[track_caller]
pub(crate) fn slice_index_order_fail(index: usize, end: usize) -> ! {
panic!("slice index starts at {} but ends at {}", index, end);
}