diff --git a/crates/compiler/specialize_types/src/foreign_symbol.rs b/crates/compiler/specialize_types/src/foreign_symbol.rs index b7f3dcc7e5..c668bc5ba5 100644 --- a/crates/compiler/specialize_types/src/foreign_symbol.rs +++ b/crates/compiler/specialize_types/src/foreign_symbol.rs @@ -1,5 +1,5 @@ use roc_module::ident::ForeignSymbol; -use soa::Id; +use soa::Index; #[derive(Debug, Default)] pub struct ForeignSymbols { @@ -26,12 +26,12 @@ impl ForeignSymbols { self.inner.push(entry); ForeignSymbolId { - inner: Id::new(id as u32), + inner: Index::new(id as u32), } } } #[derive(Debug, Copy, Clone, PartialEq, Eq)] pub struct ForeignSymbolId { - inner: Id, + inner: Index, } diff --git a/crates/compiler/specialize_types/src/mono_ir.rs b/crates/compiler/specialize_types/src/mono_ir.rs index 854e8b4883..249da15a2f 100644 --- a/crates/compiler/specialize_types/src/mono_ir.rs +++ b/crates/compiler/specialize_types/src/mono_ir.rs @@ -6,7 +6,7 @@ use roc_can::expr::Recursive; use roc_module::low_level::LowLevel; use roc_module::symbol::Symbol; use roc_region::all::Region; -use soa::{Id, Index, NonEmptySlice, Slice, Slice2, Slice3}; +use soa::{Index, NonEmptySlice, Slice, Slice2, Slice3}; use std::iter; #[derive(Clone, Copy, Debug, PartialEq)] @@ -46,7 +46,7 @@ impl MonoExprs { self.regions.push(region); MonoExprId { - inner: Id::new(index), + inner: Index::new(index), } } @@ -146,22 +146,22 @@ impl MonoExprs { #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct MonoExprId { - inner: Id, + inner: Index, } impl MonoExprId { - pub(crate) unsafe fn new_unchecked(inner: Id) -> Self { + pub(crate) unsafe fn new_unchecked(inner: Index) -> Self { Self { inner } } } #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct MonoStmtId { - inner: Id, + inner: Index, } impl MonoStmtId { - pub(crate) unsafe fn new_unchecked(inner: Id) -> Self { + pub(crate) unsafe fn new_unchecked(inner: Index) -> Self { Self { inner } } } diff --git a/crates/soa/src/soa_index.rs b/crates/soa/src/soa_index.rs index c01d2b6e3d..9d955ace0f 100644 --- a/crates/soa/src/soa_index.rs +++ b/crates/soa/src/soa_index.rs @@ -8,8 +8,6 @@ use core::{ use crate::soa_slice::Slice; -pub type Id = Index; - /// An index into an array of values, based /// on an offset into the array rather than a pointer. ///