From 21f751a0e5da5dd488612e25abfc545c259050e7 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 23 Jun 2020 18:34:50 +0200
Subject: Simplify

---
 crates/ra_ide/src/mock_analysis.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'crates/ra_ide/src/mock_analysis.rs')

diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index c0840c6ea..d480fcf62 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -25,7 +25,7 @@ impl MockFileData {
     fn path(&self) -> &str {
         match self {
             MockFileData::Plain { path, .. } => path.as_str(),
-            MockFileData::Fixture(f) => f.meta.path.as_str(),
+            MockFileData::Fixture(f) => f.path.as_str(),
         }
     }
 
@@ -38,25 +38,23 @@ impl MockFileData {
 
     fn cfg_options(&self) -> CfgOptions {
         match self {
-            MockFileData::Fixture(f) => f.meta.cfg.clone(),
+            MockFileData::Fixture(f) => f.cfg.clone(),
             _ => CfgOptions::default(),
         }
     }
 
     fn edition(&self) -> Edition {
         match self {
-            MockFileData::Fixture(f) => f
-                .meta
-                .edition
-                .as_ref()
-                .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()),
+            MockFileData::Fixture(f) => {
+                f.edition.as_ref().map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap())
+            }
             _ => Edition::Edition2018,
         }
     }
 
     fn env(&self) -> Env {
         match self {
-            MockFileData::Fixture(f) => Env::from(f.meta.env.iter()),
+            MockFileData::Fixture(f) => Env::from(f.env.iter()),
             _ => Env::default(),
         }
     }
-- 
cgit v1.2.3