Merge #57

57: Add item conversion backend for rustc r=xFrednet a=xFrednet

This is still a rough diamond. I want to do some more cleanup, but prefer to do that in a follow-up PR, as this has again grown into a monster with ~1000 line changes. #56 lists some remaining TODOs. Some of these are also less related to items and more to the type system.

Closes #53 
Progress on #35




Co-authored-by: xFrednet <[email protected]>

Author: bors[bot]

linter_adapter/src/lib.rs

@@ -39,7 +39,7 @@ impl<'ast> Adapter<'ast> {
             match item {
                 ItemKind::Mod(data) => self.external_lint_crates.check_mod(cx, data),
                 ItemKind::ExternCrate(data) => self.external_lint_crates.check_extern_crate(cx, data),
-                ItemKind::UseDecl(data) => self.external_lint_crates.check_use_decl(cx, data),
+                ItemKind::Use(data) => self.external_lint_crates.check_use_decl(cx, data),
                 ItemKind::Static(data) => self.external_lint_crates.check_static_item(cx, data),
                 _ => {},
             }

linter_api/src/ast/common.rs

@@ -99,22 +99,6 @@ impl<'ast, T> Spanned<'ast, T> {
     }
 }
 
-#[non_exhaustive]
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-pub struct Symbol {
-    index: u32,
-}
-
-#[cfg(feature = "driver-api")]
-impl Symbol {
-    #[must_use]
-    pub fn new(index: u32) -> Self {
-        Self { index }
-    }
-}
-
-pub type Ident<'ast> = Spanned<'ast, Symbol>;
-
 pub trait Attribute<'ast>: Debug {
     // FIXME: Add attribute functions
 }

linter_api/src/ast/common/ast_path.rs

@@ -23,8 +23,10 @@ pub struct AstPath<'ast> {
 
 #[cfg(feature = "driver-api")]
 impl<'ast> AstPath<'ast> {
-    pub fn new(segments: FfiSlice<'ast, AstPathSegment<'ast>>) -> Self {
-        Self { segments }
+    pub fn new(segments: &'ast [AstPathSegment<'ast>]) -> Self {
+        Self {
+            segments: segments.into(),
+        }
     }
 }
 

linter_api/src/ast/item.rs

@@ -10,7 +10,7 @@ pub use mod_item::ModItem;
 mod static_item;
 pub use self::static_item::StaticItem;
 mod use_decl_item;
-pub use self::use_decl_item::UseDeclItem;
+pub use self::use_decl_item::*;
 mod const_item;
 pub use self::const_item::ConstItem;
 mod fn_item;
@@ -25,6 +25,8 @@ mod impl_item;
 pub use impl_item::*;
 mod extern_block_item;
 pub use extern_block_item::*;
+mod unstable_item;
+pub use unstable_item::*;
 
 pub trait ItemData<'ast>: Debug {
     /// Returns the [`ItemId`] of this item. This is a unique identifier used for comparison
@@ -55,7 +57,7 @@ pub trait ItemData<'ast>: Debug {
 pub enum ItemKind<'ast> {
     Mod(&'ast ModItem<'ast>),
     ExternCrate(&'ast ExternCrateItem<'ast>),
-    UseDecl(&'ast UseDeclItem<'ast>),
+    Use(&'ast UseItem<'ast>),
     Static(&'ast StaticItem<'ast>),
     Const(&'ast ConstItem<'ast>),
     Fn(&'ast FnItem<'ast>),
@@ -66,6 +68,7 @@ pub enum ItemKind<'ast> {
     Trait(&'ast TraitItem<'ast>),
     Impl(&'ast ImplItem<'ast>),
     ExternBlock(&'ast ExternBlockItem<'ast>),
+    Unstable(&'ast UnstableItem<'ast>),
 }
 
 impl<'ast> ItemKind<'ast> {
@@ -91,40 +94,85 @@ impl<'ast> AssocItemKind<'ast> {
     impl_item_type_fn!(AssocItemKind: name() -> Option<String>);
     impl_item_type_fn!(AssocItemKind: attrs() -> ());
     impl_item_type_fn!(AssocItemKind: as_item() -> ItemKind<'ast>);
+    // FIXME: Potentualy add a field to the items to optionally store the owner id
+}
+
+impl<'ast> From<AssocItemKind<'ast>> for ItemKind<'ast> {
+    fn from(value: AssocItemKind<'ast>) -> Self {
+        match value {
+            AssocItemKind::TyAlias(item) => ItemKind::TyAlias(item),
+            AssocItemKind::Const(item) => ItemKind::Const(item),
+            AssocItemKind::Fn(item) => ItemKind::Fn(item),
+        }
+    }
+}
+
+impl<'ast> TryFrom<&ItemKind<'ast>> for AssocItemKind<'ast> {
+    type Error = ();
+
+    fn try_from(value: &ItemKind<'ast>) -> Result<Self, Self::Error> {
+        match value {
+            ItemKind::TyAlias(item) => Ok(AssocItemKind::TyAlias(item)),
+            ItemKind::Const(item) => Ok(AssocItemKind::Const(item)),
+            ItemKind::Fn(item) => Ok(AssocItemKind::Fn(item)),
+            _ => Err(()),
+        }
+    }
 }
 
 #[non_exhaustive]
 #[derive(Debug)]
-pub enum ExternalItemKind<'ast> {
+pub enum ExternItemKind<'ast> {
     Static(&'ast StaticItem<'ast>),
     Fn(&'ast FnItem<'ast>),
 }
 
-impl<'ast> ExternalItemKind<'ast> {
-    impl_item_type_fn!(ExternalItemKind: id() -> ItemId);
-    impl_item_type_fn!(ExternalItemKind: span() -> &Span<'ast>);
-    impl_item_type_fn!(ExternalItemKind: visibility() -> &Visibility<'ast>);
-    impl_item_type_fn!(ExternalItemKind: name() -> Option<String>);
-    impl_item_type_fn!(ExternalItemKind: attrs() -> ());
-    impl_item_type_fn!(ExternalItemKind: as_item() -> ItemKind<'ast>);
+impl<'ast> ExternItemKind<'ast> {
+    impl_item_type_fn!(ExternItemKind: id() -> ItemId);
+    impl_item_type_fn!(ExternItemKind: span() -> &Span<'ast>);
+    impl_item_type_fn!(ExternItemKind: visibility() -> &Visibility<'ast>);
+    impl_item_type_fn!(ExternItemKind: name() -> Option<String>);
+    impl_item_type_fn!(ExternItemKind: attrs() -> ());
+    impl_item_type_fn!(ExternItemKind: as_item() -> ItemKind<'ast>);
+}
+
+impl<'ast> From<ExternItemKind<'ast>> for ItemKind<'ast> {
+    fn from(value: ExternItemKind<'ast>) -> Self {
+        match value {
+            ExternItemKind::Static(item) => ItemKind::Static(item),
+            ExternItemKind::Fn(item) => ItemKind::Fn(item),
+        }
+    }
+}
+
+impl<'ast> TryFrom<ItemKind<'ast>> for ExternItemKind<'ast> {
+    type Error = ();
+
+    fn try_from(value: ItemKind<'ast>) -> Result<Self, Self::Error> {
+        match value {
+            ItemKind::Static(item) => Ok(ExternItemKind::Static(item)),
+            ItemKind::Fn(item) => Ok(ExternItemKind::Fn(item)),
+            _ => Err(()),
+        }
+    }
 }
 
 /// Until [trait upcasting](https://github.com/rust-lang/rust/issues/65991) has been implemented
 /// and stabalized we need this to call [`ItemData`] functions for [`ItemKind`].
 macro_rules! impl_item_type_fn {
     (ItemKind: $method:ident () -> $return_ty:ty) => {
         impl_item_type_fn!((ItemKind) $method() -> $return_ty,
-            Mod, ExternCrate, UseDecl, Static, Const, Fn,
-            TyAlias, Struct, Enum, Union, Trait, Impl, ExternBlock
+            Mod, ExternCrate, Use, Static, Const, Fn, TyAlias, Struct, Enum,
+            Union, Trait, Impl, ExternBlock, Unstable
         );
     };
     (AssocItemKind: $method:ident () -> $return_ty:ty) => {
         impl_item_type_fn!((AssocItemKind) $method() -> $return_ty,
             TyAlias, Const, Fn
         );
     };
-    (ExternalItemKind: $method:ident () -> $return_ty:ty) => {
-        impl_item_type_fn!((ExternalItemKind) $method() -> $return_ty,
+    (ExternItemKind: $method:ident () -> $return_ty:ty) => {
+        impl_item_type_fn!((ExternItemKind) $method() -> $return_ty,
             Static, Fn
         );
     };
@@ -182,8 +230,12 @@ use impl_item_data;
 
 #[cfg(feature = "driver-api")]
 impl<'ast> CommonItemData<'ast> {
-    pub fn new(id: ItemId, vis: Visibility<'ast>, name: SymbolId) -> Self {
-        Self { id, vis, name }
+    pub fn new(id: ItemId, name: SymbolId) -> Self {
+        Self {
+            id,
+            vis: Visibility::new(id),
+            name,
+        }
     }
 }
 

linter_api/src/ast/item/adt_item.rs

@@ -226,6 +226,13 @@ impl<'ast> StructItem<'ast> {
     }
 }
 
+#[cfg(feature = "driver-api")]
+impl<'ast> StructItem<'ast> {
+    pub fn new(data: CommonItemData<'ast>, generics: GenericParams<'ast>, kind: AdtKind<'ast>) -> Self {
+        Self { data, generics, kind }
+    }
+}
+
 #[derive(Debug)]
 #[allow(clippy::exhaustive_enums)]
 #[cfg_attr(feature = "driver-api", visibility::make(pub))]
@@ -235,6 +242,17 @@ enum AdtKind<'ast> {
     Field(FfiSlice<'ast, Field<'ast>>),
 }
 
+impl<'ast> AdtKind<'ast> {
+    // The slice lifetime is here explicitly denoted, as this is used by the
+    // driver for convenience and is not part of the public API
+    pub fn fields(self) -> &'ast [Field<'ast>] {
+        match self {
+            AdtKind::Tuple(fields) | AdtKind::Field(fields) => fields.get(),
+            AdtKind::Unit => &[],
+        }
+    }
+}
+
 /// A single field inside a [`StructItem`] or [`UnionItem`] with an identifier
 /// type and span.
 #[repr(C)]

linter_api/src/ast/item/extern_block_item.rs

@@ -1,7 +1,7 @@
 use crate::ast::Abi;
 use crate::ffi::FfiSlice;
 
-use super::{CommonItemData, ExternalItemKind};
+use super::{CommonItemData, ExternItemKind};
 
 /// An extern block with items like this:
 ///
@@ -19,7 +19,7 @@ use super::{CommonItemData, ExternalItemKind};
 pub struct ExternBlockItem<'ast> {
     data: CommonItemData<'ast>,
     abi: Abi,
-    items: FfiSlice<'ast, ExternalItemKind<'ast>>,
+    items: FfiSlice<'ast, ExternItemKind<'ast>>,
 }
 
 super::impl_item_data!(ExternBlockItem, ExternBlock);
@@ -29,14 +29,18 @@ impl<'ast> ExternBlockItem<'ast> {
         self.abi
     }
 
-    pub fn items(&self) -> &[ExternalItemKind<'ast>] {
+    pub fn items(&self) -> &[ExternItemKind<'ast>] {
         self.items.get()
     }
 }
 
 #[cfg(feature = "driver-api")]
 impl<'ast> ExternBlockItem<'ast> {
-    pub fn new(data: CommonItemData<'ast>, abi: Abi, items: FfiSlice<'ast, ExternalItemKind<'ast>>) -> Self {
-        Self { data, abi, items }
+    pub fn new(data: CommonItemData<'ast>, abi: Abi, items: &'ast [ExternItemKind<'ast>]) -> Self {
+        Self {
+            data,
+            abi,
+            items: items.into(),
+        }
     }
 }

linter_api/src/ast/item/extern_crate_item.rs

@@ -1,4 +1,5 @@
-use crate::ast::Symbol;
+use crate::ast::SymbolId;
+use crate::context::with_cx;
 
 use super::CommonItemData;
 
@@ -18,7 +19,7 @@ use super::CommonItemData;
 #[derive(Debug)]
 pub struct ExternCrateItem<'ast> {
     data: CommonItemData<'ast>,
-    crate_name: Symbol,
+    crate_name: SymbolId,
 }
 
 super::impl_item_data!(ExternCrateItem, ExternCrate);
@@ -29,14 +30,14 @@ impl<'ast> ExternCrateItem<'ast> {
     /// declared an alias with as.
     ///
     /// In most cases, you want to use this over the `get_name()` function.
-    pub fn crate_name(&self) -> Symbol {
-        self.crate_name
+    pub fn crate_name(&self) -> String {
+        with_cx(self, |cx| cx.symbol_str(self.crate_name))
     }
 }
 
 #[cfg(feature = "driver-api")]
 impl<'ast> ExternCrateItem<'ast> {
-    pub fn new(data: CommonItemData<'ast>, crate_name: Symbol) -> Self {
+    pub fn new(data: CommonItemData<'ast>, crate_name: SymbolId) -> Self {
         Self { data, crate_name }
     }
 }

linter_api/src/ast/item/fn_item.rs

@@ -49,13 +49,13 @@ impl<'ast> FnItem<'ast> {
         data: CommonItemData<'ast>,
         generics: GenericParams<'ast>,
         callable_data: CommonCallableData<'ast>,
-        body: FfiOption<BodyId>,
+        body: Option<BodyId>,
     ) -> Self {
         Self {
             data,
             generics,
             callable_data,
-            body,
+            body: body.into(),
         }
     }
 }

linter_api/src/ast/item/static_item.rs

@@ -1,4 +1,7 @@
-use crate::ast::{ty::TyKind, BodyId, Mutability};
+use crate::{
+    ast::{ty::TyKind, BodyId, Mutability},
+    ffi::FfiOption,
+};
 
 use super::CommonItemData;
 
@@ -18,7 +21,7 @@ use super::CommonItemData;
 pub struct StaticItem<'ast> {
     data: CommonItemData<'ast>,
     mutability: Mutability,
-    body_id: BodyId,
+    body_id: FfiOption<BodyId>,
     ty: TyKind<'ast>,
 }
 
@@ -36,18 +39,18 @@ impl<'ast> StaticItem<'ast> {
     }
 
     /// This returns the [`BodyId`] of the initialization body.
-    pub fn body_id(&self) -> BodyId {
-        self.body_id
+    pub fn body_id(&self) -> Option<BodyId> {
+        self.body_id.get().copied()
     }
 }
 
 #[cfg(feature = "driver-api")]
 impl<'ast> StaticItem<'ast> {
-    pub fn new(data: CommonItemData<'ast>, mutability: Mutability, body_id: BodyId, ty: TyKind<'ast>) -> Self {
+    pub fn new(data: CommonItemData<'ast>, mutability: Mutability, body_id: Option<BodyId>, ty: TyKind<'ast>) -> Self {
         Self {
             data,
             mutability,
-            body_id,
+            body_id: body_id.into(),
             ty,
         }
     }