Merge pull request #340 from dtolnay/up

Delete no_track_caller configuration

Author: dtolnay

build.rs

@@ -12,17 +12,10 @@ fn main() {
 
     if compiler >= 80 {
         println!("cargo:rustc-check-cfg=cfg(no_nonzero_bitscan)");
-        println!("cargo:rustc-check-cfg=cfg(no_track_caller)");
         println!("cargo:rustc-check-cfg=cfg(no_unsafe_op_in_unsafe_fn_lint)");
         println!("cargo:rustc-check-cfg=cfg(test_node_semver)");
     }
 
-    if compiler < 46 {
-        // #[track_caller].
-        // https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html#track_caller
-        println!("cargo:rustc-cfg=no_track_caller");
-    }
-
     if compiler < 52 {
         // #![deny(unsafe_op_in_unsafe_fn)].
         // https://github.com/rust-lang/rust/issues/71668

tests/node/mod.rs

@@ -37,7 +37,7 @@ impl Display for VersionReq {
     }
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn req(text: &str) -> VersionReq {
     VersionReq(crate::util::req(text))
 }

tests/test_version_req.rs

@@ -18,15 +18,15 @@ use node::{req, VersionReq};
 #[cfg(not(test_node_semver))]
 use semver::VersionReq;
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 fn assert_match_all(req: &VersionReq, versions: &[&str]) {
     for string in versions {
         let parsed = version(string);
         assert!(req.matches(&parsed), "did not match {}", string);
     }
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 fn assert_match_none(req: &VersionReq, versions: &[&str]) {
     for string in versions {
         let parsed = version(string);

tests/util/mod.rs

@@ -3,52 +3,52 @@
 use semver::{BuildMetadata, Comparator, Error, Prerelease, Version, VersionReq};
 use std::fmt::Display;
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn version(text: &str) -> Version {
     Version::parse(text).unwrap()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn version_err(text: &str) -> Error {
     Version::parse(text).unwrap_err()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn req(text: &str) -> VersionReq {
     VersionReq::parse(text).unwrap()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn req_err(text: &str) -> Error {
     VersionReq::parse(text).unwrap_err()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn comparator(text: &str) -> Comparator {
     Comparator::parse(text).unwrap()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn comparator_err(text: &str) -> Error {
     Comparator::parse(text).unwrap_err()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn prerelease(text: &str) -> Prerelease {
     Prerelease::new(text).unwrap()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn prerelease_err(text: &str) -> Error {
     Prerelease::new(text).unwrap_err()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn build_metadata(text: &str) -> BuildMetadata {
     BuildMetadata::new(text).unwrap()
 }
 
-#[cfg_attr(not(no_track_caller), track_caller)]
+#[track_caller]
 pub(super) fn assert_to_string(value: impl Display, expected: &str) {
     assert_eq!(value.to_string(), expected);
 }