bump: rust 1.47

mun-lang · Oct 10, 2020 · 640d94e · 640d94e
1 parent d806389
commit 640d94e
Show file tree

Hide file tree

Showing 13 changed files with 172 additions and 338 deletions.
diff --git a/crates/mun_abi/src/type_info.rs b/crates/mun_abi/src/type_info.rs
@@ -104,18 +104,12 @@ unsafe impl Sync for TypeInfo {}
 impl TypeGroup {
     /// Returns whether this is a fundamental type.
     pub fn is_fundamental(self) -> bool {
-        match self {
-            TypeGroup::FundamentalTypes => true,
-            _ => false,
-        }
+        self == TypeGroup::FundamentalTypes
     }
 
     /// Returns whether this is a struct type.
     pub fn is_struct(self) -> bool {
-        match self {
-            TypeGroup::StructTypes => true,
-            _ => false,
-        }
+        self == TypeGroup::StructTypes
     }
 }
 

diff --git a/crates/mun_compiler/src/driver/display_color.rs b/crates/mun_compiler/src/driver/display_color.rs
@@ -22,10 +22,7 @@ impl DisplayColor {
 /// Decides whether the current terminal supports ANSI escape codes based on the `term` environment variable and the operating system.
 fn terminal_support_ansi() -> bool {
     let supports_color = match env::var("TERM") {
-        Ok(terminal) => match terminal.as_str() {
-            "dumb" => false,
-            _ => true,
-        },
+        Ok(terminal) => terminal.as_str() == "dumb",
         Err(_) => {
             #[cfg(target_os = "windows")]
             let term_support = cmd_supports_ansi();

diff --git a/crates/mun_hir/src/expr.rs b/crates/mun_hir/src/expr.rs
@@ -935,6 +935,7 @@ pub fn resolver_for_expr(body: Arc<Body>, db: &dyn HirDatabase, expr_id: ExprId)
     resolver_for_scope(body, db, scopes.scope_for(expr_id))
 }
 
+#[allow(clippy::needless_collect)] // false positive https://github.com/rust-lang/rust-clippy/issues/5991
 pub(crate) fn resolver_for_scope(
     body: Arc<Body>,
     db: &dyn HirDatabase,

diff --git a/crates/mun_hir/src/ty.rs b/crates/mun_hir/src/ty.rs
@@ -108,10 +108,7 @@ impl Ty {
     }
 
     pub fn is_never(&self) -> bool {
-        match self.as_simple() {
-            Some(TypeCtor::Never) => true,
-            _ => false,
-        }
+        self.as_simple() == Some(TypeCtor::Never)
     }
 
     /// Returns the callable definition for the given expression or `None` if the type does not
@@ -185,10 +182,7 @@ impl Ty {
 
     /// Returns true if this instance represents a known type.
     pub fn is_known(&self) -> bool {
-        match self {
-            Ty::Unknown => false,
-            _ => true,
-        }
+        *self == Ty::Unknown
     }
 }
 

diff --git a/crates/mun_hir/src/ty/lower.rs b/crates/mun_hir/src/ty/lower.rs
@@ -182,17 +182,11 @@ impl_froms!(CallableDef: Function, Struct);
 
 impl CallableDef {
     pub fn is_function(self) -> bool {
-        match self {
-            CallableDef::Function(_) => true,
-            _ => false,
-        }
+        matches!(self, CallableDef::Function(_))
     }
 
     pub fn is_struct(self) -> bool {
-        match self {
-            CallableDef::Struct(_) => true,
-            _ => false,
-        }
+        matches!(self, CallableDef::Struct(_))
     }
 }
 

diff --git a/crates/mun_syntax/src/ast/extensions.rs b/crates/mun_syntax/src/ast/extensions.rs
@@ -93,10 +93,10 @@ impl ast::PathSegment {
     }
 
     pub fn has_colon_colon(&self) -> bool {
-        match self.syntax.first_child_or_token().map(|s| s.kind()) {
-            Some(T![::]) => true,
-            _ => false,
-        }
+        matches!(
+            self.syntax.first_child_or_token().map(|s| s.kind()),
+            Some(T![::])
+        )
     }
 }