aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/sysroot.rs
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2019-02-09 09:51:06 +0000
committerFlorian Diebold <[email protected]>2019-02-09 10:15:25 +0000
commit12c70871cca736afa44379e59f8573c60b0ccd0a (patch)
tree189d7482e74c54b9ee2f3bb05dc7207c4e424cb0 /crates/ra_project_model/src/sysroot.rs
parentddbf43b630fa8159ab2ea5e959393bff44e0c73b (diff)
Remove SmolStr from project model
Diffstat (limited to 'crates/ra_project_model/src/sysroot.rs')
-rw-r--r--crates/ra_project_model/src/sysroot.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 18824dbe5..8b87aa7bd 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -3,8 +3,6 @@ use std::{
3 process::Command, 3 process::Command,
4}; 4};
5 5
6use smol_str::SmolStr;
7
8use ra_arena::{Arena, RawId, impl_arena_id}; 6use ra_arena::{Arena, RawId, impl_arena_id};
9 7
10use crate::Result; 8use crate::Result;
@@ -20,7 +18,7 @@ impl_arena_id!(SysrootCrate);
20 18
21#[derive(Debug, Clone)] 19#[derive(Debug, Clone)]
22struct SysrootCrateData { 20struct SysrootCrateData {
23 name: SmolStr, 21 name: String,
24 root: PathBuf, 22 root: PathBuf,
25 deps: Vec<SysrootCrate>, 23 deps: Vec<SysrootCrate>,
26} 24}
@@ -81,7 +79,7 @@ impl Sysroot {
81} 79}
82 80
83impl SysrootCrate { 81impl SysrootCrate {
84 pub fn name(self, sysroot: &Sysroot) -> &SmolStr { 82 pub fn name(self, sysroot: &Sysroot) -> &str {
85 &sysroot.crates[self].name 83 &sysroot.crates[self].name
86 } 84 }
87 pub fn root(self, sysroot: &Sysroot) -> &Path { 85 pub fn root(self, sysroot: &Sysroot) -> &Path {