about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@gmail.com>2023-10-24 18:06:57 -0700
committerDavid Tolnay <dtolnay@gmail.com>2023-10-24 18:11:20 -0700
commit76d7af0df1e35df45f6e37a20528f4da6264de72 (patch)
tree143cd09223dc6efb8f8da220186bb560e332cbde
parentf4f5b05cbb968c62081d6977623b1ff33caea099 (diff)
Expose a non-Symbol way to access current rustc version string
-rw-r--r--clippy_utils/src/qualify_min_const_fn.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/clippy_utils/src/qualify_min_const_fn.rs b/clippy_utils/src/qualify_min_const_fn.rs
index 514988c6744..1e465ac91b7 100644
--- a/clippy_utils/src/qualify_min_const_fn.rs
+++ b/clippy_utils/src/qualify_min_const_fn.rs
@@ -5,7 +5,7 @@
 
 use crate::msrvs::Msrv;
 use hir::LangItem;
-use rustc_attr::{rust_version_symbol, Since};
+use rustc_attr::{Since, CURRENT_RUSTC_VERSION};
 use rustc_const_eval::transform::check_consts::ConstCx;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
@@ -380,10 +380,9 @@ fn is_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: &Msrv) -> bool {
                     Since::Current => {
                         // HACK(nilstrieb): CURRENT_RUSTC_VERSION can return versions like 1.66.0-dev.
                         // `rustc-semver` doesn't accept the `-dev` version number so we have to strip it off.
-                        let current_rustc_version = rust_version_symbol();
-                        let short_version = current_rustc_version.as_str().split('-').next().unwrap();
+                        let short_version = CURRENT_RUSTC_VERSION.split('-').next().unwrap();
                         RustcVersion::parse(short_version).unwrap_or_else(|err| {
-                            panic!("`rustc_attr::StabilityLevel::Stable::since` is ill-formatted: `{current_rustc_version}`, {err:?}")
+                            panic!("`rustc_attr::StabilityLevel::Stable::since` is ill-formatted: `{CURRENT_RUSTC_VERSION}`, {err:?}")
                         })
                     },
                     Since::Err => return false,