From 29798c763cc121f7d610544deb940d70e4e33649 Mon Sep 17 00:00:00 2001
From: gfreezy <gfreezy@gmail.com>
Date: Mon, 24 Dec 2018 23:00:18 +0800
Subject: remove option from Diagnostic

---
 crates/ra_analysis/src/imp.rs | 6 +++---
 crates/ra_analysis/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_analysis')

diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index e8d6acc17..00cdf7eff 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -364,7 +364,7 @@ impl AnalysisImpl {
             .map(|d| Diagnostic {
                 range: d.range,
                 message: d.msg,
-                severity: Some(d.severity),
+                severity: d.severity,
                 fix: None,
             })
             .collect::<Vec<_>>();
@@ -386,7 +386,7 @@ impl AnalysisImpl {
                         Diagnostic {
                             range: name_node.range(),
                             message: "unresolved module".to_string(),
-                            severity: Some(Severity::Error),
+                            severity: Severity::Error,
                             fix: Some(fix),
                         }
                     }
@@ -409,7 +409,7 @@ impl AnalysisImpl {
                         Diagnostic {
                             range: name_node.range(),
                             message: "can't declare module at this location".to_string(),
-                            severity: Some(Severity::Error),
+                            severity: Severity::Error,
                             fix: Some(fix),
                         }
                     }
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index a213fd60f..fbb19ed6b 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -197,7 +197,7 @@ pub struct Diagnostic {
     pub message: String,
     pub range: TextRange,
     pub fix: Option<SourceChange>,
-    pub severity: Option<Severity>,
+    pub severity: Severity,
 }
 
 #[derive(Debug)]
-- 
cgit v1.2.3