aboutsummaryrefslogtreecommitdiff
path: root/crates/project_model
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-14 16:06:30 +0000
committerGitHub <[email protected]>2021-01-14 16:06:30 +0000
commitf88f3d688507508ae9528101e13e1c62902467a3 (patch)
tree325af14ad9cd20312fb6166f1c06f3cb39684fe3 /crates/project_model
parent540edee3cd11d45a03abc072bb9b6f01b59bcb25 (diff)
parent4c4e54ac8a9782439744fe15aa31a3bedab92b74 (diff)
Merge #7271
7271: prepare to publish el libro de arena r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/project_model')
-rw-r--r--crates/project_model/Cargo.toml2
-rw-r--r--crates/project_model/src/cargo_workspace.rs2
-rw-r--r--crates/project_model/src/sysroot.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml
index 855fb83ea..51e7a7070 100644
--- a/crates/project_model/Cargo.toml
+++ b/crates/project_model/Cargo.toml
@@ -17,8 +17,8 @@ serde = { version = "1.0.106", features = ["derive"] }
17serde_json = "1.0.48" 17serde_json = "1.0.48"
18anyhow = "1.0.26" 18anyhow = "1.0.26"
19itertools = "0.10.0" 19itertools = "0.10.0"
20la-arena = "0.1.0"
20 21
21arena = { path = "../arena", version = "0.0.0" }
22cfg = { path = "../cfg", version = "0.0.0" } 22cfg = { path = "../cfg", version = "0.0.0" }
23base_db = { path = "../base_db", version = "0.0.0" } 23base_db = { path = "../base_db", version = "0.0.0" }
24toolchain = { path = "../toolchain", version = "0.0.0" } 24toolchain = { path = "../toolchain", version = "0.0.0" }
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index a1ab9c6db..c0ed37fc1 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
@@ -10,10 +10,10 @@ use std::{
10}; 10};
11 11
12use anyhow::{Context, Result}; 12use anyhow::{Context, Result};
13use arena::{Arena, Idx};
14use base_db::Edition; 13use base_db::Edition;
15use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; 14use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
16use itertools::Itertools; 15use itertools::Itertools;
16use la_arena::{Arena, Idx};
17use paths::{AbsPath, AbsPathBuf}; 17use paths::{AbsPath, AbsPathBuf};
18use rustc_hash::FxHashMap; 18use rustc_hash::FxHashMap;
19use stdx::JodChild; 19use stdx::JodChild;
diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs
index 95b622715..ff44dae4a 100644
--- a/crates/project_model/src/sysroot.rs
+++ b/crates/project_model/src/sysroot.rs
@@ -7,7 +7,7 @@
7use std::{convert::TryFrom, env, ops, path::PathBuf, process::Command}; 7use std::{convert::TryFrom, env, ops, path::PathBuf, process::Command};
8 8
9use anyhow::{format_err, Result}; 9use anyhow::{format_err, Result};
10use arena::{Arena, Idx}; 10use la_arena::{Arena, Idx};
11use paths::{AbsPath, AbsPathBuf}; 11use paths::{AbsPath, AbsPathBuf};
12 12
13use crate::utf8_stdout; 13use crate::utf8_stdout;