API: Removed the CallableData trait

CHANGELOG.md

@@ -37,6 +37,7 @@ See the [v0.3.0 milestone] for a full list of all changes.
 [#252]: https://github.com/rust-marker/marker/pull/252
 [#256]: https://github.com/rust-marker/marker/pull/256
 [#263]: https://github.com/rust-marker/marker/pull/263
+[#265]: https://github.com/rust-marker/marker/pull/265
 
 ### Added
 - [#232]: Add scope config for visitors and `for_each_expr` to `marker_utils`
@@ -50,6 +51,7 @@ See the [v0.3.0 milestone] for a full list of all changes.
 - [#244]: `StmtKind` and `PatKind` no longer wrap `Kind*` directly
 - [#245]: `emit_lint()` takes less arguments and returns a `DiagnosticBuilder` instance
 - [#263]: Updated the [`ui_test`](https://crates.io/crates/ui_test) used by `marker_uitest` from `v0.11.7` to `v0.21.2`
+- [#265]: Removed the `CallableData` trait
 
 ### Internal
 

marker_api/src/ast/common.rs

@@ -1,7 +1,5 @@
 mod id;
 pub use id::*;
-mod callable;
-pub use callable::*;
 mod ast_path;
 pub use ast_path::*;
 

marker_api/src/ast/ty.rs

@@ -61,10 +61,6 @@ pub enum SynTyKind<'ast> {
  /// A variable length slice like [`[T]`](prim@slice)
  Slice(&'ast SynSliceTy<'ast>),
  // ================================
- // Function types
- // ================================
- Closure(&'ast SynClosureTy<'ast>),
- // ================================
  // Pointer types
  // ================================
  /// A reference like [`&T`](prim@reference) or [`&mut T`](prim@reference)
@@ -119,7 +115,7 @@ impl<'ast> SynTyKind<'ast> {
  /// Returns `true` if this is a function type.
  #[must_use]
  pub fn is_fn(&self) -> bool {
- matches!(self, Self::FnPtr(..) | Self::Closure(..))
+ matches!(self, Self::FnPtr(..))
  }
 
  /// Returns `true` if this is a pointer type.
@@ -151,7 +147,6 @@ macro_rules! impl_syn_ty_data_fn {
  impl_syn_ty_data_fn!($method() -> $return_ty,
  Bool, Num, Text, Never,
  Tuple, Array, Slice,
- Closure,
  Ref, RawPtr, FnPtr,
  TraitObj, ImplTrait,
  Inferred, Path

marker_api/src/ast/ty/fn_ty.rs

@@ -1,6 +1,4 @@
-use crate::ast::{generic::SemGenericArgs, impl_callable_data_trait, CommonCallableData, ItemId, TyDefId};
-
-use super::CommonSynTyData;
+use crate::ast::{generic::SemGenericArgs, ItemId, TyDefId};
 
 /// A [function item type](https://doc.rust-lang.org/reference/types/function-item.html)
 /// identifying a specific function and potentualy additional generics.
@@ -30,26 +28,6 @@ impl<'ast> SemFnTy<'ast> {
  }
 }
 
-/// The syntactic representation of a
-/// [closure type](https://doc.rust-lang.org/reference/types/closure.html).
-#[repr(C)]
-#[derive(Debug)]
-pub struct SynClosureTy<'ast> {
- data: CommonSynTyData<'ast>,
- callable_data: CommonCallableData<'ast>,
- // FIXME: Add support for `for<'lifetime>` binder
-}
-
-#[cfg(feature = "driver-api")]
-impl<'ast> SynClosureTy<'ast> {
- pub fn new(data: CommonSynTyData<'ast>, callable_data: CommonCallableData<'ast>) -> Self {
- Self { data, callable_data }
- }
-}
-
-super::impl_ty_data!(SynClosureTy<'ast>, Closure);
-impl_callable_data_trait!(SynClosureTy<'ast>);
-
 /// The semantic representation of a
 /// [closure type](https://doc.rust-lang.org/reference/types/closure.html).
 ///

marker_api/src/ast/ty/ptr_ty.rs

@@ -1,6 +1,9 @@
 use crate::{
- ast::{generic::Lifetime, impl_callable_data_trait, Abi, CommonCallableData, Mutability, Safety},
+ ast::{generic::Lifetime, Abi, Mutability, Safety, SpanId},
+ context::with_cx,
  ffi::{FfiOption, FfiSlice},
+ private::Sealed,
+ span::{HasSpan, Ident},
 };
 
 use super::{CommonSynTyData, SemTyKind, SynTyKind};
@@ -141,24 +144,76 @@ impl<'ast> SemRawPtrTy<'ast> {
  }
 }
 
-/// The semantic representation of a function pointer, like [`fn (T) -> U`](prim@fn)
+/// The syntactic representation of a function pointer, like [`fn (T) -> U`](prim@fn)
 #[repr(C)]
 #[derive(Debug)]
+#[cfg_attr(feature = "driver-api", derive(typed_builder::TypedBuilder))]
 pub struct SynFnPtrTy<'ast> {
  data: CommonSynTyData<'ast>,
- callable_data: CommonCallableData<'ast>,
+ safety: Safety,
+ abi: Abi,
+ #[cfg_attr(feature = "driver-api", builder(setter(into)))]
+ params: FfiSlice<'ast, FnTyParameter<'ast>>,
+ #[cfg_attr(feature = "driver-api", builder(setter(into)))]
+ return_ty: FfiOption<SynTyKind<'ast>>,
  // FIXME: Add `for<'a>` bound
 }
 
-#[cfg(feature = "driver-api")]
 impl<'ast> SynFnPtrTy<'ast> {
- pub fn new(data: CommonSynTyData<'ast>, callable_data: CommonCallableData<'ast>) -> Self {
- Self { data, callable_data }
+ /// Returns the [`Safety`] of this callable.
+ ///
+ /// Use this to check if the function is `unsafe`.
+ pub fn safety(&self) -> Safety {
+ self.safety
+ }
+
+ /// Returns the [`Abi`] of the callable.
+ pub fn abi(&self) -> Abi {
+ self.abi
+ }
+
+ /// Returns the [`FnTyParameter`]s this function pointer accepts.
+ pub fn params(&self) -> &[FnTyParameter<'ast>] {
+ self.params.get()
+ }
+
+ /// The return type of this function pointer, if specified.
+ pub fn return_ty(&self) -> Option<&SynTyKind<'ast>> {
+ self.return_ty.get()
  }
 }
 
 super::impl_ty_data!(SynFnPtrTy<'ast>, FnPtr);
-impl_callable_data_trait!(SynFnPtrTy<'ast>);
+
+/// A parameter for the [`SynFnPtrTy`].
+#[repr(C)]
+#[derive(Debug)]
+#[cfg_attr(feature = "driver-api", derive(typed_builder::TypedBuilder))]
+pub struct FnTyParameter<'ast> {
+ #[cfg_attr(feature = "driver-api", builder(setter(into)))]
+ ident: FfiOption<Ident<'ast>>,
+ span: SpanId,
+ ty: SynTyKind<'ast>,
+}
+
+impl<'ast> FnTyParameter<'ast> {
+ /// Returns the [`Ident`] of the parameter, if specified.
+ pub fn ident(&self) -> Option<&Ident<'ast>> {
+ self.ident.get()
+ }
+
+ /// The syntactic type of this parameter.
+ pub fn ty(&self) -> SynTyKind<'ast> {
+ self.ty
+ }
+}
+
+impl Sealed for FnTyParameter<'_> {}
+impl<'ast> HasSpan<'ast> for FnTyParameter<'ast> {
+ fn span(&self) -> &crate::span::Span<'ast> {
+ with_cx(self, |cx| cx.span(self.span))
+ }
+}
 
 /// The semantic representation of a function pointer, like [`fn (T) -> U`](prim@fn)
 #[repr(C)]