From 4c4e54ac8a9782439744fe15aa31a3bedab92b74 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 14 Jan 2021 18:47:42 +0300 Subject: prepare to publish el libro de arena --- crates/hir_ty/src/db.rs | 2 +- crates/hir_ty/src/diagnostics/match_check.rs | 2 +- crates/hir_ty/src/infer.rs | 2 +- crates/hir_ty/src/lower.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/hir_ty/src') diff --git a/crates/hir_ty/src/db.rs b/crates/hir_ty/src/db.rs index f3567c49e..b0e2a3b7d 100644 --- a/crates/hir_ty/src/db.rs +++ b/crates/hir_ty/src/db.rs @@ -2,12 +2,12 @@ use std::sync::Arc; -use arena::map::ArenaMap; use base_db::{impl_intern_key, salsa, CrateId, Upcast}; use hir_def::{ db::DefDatabase, expr::ExprId, ConstParamId, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId, TypeParamId, VariantId, }; +use la_arena::map::ArenaMap; use crate::{ method_resolution::{InherentImpls, TraitImpls}, diff --git a/crates/hir_ty/src/diagnostics/match_check.rs b/crates/hir_ty/src/diagnostics/match_check.rs index 61c47eec8..fbe760c39 100644 --- a/crates/hir_ty/src/diagnostics/match_check.rs +++ b/crates/hir_ty/src/diagnostics/match_check.rs @@ -218,13 +218,13 @@ //! ``` use std::{iter, sync::Arc}; -use arena::Idx; use hir_def::{ adt::VariantData, body::Body, expr::{Expr, Literal, Pat, PatId}, AdtId, EnumVariantId, StructId, VariantId, }; +use la_arena::Idx; use smallvec::{smallvec, SmallVec}; use crate::{db::HirDatabase, ApplicationTy, InferenceResult, Ty, TypeCtor}; diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs index a14d67c06..46a806b9a 100644 --- a/crates/hir_ty/src/infer.rs +++ b/crates/hir_ty/src/infer.rs @@ -18,7 +18,6 @@ use std::mem; use std::ops::Index; use std::sync::Arc; -use arena::map::ArenaMap; use hir_def::{ body::Body, data::{ConstData, FunctionData, StaticData}, @@ -31,6 +30,7 @@ use hir_def::{ TypeAliasId, VariantId, }; use hir_expand::{diagnostics::DiagnosticSink, name::name}; +use la_arena::map::ArenaMap; use rustc_hash::FxHashMap; use stdx::impl_from; use syntax::SmolStr; diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 9594cce8b..68d16f89a 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs @@ -7,7 +7,6 @@ //! This usually involves resolving names, collecting generic arguments etc. use std::{iter, sync::Arc}; -use arena::map::ArenaMap; use base_db::CrateId; use hir_def::{ adt::StructKind, @@ -21,6 +20,7 @@ use hir_def::{ TypeAliasId, TypeParamId, UnionId, VariantId, }; use hir_expand::name::Name; +use la_arena::map::ArenaMap; use smallvec::SmallVec; use stdx::impl_from; use test_utils::mark; -- cgit v1.2.3