pub(crate) fn try_load_from_on_disk_cache<'tcx>(tcx: TyCtxt<'tcx>, dep_node: &DepNode) {
rustc_dep_node_try_load_from_on_disk_cache!(dep_node, tcx)
}
+
+/// An analogue of the `Into` trait that's intended only for query paramaters.
+///
+/// This exists to allow queries to accept either `DefId` or `LocalDefId` while requiring that the
+/// user call `to_def_id` to convert between them everywhere else.
+pub trait IntoQueryParam<P> {
+ fn into_query_param(self) -> P;
+}
+
+impl<P> IntoQueryParam<P> for P {
+ fn into_query_param(self) -> P {
+ self
+ }
+}
+
+impl IntoQueryParam<DefId> for LocalDefId {
+ fn into_query_param(self) -> DefId {
+ self.to_def_id()
+ }
+}
}
macro_rules! query_helper_param_ty {
- (DefId) => { impl Into<DefId> };
+ (DefId) => { impl IntoQueryParam<DefId> };
($K:ty) => { $K };
}
$($(#[$attr])*
#[inline(always)]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) {
- ensure_query::<queries::$name<'_>, _>(self.tcx, key.into())
+ ensure_query::<queries::$name<'_>, _>(self.tcx, key.into_query_param())
})*
}
$($(#[$attr])*
#[inline(always)]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) -> $V {
- get_query::<queries::$name<'_>, _>(self.tcx, self.span, key.into())
+ get_query::<queries::$name<'_>, _>(self.tcx, self.span, key.into_query_param())
})*
}