github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-04-20 03:03:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Hash trait for Type (#1732)

Browse Source 
Small PR that adds the `Hash` trait to `Type` and some of its internal
types.
Needed to be able to store `Vec<type>` in order to solve trait
implementations based on its `type_args`.
This commit is contained in:
Gastón Zanitti
2024-08-30 10:26:16 -03:00
committed by GitHub
parent 14d710c56c
commit 43155ab586
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ast/src/parsed/asm.rs
View File

@@ -137,7 +137,7 @@ pub struct Import {
/// It can contain the special word `super`, which goes up a level.
/// If it does not start with `::`, it is relative.
#[derive(
Default, Debug, PartialEq, Eq, Clone, PartialOrd, Ord, Serialize, Deserialize, JsonSchema,
Default, Debug, PartialEq, Eq, Clone, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
)]
pub struct SymbolPath {
/// The parts between each `::`.
@@ -358,7 +358,9 @@ impl Display for AbsoluteSymbolPath {
}
}
#[derive(Debug, PartialEq, Eq, Clone, PartialOrd, Ord, Serialize, Deserialize, JsonSchema)]
#[derive(
Debug, PartialEq, Eq, Clone, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
)]
pub enum Part {
Super,
Named(String),

16
ast/src/parsed/types.rs
View File

@@ -10,7 +10,9 @@ use serde::{Deserialize, Serialize};
use super::{asm::SymbolPath, visitor::Children, Expression, Number};
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize, Deserialize, JsonSchema)]
#[derive(
Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Serialize, Deserialize, JsonSchema,
)]
pub enum Type<E = u64> {
/// The bottom type `!`, which cannot have a value but is
/// compatible with all other types.
@@ -260,7 +262,9 @@ impl<R: Display> From<Type<Expression<R>>> for Type<u64> {
}
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize, Deserialize, JsonSchema)]
#[derive(
Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Serialize, Deserialize, JsonSchema,
)]
pub struct ArrayType<E = u64> {
pub base: Box<Type<E>>,
pub length: Option<E>,
@@ -295,7 +299,9 @@ impl<R> Children<Expression<R>> for ArrayType<Expression<R>> {
}
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize, Deserialize, JsonSchema)]
#[derive(
Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Serialize, Deserialize, JsonSchema,
)]
pub struct TupleType<E = u64> {
pub items: Vec<Type<E>>,
}
@@ -317,7 +323,9 @@ impl<R: Display> From<TupleType<Expression<R>>> for TupleType<u64> {
}
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize, Deserialize, JsonSchema)]
#[derive(
Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Serialize, Deserialize, JsonSchema,
)]
pub struct FunctionType<E = u64> {
pub params: Vec<Type<E>>,
pub value: Box<Type<E>>,