diff options
Diffstat (limited to 'crates/ra_db/src/fixture.rs')
-rw-r--r-- | crates/ra_db/src/fixture.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index 8b62fe9aa..fd535ab15 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs | |||
@@ -254,20 +254,14 @@ impl From<&FixtureMeta> for ParsedMeta { | |||
254 | } | 254 | } |
255 | FixtureMeta::File(f) => Self::File(FileMeta { | 255 | FixtureMeta::File(f) => Self::File(FileMeta { |
256 | path: f.path.to_owned().into(), | 256 | path: f.path.to_owned().into(), |
257 | krate: f.krate.to_owned().into(), | 257 | krate: f.crate_name.to_owned().into(), |
258 | deps: f.deps.to_owned(), | 258 | deps: f.deps.to_owned(), |
259 | cfg: f.cfg.to_owned(), | 259 | cfg: f.cfg.to_owned(), |
260 | edition: f | 260 | edition: f |
261 | .edition | 261 | .edition |
262 | .as_ref() | 262 | .as_ref() |
263 | .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()), | 263 | .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()), |
264 | env: { | 264 | env: Env::from(f.env.iter()), |
265 | let mut env = Env::default(); | ||
266 | for (k, v) in &f.env { | ||
267 | env.set(&k, v.to_owned()); | ||
268 | } | ||
269 | env | ||
270 | }, | ||
271 | }), | 265 | }), |
272 | } | 266 | } |
273 | } | 267 | } |