95 files changed, 920 insertions, 612 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 613266e07..43162797e 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -51,12 +51,14 @@ impl PathResolution {
            PathResolution::Def(ModuleDef::BuiltinType(builtin)) => {
                Some(TypeNs::BuiltinType((*builtin).into()))
            }
-            PathResolution::Def(ModuleDef::Const(_))
+            PathResolution::Def(
-            | PathResolution::Def(ModuleDef::Variant(_))
+                ModuleDef::Const(_)
-            | PathResolution::Def(ModuleDef::Function(_))
+                | ModuleDef::Variant(_)
-            | PathResolution::Def(ModuleDef::Module(_))
+                | ModuleDef::Function(_)
-            | PathResolution::Def(ModuleDef::Static(_))
+                | ModuleDef::Module(_)
-            | PathResolution::Def(ModuleDef::Trait(_)) => None,
+                | ModuleDef::Static(_)
+                | ModuleDef::Trait(_),
+            ) => None,
            PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
                Some(TypeNs::TypeAliasId((*alias).into()))
            }
@@ -65,8 +67,7 @@ impl PathResolution {
            }
            PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
            PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
-            PathResolution::AssocItem(AssocItem::Const(_))
+            PathResolution::AssocItem(AssocItem::Const(_) | AssocItem::Function(_)) => None,
-            | PathResolution::AssocItem(AssocItem::Function(_)) => None,
            PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => {
                Some(TypeNs::TypeAliasId((*alias).into()))
            }
diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs
index b1e1b70d0..e63bc8232 100644
--- a/crates/hir_def/src/item_tree/pretty.rs
+++ b/crates/hir_def/src/item_tree/pretty.rs
@@ -63,7 +63,7 @@ impl<'a> Printer<'a> {
    fn blank(&mut self) {
        let mut iter = self.buf.chars().rev().fuse();
        match (iter.next(), iter.next()) {
-            (Some('\n'), Some('\n')) | (Some('\n'), None) | (None, None) => {}
+            (Some('\n'), Some('\n') | None) | (None, None) => {}
            (Some('\n'), Some(_)) => {
                self.buf.push('\n');
            }
@@ -77,7 +77,7 @@ impl<'a> Printer<'a> {
    fn whitespace(&mut self) {
        match self.buf.chars().next_back() {
-            None | Some('\n') | Some(' ') => {}
+            None | Some('\n' | ' ') => {}
            _ => self.buf.push(' '),
        }
    }
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index fc2c50fb8..927a7b6e8 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -1260,7 +1260,7 @@ impl DefCollector<'_> {
        for directive in &self.unresolved_imports {
            if let ImportSource::Import { id: import, use_tree } = &directive.import.source {
                match (directive.import.path.segments().first(), &directive.import.path.kind) {
-                    (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => {
+                    (Some(krate), PathKind::Plain | PathKind::Abs) => {
                        if diagnosed_extern_crates.contains(krate) {
                            continue;
                        }
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs
index d4681fa3e..47e56259f 100644
--- a/crates/hir_def/src/resolver.rs
+++ b/crates/hir_def/src/resolver.rs
@@ -605,8 +605,7 @@ fn to_value_ns(per_ns: PerNs) -> Option<ValueNs> {
        ModuleDefId::ConstId(it) => ValueNs::ConstId(it),
        ModuleDefId::StaticId(it) => ValueNs::StaticId(it),
-        ModuleDefId::AdtId(AdtId::EnumId(_))
+        ModuleDefId::AdtId(AdtId::EnumId(_) | AdtId::UnionId(_))
-        | ModuleDefId::AdtId(AdtId::UnionId(_))
        | ModuleDefId::TraitId(_)
        | ModuleDefId::TypeAliasId(_)
        | ModuleDefId::BuiltinType(_)
diff --git a/crates/hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs
index 83500f54e..aeb1e7726 100644
--- a/crates/hir_def/src/visibility.rs
+++ b/crates/hir_def/src/visibility.rs
@@ -172,9 +172,8 @@ impl Visibility {
    /// visible in unrelated modules).
    pub(crate) fn max(self, other: Visibility, def_map: &DefMap) -> Option<Visibility> {
        match (self, other) {
-            (Visibility::Module(_), Visibility::Public)
+            (Visibility::Module(_) | Visibility::Public, Visibility::Public)
-            | (Visibility::Public, Visibility::Module(_))
+            | (Visibility::Public, Visibility::Module(_)) => Some(Visibility::Public),
-            | (Visibility::Public, Visibility::Public) => Some(Visibility::Public),
            (Visibility::Module(mod_a), Visibility::Module(mod_b)) => {
                if mod_a.krate != mod_b.krate {
                    return None;
diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs
index 05c6c3fb1..848522411 100644
--- a/crates/hir_expand/src/hygiene.rs
+++ b/crates/hir_expand/src/hygiene.rs
@@ -146,10 +146,11 @@ impl HygieneInfo {
                (&self.macro_arg.1, InFile::new(loc.kind.file_id(), arg_start))
            }
            mbe::Origin::Def => match (&*self.macro_def, self.def_start) {
-                (TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt))
+                (
-                | (TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) => {
+                    TokenExpander::MacroDef { def_site_token_map, .. }
-                    (def_site_token_map, tt)
+                    | TokenExpander::MacroRules { def_site_token_map, .. },
-                }
+                    Some(tt),
+                ) => (def_site_token_map, tt),
                _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"),
            },
        };
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index 33107aa24..c31426d7c 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -368,10 +368,11 @@ impl ExpansionInfo {
        let (token_map, tt) = match origin {
            mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()),
            mbe::Origin::Def => match (&*self.macro_def, self.def.as_ref()) {
-                (db::TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt))
+                (
-                | (db::TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) => {
+                    db::TokenExpander::MacroRules { def_site_token_map, .. }
-                    (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone()))
+                    | db::TokenExpander::MacroDef { def_site_token_map, .. },
-                }
+                    Some(tt),
+                ) => (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())),
                _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"),
            },
        };
diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs
index 6f0bf8f8c..ab1afce08 100644
--- a/crates/hir_ty/src/consteval.rs
+++ b/crates/hir_ty/src/consteval.rs
@@ -38,8 +38,7 @@ impl ConstExt for Const {
 // FIXME: support more than just evaluating literals
 pub fn eval_usize(expr: &Expr) -> Option<u64> {
    match expr {
-        Expr::Literal(Literal::Uint(v, None))
+        Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
-        | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
        _ => None,
    }
 }
diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
index 471cd4921..e3d640a79 100644
--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
@@ -84,10 +84,7 @@ impl IntRange {
    #[inline]
    fn is_integral(ty: &Ty) -> bool {
        match ty.kind(&Interner) {
-            TyKind::Scalar(Scalar::Char)
+            TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true,
-            | TyKind::Scalar(Scalar::Int(_))
-            | TyKind::Scalar(Scalar::Uint(_))
-            | TyKind::Scalar(Scalar::Bool) => true,
            _ => false,
        }
    }
@@ -381,7 +378,7 @@ impl Constructor {
            // Wildcards cover anything
            (_, Wildcard) => true,
            // The missing ctors are not covered by anything in the matrix except wildcards.
-            (Missing, _) | (Wildcard, _) => false,
+            (Missing | Wildcard, _) => false,
            (Single, Single) => true,
            (Variant(self_id), Variant(other_id)) => self_id == other_id,
@@ -523,7 +520,7 @@ impl SplitWildcard {
                }
            }
            TyKind::Scalar(Scalar::Char) => unhandled(),
-            TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(),
+            TyKind::Scalar(Scalar::Int(..) | Scalar::Uint(..)) => unhandled(),
            TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => {
                smallvec![NonExhaustive]
            }
diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs
index 4b7f31521..7be914451 100644
--- a/crates/hir_ty/src/infer/coerce.rs
+++ b/crates/hir_ty/src/infer/coerce.rs
@@ -47,10 +47,7 @@ impl<'a> InferenceContext<'a> {
        // pointers to have a chance at getting a match. See
        // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916
        let sig = match (ty1.kind(&Interner), ty2.kind(&Interner)) {
-            (TyKind::FnDef(..), TyKind::FnDef(..))
+            (TyKind::FnDef(..) | TyKind::Closure(..), TyKind::FnDef(..) | TyKind::Closure(..)) => {
-            | (TyKind::Closure(..), TyKind::FnDef(..))
-            | (TyKind::FnDef(..), TyKind::Closure(..))
-            | (TyKind::Closure(..), TyKind::Closure(..)) => {
                // FIXME: we're ignoring safety here. To be more correct, if we have one FnDef and one Closure,
                // we should be coercing the closure to a fn pointer of the safety of the FnDef
                cov_mark::hit!(coerce_fn_reification);
@@ -448,8 +445,7 @@ fn safe_to_unsafe_fn_ty(fn_ty: FnPointer) -> FnPointer {
 fn coerce_mutabilities(from: Mutability, to: Mutability) -> Result<(), TypeError> {
    match (from, to) {
-        (Mutability::Mut, Mutability::Mut)
+        (Mutability::Mut, Mutability::Mut | Mutability::Not)
-        | (Mutability::Mut, Mutability::Not)
        | (Mutability::Not, Mutability::Not) => Ok(()),
        (Mutability::Not, Mutability::Mut) => Err(TypeError),
    }
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 5ea2e5934..4e4f6e5a4 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -593,11 +593,11 @@ impl<'a> InferenceContext<'a> {
                    UnaryOp::Neg => {
                        match inner_ty.kind(&Interner) {
                            // Fast path for builtins
-                            TyKind::Scalar(Scalar::Int(_))
+                            TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_))
-                            | TyKind::Scalar(Scalar::Uint(_))
+                            | TyKind::InferenceVar(
-                            | TyKind::Scalar(Scalar::Float(_))
+                                _,
-                            | TyKind::InferenceVar(_, TyVariableKind::Integer)
+                                TyVariableKind::Integer | TyVariableKind::Float,
-                            | TyKind::InferenceVar(_, TyVariableKind::Float) => inner_ty,
+                            ) => inner_ty,
                            // Otherwise we resolve via the std::ops::Neg trait
                            _ => self
                                .resolve_associated_type(inner_ty, self.resolve_ops_neg_output()),
@@ -606,9 +606,7 @@ impl<'a> InferenceContext<'a> {
                    UnaryOp::Not => {
                        match inner_ty.kind(&Interner) {
                            // Fast path for builtins
-                            TyKind::Scalar(Scalar::Bool)
+                            TyKind::Scalar(Scalar::Bool | Scalar::Int(_) | Scalar::Uint(_))
-                            | TyKind::Scalar(Scalar::Int(_))
-                            | TyKind::Scalar(Scalar::Uint(_))
                            | TyKind::InferenceVar(_, TyVariableKind::Integer) => inner_ty,
                            // Otherwise we resolve via the std::ops::Not trait
                            _ => self
@@ -735,7 +733,7 @@ impl<'a> InferenceContext<'a> {
            Expr::Array(array) => {
                let elem_ty =
                    match expected.to_option(&mut self.table).as_ref().map(|t| t.kind(&Interner)) {
-                        Some(TyKind::Array(st, _)) | Some(TyKind::Slice(st)) => st.clone(),
+                        Some(TyKind::Array(st, _) | TyKind::Slice(st)) => st.clone(),
                        _ => self.table.new_type_var(),
                    };
diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs
index 035f4ded6..58cb23e9d 100644
--- a/crates/hir_ty/src/infer/pat.rs
+++ b/crates/hir_ty/src/infer/pat.rs
@@ -297,10 +297,11 @@ fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool {
            Expr::Literal(Literal::String(..)) => false,
            _ => true,
        },
-        Pat::Bind { mode: BindingAnnotation::Mutable, subpat: Some(subpat), .. }
+        Pat::Bind {
-        | Pat::Bind { mode: BindingAnnotation::Unannotated, subpat: Some(subpat), .. } => {
+            mode: BindingAnnotation::Mutable | BindingAnnotation::Unannotated,
-            is_non_ref_pat(body, *subpat)
+            subpat: Some(subpat),
-        }
+            ..
+        } => is_non_ref_pat(body, *subpat),
        Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Box { .. } | Pat::Missing => false,
    }
 }
diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs
index 0222de2bc..5ef6342d5 100644
--- a/crates/hir_ty/src/op.rs
+++ b/crates/hir_ty/src/op.rs
@@ -8,17 +8,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
    match op {
        BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => TyKind::Scalar(Scalar::Bool).intern(&Interner),
        BinaryOp::Assignment { .. } => TyBuilder::unit(),
-        BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => {
+        BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => {
            // all integer combinations are valid here
            if matches!(
                lhs_ty.kind(&Interner),
-                TyKind::Scalar(Scalar::Int(_))
+                TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_))
-                    | TyKind::Scalar(Scalar::Uint(_))
                    | TyKind::InferenceVar(_, TyVariableKind::Integer)
            ) && matches!(
                rhs_ty.kind(&Interner),
-                TyKind::Scalar(Scalar::Int(_))
+                TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_))
-                    | TyKind::Scalar(Scalar::Uint(_))
                    | TyKind::InferenceVar(_, TyVariableKind::Integer)
            ) {
                lhs_ty
@@ -32,15 +30,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
            | (TyKind::Scalar(Scalar::Uint(_)), TyKind::Scalar(Scalar::Uint(_)))
            | (TyKind::Scalar(Scalar::Float(_)), TyKind::Scalar(Scalar::Float(_))) => rhs_ty,
            // ({int}, int) | ({int}, uint)
-            (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Int(_)))
+            (
-            | (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Uint(_))) => {
+                TyKind::InferenceVar(_, TyVariableKind::Integer),
-                rhs_ty
+                TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)),
-            }
+            ) => rhs_ty,
            // (int, {int}) | (uint, {int})
-            (TyKind::Scalar(Scalar::Int(_)), TyKind::InferenceVar(_, TyVariableKind::Integer))
+            (
-            | (TyKind::Scalar(Scalar::Uint(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) => {
+                TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)),
-                lhs_ty
+                TyKind::InferenceVar(_, TyVariableKind::Integer),
-            }
+            ) => lhs_ty,
            // ({float} | float)
            (TyKind::InferenceVar(_, TyVariableKind::Float), TyKind::Scalar(Scalar::Float(_))) => {
                rhs_ty
@@ -69,21 +67,15 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
        BinaryOp::Assignment { op: None } => lhs_ty,
        BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty.kind(&Interner) {
            TyKind::Scalar(_) | TyKind::Str => lhs_ty,
-            TyKind::InferenceVar(_, TyVariableKind::Integer)
+            TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty,
-            | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
            _ => TyKind::Error.intern(&Interner),
        },
-        BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => {
+        BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => TyKind::Error.intern(&Interner),
-            TyKind::Error.intern(&Interner)
-        }
        BinaryOp::CmpOp(CmpOp::Ord { .. })
        | BinaryOp::Assignment { op: Some(_) }
        | BinaryOp::ArithOp(_) => match lhs_ty.kind(&Interner) {
-            TyKind::Scalar(Scalar::Int(_))
+            TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) => lhs_ty,
-            | TyKind::Scalar(Scalar::Uint(_))
+            TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty,
-            | TyKind::Scalar(Scalar::Float(_)) => lhs_ty,
-            TyKind::InferenceVar(_, TyVariableKind::Integer)
-            | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
            _ => TyKind::Error.intern(&Interner),
        },
    }
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 529cf5f33..409f81ca0 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -568,8 +568,6 @@ mod tests {
    use crate::fixture;
-    use super::*;
    fn check_hover_no_result(ra_fixture: &str) {
        let (analysis, position) = fixture::position(ra_fixture);
        assert!(analysis.hover(position, true, true).unwrap().is_none());
@@ -3016,8 +3014,8 @@ fn foo() {
                                    file_id: FileId(
                                        1,
                                    ),
-                                    full_range: 245..427,
+                                    full_range: 248..430,
-                                    focus_range: 284..290,
+                                    focus_range: 287..293,
                                    name: "Future",
                                    kind: Trait,
                                    description: "pub trait Future",
@@ -3813,11 +3811,14 @@ use foo::bar::{self$0};
    #[test]
    fn hover_keyword() {
-        let ra_fixture = r#"//- /main.rs crate:main deps:std
-fn f() { retur$0n; }"#;
-        let fixture = format!("{}\n{}", ra_fixture, FamousDefs::FIXTURE);
        check(
-            &fixture,
+            r#"
+//- /main.rs crate:main deps:std
+fn f() { retur$0n; }
+//- /libstd.rs crate:std
+/// Docs for return_keyword
+mod return_keyword {}
+"#,
            expect![[r#"
                *return*
@@ -3834,11 +3835,15 @@ fn f() { retur$0n; }"#;
    #[test]
    fn hover_builtin() {
-        let ra_fixture = r#"//- /main.rs crate:main deps:std
-cosnt _: &str$0 = ""; }"#;
-        let fixture = format!("{}\n{}", ra_fixture, FamousDefs::FIXTURE);
        check(
-            &fixture,
+            r#"
+//- /main.rs crate:main deps:std
+cosnt _: &str$0 = ""; }
+//- /libstd.rs crate:std
+/// Docs for prim_str
+mod prim_str {}
+"#,
            expect![[r#"
                *str*
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index 93d3760bf..ffa8bd182 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti
 }
 fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
-    matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
+    matches!((left, right), (T![,], T![')'] | T![']']))
 }
 fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 945c9b9e1..5808562a7 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -79,8 +79,7 @@ pub(crate) fn find_all_refs(
                });
                usages.references.retain(|_, it| !it.is_empty());
            }
-            Definition::ModuleDef(hir::ModuleDef::Adt(_))
+            Definition::ModuleDef(hir::ModuleDef::Adt(_) | hir::ModuleDef::Variant(_)) => {
-            | Definition::ModuleDef(hir::ModuleDef::Variant(_)) => {
                refs.for_each(|it| {
                    it.retain(|reference| {
                        reference.name.as_name_ref().map_or(false, is_lit_name_ref)
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index e186b82b7..d44a1b45f 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -294,7 +294,7 @@ fn traverse(
                Some(parent) => {
                    // We only care Name and Name_ref
                    match (token.kind(), parent.kind()) {
-                        (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
+                        (IDENT, NAME | NAME_REF) => parent.into(),
                        _ => token.into(),
                    }
                }
@@ -310,7 +310,7 @@ fn traverse(
                Some(parent) => {
                    // We only care Name and Name_ref
                    match (token.kind(), parent.kind()) {
-                        (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
+                        (IDENT, NAME | NAME_REF) => parent.into(),
                        _ => token.into(),
                    }
                }
diff --git a/crates/ide_assists/src/handlers/apply_demorgan.rs b/crates/ide_assists/src/handlers/apply_demorgan.rs
index c93959e66..e2bd6e456 100644
--- a/crates/ide_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ide_assists/src/handlers/apply_demorgan.rs
@@ -147,74 +147,92 @@ fn opposite_logic_op(kind: ast::BinOp) -> Option<&'static str> {
 #[cfg(test)]
 mod tests {
-    use ide_db::helpers::FamousDefs;
-    use super::*;
    use crate::tests::{check_assist, check_assist_not_applicable};
-    const ORDABLE_FIXTURE: &'static str = r"
+    use super::*;
-//- /lib.rs deps:core crate:ordable
-struct NonOrderable;
-struct Orderable;
-impl core::cmp::Ord for Orderable {}
-";
-    fn check(ra_fixture_before: &str, ra_fixture_after: &str) {
-        let before = &format!(
-            "//- /main.rs crate:main deps:core,ordable\n{}\n{}{}",
-            ra_fixture_before,
-            FamousDefs::FIXTURE,
-            ORDABLE_FIXTURE
-        );
-        check_assist(apply_demorgan, before, &format!("{}\n", ra_fixture_after));
-    }
    #[test]
    fn demorgan_handles_leq() {
-        check(
+        check_assist(
-            r"use ordable::Orderable;
+            apply_demorgan,
+            r#"
+//- minicore: ord, derive
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct S;
 fn f() {
-    Orderable < Orderable &&$0 Orderable <= Orderable
+    S < S &&$0 S <= S
-}",
+}
-            r"use ordable::Orderable;
+"#,
+            r#"
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct S;
 fn f() {
-    !(Orderable >= Orderable || Orderable > Orderable)
+    !(S >= S || S > S)
-}",
+}
+"#,
        );
-        check(
-            r"use ordable::NonOrderable;
+        check_assist(
+            apply_demorgan,
+            r#"
+//- minicore: ord, derive
+struct S;
 fn f() {
-    NonOrderable < NonOrderable &&$0 NonOrderable <= NonOrderable
+    S < S &&$0 S <= S
-}",
+}
-            r"use ordable::NonOrderable;
+"#,
+            r#"
+struct S;
 fn f() {
-    !(!(NonOrderable < NonOrderable) || !(NonOrderable <= NonOrderable))
+    !(!(S < S) || !(S <= S))
-}",
+}
+"#,
        );
    }
    #[test]
    fn demorgan_handles_geq() {
-        check(
+        check_assist(
-            r"use ordable::Orderable;
+            apply_demorgan,
+            r#"
+//- minicore: ord, derive
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct S;
 fn f() {
-    Orderable > Orderable &&$0 Orderable >= Orderable
+    S > S &&$0 S >= S
-}",
+}
-            r"use ordable::Orderable;
+"#,
+            r#"
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct S;
 fn f() {
-    !(Orderable <= Orderable || Orderable < Orderable)
+    !(S <= S || S < S)
-}",
+}
+"#,
        );
-        check(
+        check_assist(
-            r"use ordable::NonOrderable;
+            apply_demorgan,
+            r#"
+//- minicore: ord, derive
+struct S;
 fn f() {
-    Orderable > Orderable &&$0 Orderable >= Orderable
+    S > S &&$0 S >= S
-}",
+}
-            r"use ordable::NonOrderable;
+"#,
+            r#"
+struct S;
 fn f() {
-    !(!(Orderable > Orderable) || !(Orderable >= Orderable))
+    !(!(S > S) || !(S >= S))
-}",
+}
+"#,
        );
    }
diff --git a/crates/ide_assists/src/handlers/convert_into_to_from.rs b/crates/ide_assists/src/handlers/convert_into_to_from.rs
index 199e1ad5c..79a0c4879 100644
--- a/crates/ide_assists/src/handlers/convert_into_to_from.rs
+++ b/crates/ide_assists/src/handlers/convert_into_to_from.rs
@@ -6,6 +6,8 @@ use syntax::ast::{self, AstNode, NameOwner};
 use crate::{AssistContext, AssistId, AssistKind, Assists};
+// FIXME: this should be a diagnostic
 // Assist: convert_into_to_from
 //
 // Converts an Into impl to an equivalent From impl.
@@ -114,12 +116,14 @@ pub(crate) fn convert_into_to_from(acc: &mut Assists, ctx: &AssistContext) -> Op
 mod tests {
    use super::*;
-    use crate::tests::check_assist;
+    use crate::tests::{check_assist, check_assist_not_applicable};
    #[test]
    fn convert_into_to_from_converts_a_struct() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 struct Thing {
    a: String,
    b: usize
@@ -154,8 +158,10 @@ impl From<usize> for Thing {
    #[test]
    fn convert_into_to_from_converts_enums() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 enum Thing {
    Foo(String),
    Bar(String)
@@ -190,8 +196,10 @@ impl From<Thing> for String {
    #[test]
    fn convert_into_to_from_on_enum_with_lifetimes() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 enum Thing<'a> {
    Foo(&'a str),
    Bar(&'a str)
@@ -226,8 +234,10 @@ impl<'a> From<Thing<'a>> for &'a str {
    #[test]
    fn convert_into_to_from_works_on_references() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 struct Thing(String);
 impl $0core::convert::Into<String> for &Thing {
@@ -250,8 +260,10 @@ impl From<&Thing> for String {
    #[test]
    fn convert_into_to_from_works_on_qualified_structs() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 mod things {
    pub struct Thing(String);
    pub struct BetterThing(String);
@@ -280,8 +292,10 @@ impl From<&things::Thing> for things::BetterThing {
    #[test]
    fn convert_into_to_from_works_on_qualified_enums() {
-        check_convert_into_to_from(
+        check_assist(
+            convert_into_to_from,
            r#"
+//- minicore: from
 mod things {
    pub enum Thing {
        A(String)
@@ -323,10 +337,12 @@ impl From<&things::Thing> for things::BetterThing {
    #[test]
    fn convert_into_to_from_not_applicable_on_any_trait_named_into() {
        check_assist_not_applicable(
+            convert_into_to_from,
            r#"
-pub trait Into<T> {{
+//- minicore: from
+pub trait Into<T> {
    pub fn into(self) -> T;
-}}
+}
 struct Thing {
    a: String,
@@ -342,14 +358,4 @@ impl $0Into<Thing> for String {
 "#,
        );
    }
-    fn check_convert_into_to_from(before: &str, after: &str) {
-        let before = &format!("//- /main.rs crate:main deps:core{}{}", before, FamousDefs::FIXTURE);
-        check_assist(convert_into_to_from, before, after);
-    }
-    fn check_assist_not_applicable(before: &str) {
-        let before = &format!("//- /main.rs crate:main deps:core{}{}", before, FamousDefs::FIXTURE);
-        crate::tests::check_assist_not_applicable(convert_into_to_from, before);
-    }
 }
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index f2be091f4..7085a0c48 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -1384,7 +1384,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode)
    for (param, usages) in usages_for_param {
        for usage in usages {
            match usage.syntax().ancestors().skip(1).find_map(ast::Expr::cast) {
-                Some(ast::Expr::MethodCallExpr(_)) | Some(ast::Expr::FieldExpr(_)) => {
+                Some(ast::Expr::MethodCallExpr(_) | ast::Expr::FieldExpr(_)) => {
                    // do nothing
                }
                Some(ast::Expr::RefExpr(node))
diff --git a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
index d3ff7b65c..6c6ff16c2 100644
--- a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -48,6 +48,7 @@ pub(crate) fn extract_struct_from_enum_variant(
    let variant_name = variant.name()?;
    let variant_hir = ctx.sema.to_def(&variant)?;
    if existing_definition(ctx.db(), &variant_name, &variant_hir) {
+        cov_mark::hit!(test_extract_enum_not_applicable_if_struct_exists);
        return None;
    }
@@ -300,18 +301,10 @@ fn reference_to_node(
 #[cfg(test)]
 mod tests {
-    use ide_db::helpers::FamousDefs;
    use crate::tests::{check_assist, check_assist_not_applicable};
    use super::*;
-    fn check_not_applicable(ra_fixture: &str) {
-        let fixture =
-            format!("//- /main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
-        check_assist_not_applicable(extract_struct_from_enum_variant, &fixture)
-    }
    #[test]
    fn test_extract_struct_several_fields_tuple() {
        check_assist(
@@ -699,29 +692,33 @@ fn foo() {
    #[test]
    fn test_extract_enum_not_applicable_for_element_with_no_fields() {
-        check_not_applicable("enum A { $0One }");
+        check_assist_not_applicable(extract_struct_from_enum_variant, r#"enum A { $0One }"#);
    }
    #[test]
    fn test_extract_enum_not_applicable_if_struct_exists() {
-        check_not_applicable(
+        cov_mark::check!(test_extract_enum_not_applicable_if_struct_exists);
-            r#"struct One;
+        check_assist_not_applicable(
-        enum A { $0One(u8, u32) }"#,
+            extract_struct_from_enum_variant,
+            r#"
+struct One;
+enum A { $0One(u8, u32) }
+"#,
        );
    }
    #[test]
    fn test_extract_not_applicable_one_field() {
-        check_not_applicable(r"enum A { $0One(u32) }");
+        check_assist_not_applicable(extract_struct_from_enum_variant, r"enum A { $0One(u32) }");
    }
    #[test]
    fn test_extract_not_applicable_no_field_tuple() {
-        check_not_applicable(r"enum A { $0None() }");
+        check_assist_not_applicable(extract_struct_from_enum_variant, r"enum A { $0None() }");
    }
    #[test]
    fn test_extract_not_applicable_no_field_named() {
-        check_not_applicable(r"enum A { $0None {} }");
+        check_assist_not_applicable(extract_struct_from_enum_variant, r"enum A { $0None {} }");
    }
 }
diff --git a/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs b/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
index 588ee1350..e55c38502 100644
--- a/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
@@ -1,5 +1,4 @@
-use ide_db::helpers::FamousDefs;
+use ide_db::{helpers::FamousDefs, RootDatabase};
-use ide_db::RootDatabase;
 use syntax::ast::{self, AstNode, NameOwner};
 use crate::{AssistContext, AssistId, AssistKind, Assists};
@@ -92,23 +91,20 @@ mod tests {
    use super::*;
-    fn check_not_applicable(ra_fixture: &str) {
-        let fixture =
-            format!("//- /main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
-        check_assist_not_applicable(generate_default_from_enum_variant, &fixture)
-    }
    #[test]
    fn test_generate_default_from_variant() {
        check_assist(
            generate_default_from_enum_variant,
            r#"
+//- minicore: default
 enum Variant {
    Undefined,
    Minor$0,
    Major,
-}"#,
+}
-            r#"enum Variant {
+"#,
+            r#"
+enum Variant {
    Undefined,
    Minor,
    Major,
@@ -118,15 +114,18 @@ impl Default for Variant {
    fn default() -> Self {
        Self::Minor
    }
-}"#,
+}
+"#,
        );
    }
    #[test]
    fn test_generate_default_already_implemented() {
        cov_mark::check!(test_gen_default_impl_already_exists);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_enum_variant,
            r#"
+//- minicore: default
 enum Variant {
    Undefined,
    Minor$0,
@@ -137,20 +136,24 @@ impl Default for Variant {
    fn default() -> Self {
        Self::Minor
    }
-}"#,
+}
+"#,
        );
    }
    #[test]
    fn test_add_from_impl_no_element() {
        cov_mark::check!(test_gen_default_on_non_unit_variant_not_implemented);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_enum_variant,
            r#"
+//- minicore: default
 enum Variant {
    Undefined,
    Minor(u32)$0,
    Major,
-}"#,
+}
+"#,
        );
    }
@@ -158,7 +161,10 @@ enum Variant {
    fn test_generate_default_from_variant_with_one_variant() {
        check_assist(
            generate_default_from_enum_variant,
-            r#"enum Variant { Undefi$0ned }"#,
+            r#"
+//- minicore: default
+enum Variant { Undefi$0ned }
+"#,
            r#"
 enum Variant { Undefined }
@@ -166,7 +172,8 @@ impl Default for Variant {
    fn default() -> Self {
        Self::Undefined
    }
-}"#,
+}
+"#,
        );
    }
 }
diff --git a/crates/ide_assists/src/handlers/generate_default_from_new.rs b/crates/ide_assists/src/handlers/generate_default_from_new.rs
index bad826366..b54ec59da 100644
--- a/crates/ide_assists/src/handlers/generate_default_from_new.rs
+++ b/crates/ide_assists/src/handlers/generate_default_from_new.rs
@@ -1,7 +1,3 @@
-use crate::{
-    assist_context::{AssistContext, Assists},
-    AssistId,
-};
 use ide_db::helpers::FamousDefs;
 use itertools::Itertools;
 use stdx::format_to;
@@ -10,6 +6,11 @@ use syntax::{
    AstNode,
 };
+use crate::{
+    assist_context::{AssistContext, Assists},
+    AssistId,
+};
 // Assist: generate_default_from_new
 //
 // Generates default implementation from new method.
@@ -140,16 +141,16 @@ fn is_default_implemented(ctx: &AssistContext, impl_: &Impl) -> bool {
 #[cfg(test)]
 mod tests {
-    use ide_db::helpers::FamousDefs;
    use crate::tests::{check_assist, check_assist_not_applicable};
    use super::*;
    #[test]
    fn generate_default() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 struct Example { _inner: () }
 impl Example {
@@ -182,8 +183,10 @@ fn main() {}
    #[test]
    fn generate_default2() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 struct Test { value: u32 }
 impl Test {
@@ -212,8 +215,10 @@ impl Default for Test {
    #[test]
    fn new_function_with_generic() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T> {
    _bar: *mut T,
 }
@@ -246,8 +251,10 @@ impl<T> Default for Foo<T> {
    #[test]
    fn new_function_with_generics() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T, B> {
    _tars: *mut T,
    _bar: *mut B,
@@ -282,8 +289,10 @@ impl<T, B> Default for Foo<T, B> {
    #[test]
    fn new_function_with_generic_and_bound() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T> {
    t: T,
 }
@@ -316,8 +325,10 @@ impl<T: From<i32>> Default for Foo<T> {
    #[test]
    fn new_function_with_generics_and_bounds() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T, B> {
    _tars: T,
    _bar: B,
@@ -352,8 +363,10 @@ impl<T: From<i32>, B: From<i64>> Default for Foo<T, B> {
    #[test]
    fn new_function_with_generic_and_where() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T> {
    t: T,
 }
@@ -395,8 +408,10 @@ where
    #[test]
    fn new_function_with_generics_and_wheres() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 pub struct Foo<T, B> {
    _tars: T,
    _bar: B,
@@ -441,8 +456,10 @@ where
    #[test]
    fn new_function_with_parameters() {
        cov_mark::check!(new_function_with_parameters);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_new,
            r#"
+//- minicore: default
 struct Example { _inner: () }
 impl Example {
@@ -457,7 +474,8 @@ impl Example {
    #[test]
    fn other_function_than_new() {
        cov_mark::check!(other_function_than_new);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_new,
            r#"
 struct Example { _inner: () }
@@ -474,8 +492,10 @@ impl Example {
    #[test]
    fn default_block_is_already_present() {
        cov_mark::check!(default_block_is_already_present);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_new,
            r#"
+//- minicore: default
 struct Example { _inner: () }
 impl Example {
@@ -495,7 +515,8 @@ impl Default for Example {
    #[test]
    fn standalone_new_function() {
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_new,
            r#"
 fn n$0ew() -> u32 {
    0
@@ -506,8 +527,10 @@ fn n$0ew() -> u32 {
    #[test]
    fn multiple_struct_blocks() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 struct Example { _inner: () }
 struct Test { value: u32 }
@@ -538,8 +561,10 @@ impl Default for Example {
    #[test]
    fn when_struct_is_after_impl() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 impl Example {
    pub fn $0new() -> Self {
        Self { _inner: () }
@@ -568,8 +593,10 @@ struct Example { _inner: () }
    #[test]
    fn struct_in_module() {
-        check_pass(
+        check_assist(
+            generate_default_from_new,
            r#"
+//- minicore: default
 mod test {
    struct Example { _inner: () }
@@ -603,8 +630,10 @@ impl Default for Example {
    #[test]
    fn struct_in_module_with_default() {
        cov_mark::check!(struct_in_module_with_default);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_default_from_new,
            r#"
+//- minicore: default
 mod test {
    struct Example { _inner: () }
@@ -623,14 +652,4 @@ mod test {
 "#,
        );
    }
-    fn check_pass(before: &str, after: &str) {
-        let before = &format!("//- /main.rs crate:main deps:core{}{}", before, FamousDefs::FIXTURE);
-        check_assist(generate_default_from_new, before, after);
-    }
-    fn check_not_applicable(before: &str) {
-        let before = &format!("//- /main.rs crate:main deps:core{}{}", before, FamousDefs::FIXTURE);
-        check_assist_not_applicable(generate_default_from_new, before);
-    }
 }
diff --git a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
index ce6998d82..8727be07d 100644
--- a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
@@ -110,14 +110,19 @@ mod tests {
    fn test_generate_from_impl_for_enum() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum A { $0One(u32) }",
+            r#"
-            r#"enum A { One(u32) }
+//- minicore: from
+enum A { $0One(u32) }
+"#,
+            r#"
+enum A { One(u32) }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
        Self::One(v)
    }
-}"#,
+}
+"#,
        );
    }
@@ -125,53 +130,71 @@ impl From<u32> for A {
    fn test_generate_from_impl_for_enum_complicated_path() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { $0One(foo::bar::baz::Boo) }"#,
+            r#"
-            r#"enum A { One(foo::bar::baz::Boo) }
+//- minicore: from
+enum A { $0One(foo::bar::baz::Boo) }
+"#,
+            r#"
+enum A { One(foo::bar::baz::Boo) }
 impl From<foo::bar::baz::Boo> for A {
    fn from(v: foo::bar::baz::Boo) -> Self {
        Self::One(v)
    }
-}"#,
+}
+"#,
        );
    }
-    fn check_not_applicable(ra_fixture: &str) {
-        let fixture =
-            format!("//- /main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
-        check_assist_not_applicable(generate_from_impl_for_enum, &fixture)
-    }
    #[test]
    fn test_add_from_impl_no_element() {
-        check_not_applicable("enum A { $0One }");
+        check_assist_not_applicable(
+            generate_from_impl_for_enum,
+            r#"
+//- minicore: from
+enum A { $0One }
+"#,
+        );
    }
    #[test]
    fn test_add_from_impl_more_than_one_element_in_tuple() {
-        check_not_applicable("enum A { $0One(u32, String) }");
+        check_assist_not_applicable(
+            generate_from_impl_for_enum,
+            r#"
+//- minicore: from
+enum A { $0One(u32, String) }
+"#,
+        );
    }
    #[test]
    fn test_add_from_impl_struct_variant() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum A { $0One { x: u32 } }",
+            r#"
-            r#"enum A { One { x: u32 } }
+//- minicore: from
+enum A { $0One { x: u32 } }
+"#,
+            r#"
+enum A { One { x: u32 } }
 impl From<u32> for A {
    fn from(x: u32) -> Self {
        Self::One { x }
    }
-}"#,
+}
+"#,
        );
    }
    #[test]
    fn test_add_from_impl_already_exists() {
        cov_mark::check!(test_add_from_impl_already_exists);
-        check_not_applicable(
+        check_assist_not_applicable(
+            generate_from_impl_for_enum,
            r#"
+//- minicore: from
 enum A { $0One(u32), }
 impl From<u32> for A {
@@ -187,7 +210,9 @@ impl From<u32> for A {
    fn test_add_from_impl_different_variant_impl_exists() {
        check_assist(
            generate_from_impl_for_enum,
-            r#"enum A { $0One(u32), Two(String), }
+            r#"
+//- minicore: from
+enum A { $0One(u32), Two(String), }
 impl From<String> for A {
    fn from(v: String) -> Self {
@@ -197,8 +222,10 @@ impl From<String> for A {
 pub trait From<T> {
    fn from(T) -> Self;
-}"#,
+}
-            r#"enum A { One(u32), Two(String), }
+"#,
+            r#"
+enum A { One(u32), Two(String), }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
@@ -214,7 +241,8 @@ impl From<String> for A {
 pub trait From<T> {
    fn from(T) -> Self;
-}"#,
+}
+"#,
        );
    }
@@ -222,14 +250,19 @@ pub trait From<T> {
    fn test_add_from_impl_static_str() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum A { $0One(&'static str) }",
+            r#"
-            r#"enum A { One(&'static str) }
+//- minicore: from
+enum A { $0One(&'static str) }
+"#,
+            r#"
+enum A { One(&'static str) }
 impl From<&'static str> for A {
    fn from(v: &'static str) -> Self {
        Self::One(v)
    }
-}"#,
+}
+"#,
        );
    }
@@ -237,14 +270,19 @@ impl From<&'static str> for A {
    fn test_add_from_impl_generic_enum() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum Generic<T, U: Clone> { $0One(T), Two(U) }",
+            r#"
-            r#"enum Generic<T, U: Clone> { One(T), Two(U) }
+//- minicore: from
+enum Generic<T, U: Clone> { $0One(T), Two(U) }
+"#,
+            r#"
+enum Generic<T, U: Clone> { One(T), Two(U) }
 impl<T, U: Clone> From<T> for Generic<T, U> {
    fn from(v: T) -> Self {
        Self::One(v)
    }
-}"#,
+}
+"#,
        );
    }
@@ -252,14 +290,19 @@ impl<T, U: Clone> From<T> for Generic<T, U> {
    fn test_add_from_impl_with_lifetime() {
        check_assist(
            generate_from_impl_for_enum,
-            "enum Generic<'a> { $0One(&'a i32) }",
+            r#"
-            r#"enum Generic<'a> { One(&'a i32) }
+//- minicore: from
+enum Generic<'a> { $0One(&'a i32) }
+"#,
+            r#"
+enum Generic<'a> { One(&'a i32) }
 impl<'a> From<&'a i32> for Generic<'a> {
    fn from(v: &'a i32) -> Self {
        Self::One(v)
    }
-}"#,
+}
+"#,
        );
    }
 }
diff --git a/crates/ide_assists/src/handlers/inline_local_variable.rs b/crates/ide_assists/src/handlers/inline_local_variable.rs
index 2441dbb8b..945d28650 100644
--- a/crates/ide_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide_assists/src/handlers/inline_local_variable.rs
@@ -65,32 +65,35 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
                        Some(u) => u,
                        None => return Some(false),
                    };
+                    Some(
-                    Some(!matches!(
+                        !(matches!(
-                        (&initializer_expr, usage_parent),
+                            initializer_expr,
-                        (ast::Expr::CallExpr(_), _)
+                            ast::Expr::CallExpr(_)
-                            | (ast::Expr::IndexExpr(_), _)
+                                | ast::Expr::IndexExpr(_)
-                            | (ast::Expr::MethodCallExpr(_), _)
+                                | ast::Expr::MethodCallExpr(_)
-                            | (ast::Expr::FieldExpr(_), _)
+                                | ast::Expr::FieldExpr(_)
-                            | (ast::Expr::TryExpr(_), _)
+                                | ast::Expr::TryExpr(_)
-                            | (ast::Expr::RefExpr(_), _)
+                                | ast::Expr::RefExpr(_)
-                            | (ast::Expr::Literal(_), _)
+                                | ast::Expr::Literal(_)
-                            | (ast::Expr::TupleExpr(_), _)
+                                | ast::Expr::TupleExpr(_)
-                            | (ast::Expr::ArrayExpr(_), _)
+                                | ast::Expr::ArrayExpr(_)
-                            | (ast::Expr::ParenExpr(_), _)
+                                | ast::Expr::ParenExpr(_)
-                            | (ast::Expr::PathExpr(_), _)
+                                | ast::Expr::PathExpr(_)
-                            | (ast::Expr::BlockExpr(_), _)
+                                | ast::Expr::BlockExpr(_)
-                            | (ast::Expr::EffectExpr(_), _)
+                                | ast::Expr::EffectExpr(_),
-                            | (_, ast::Expr::CallExpr(_))
+                        ) || matches!(
-                            | (_, ast::Expr::TupleExpr(_))
+                            usage_parent,
-                            | (_, ast::Expr::ArrayExpr(_))
+                            ast::Expr::CallExpr(_)
-                            | (_, ast::Expr::ParenExpr(_))
+                                | ast::Expr::TupleExpr(_)
-                            | (_, ast::Expr::ForExpr(_))
+                                | ast::Expr::ArrayExpr(_)
-                            | (_, ast::Expr::WhileExpr(_))
+                                | ast::Expr::ParenExpr(_)
-                            | (_, ast::Expr::BreakExpr(_))
+                                | ast::Expr::ForExpr(_)
-                            | (_, ast::Expr::ReturnExpr(_))
+                                | ast::Expr::WhileExpr(_)
-                            | (_, ast::Expr::MatchExpr(_))
+                                | ast::Expr::BreakExpr(_)
-                    ))
+                                | ast::Expr::ReturnExpr(_)
+                                | ast::Expr::MatchExpr(_)
+                        )),
+                    )
                })
                .collect::<Option<_>>()
                .map(|b| (file_id, b))
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 60cecd94c..4e96ff1ec 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -35,6 +35,7 @@ pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) {
    RootDatabase::with_single_file(text)
 }
+#[track_caller]
 pub(crate) fn check_assist(assist: Handler, ra_fixture_before: &str, ra_fixture_after: &str) {
    let ra_fixture_after = trim_indent(ra_fixture_after);
    check(assist, ra_fixture_before, ExpectedResult::After(&ra_fixture_after), None);
@@ -179,9 +180,10 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
            "unresolved assist should not contain source changes"
        ),
        (Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"),
-        (None, ExpectedResult::After(_))
+        (
-        | (None, ExpectedResult::Target(_))
+            None,
-        | (None, ExpectedResult::Unresolved) => {
+            ExpectedResult::After(_) | ExpectedResult::Target(_) | ExpectedResult::Unresolved,
+        ) => {
            panic!("code action is not applicable")
        }
        (None, ExpectedResult::NotApplicable) => (),
diff --git a/crates/ide_completion/src/completions/attribute.rs b/crates/ide_completion/src/completions/attribute.rs
index ab24a6521..78fc30e16 100644
--- a/crates/ide_completion/src/completions/attribute.rs
+++ b/crates/ide_completion/src/completions/attribute.rs
@@ -17,12 +17,14 @@ use crate::{
 mod derive;
 mod lint;
+mod repr;
 pub(crate) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
    let attribute = ctx.attribute_under_caret.as_ref()?;
    match (attribute.path().and_then(|p| p.as_single_name_ref()), attribute.token_tree()) {
        (Some(path), Some(token_tree)) => match path.text().as_str() {
            "derive" => derive::complete_derive(acc, ctx, token_tree),
+            "repr" => repr::complete_repr(acc, ctx, token_tree),
            "feature" => lint::complete_lint(acc, ctx, token_tree, FEATURES),
            "allow" | "warn" | "deny" | "forbid" => {
                lint::complete_lint(acc, ctx, token_tree.clone(), DEFAULT_LINTS);
diff --git a/crates/ide_completion/src/completions/attribute/repr.rs b/crates/ide_completion/src/completions/attribute/repr.rs
new file mode 100644
index 000000000..92a262a43
--- /dev/null
+++ b/crates/ide_completion/src/completions/attribute/repr.rs
@@ -0,0 +1,199 @@
+//! Completion for representations.
+use syntax::ast;
+use crate::{
+    context::CompletionContext,
+    item::{CompletionItem, CompletionItemKind, CompletionKind},
+    Completions,
+};
+pub(super) fn complete_repr(
+    acc: &mut Completions,
+    ctx: &CompletionContext,
+    derive_input: ast::TokenTree,
+) {
+    if let Some(existing_reprs) = super::parse_comma_sep_input(derive_input) {
+        for repr_completion in REPR_COMPLETIONS {
+            if existing_reprs
+                .iter()
+                .any(|it| repr_completion.label == it || repr_completion.collides.contains(&&**it))
+            {
+                continue;
+            }
+            let mut item = CompletionItem::new(
+                CompletionKind::Attribute,
+                ctx.source_range(),
+                repr_completion.label,
+            );
+            item.kind(CompletionItemKind::Attribute);
+            if let Some(lookup) = repr_completion.lookup {
+                item.lookup_by(lookup);
+            }
+            if let Some((snippet, cap)) = repr_completion.snippet.zip(ctx.config.snippet_cap) {
+                item.insert_snippet(cap, snippet);
+            }
+            item.add_to(acc);
+        }
+    }
+}
+struct ReprCompletion {
+    label: &'static str,
+    snippet: Option<&'static str>,
+    lookup: Option<&'static str>,
+    collides: &'static [&'static str],
+}
+const fn attr(label: &'static str, collides: &'static [&'static str]) -> ReprCompletion {
+    ReprCompletion { label, snippet: None, lookup: None, collides }
+}
+#[rustfmt::skip]
+const REPR_COMPLETIONS: &[ReprCompletion] = &[
+    ReprCompletion { label: "align($0)", snippet: Some("align($0)"), lookup: Some("align"), collides: &["transparent", "packed"] },
+    attr("packed", &["transparent", "align"]),
+    attr("transparent", &["C", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("C", &["transparent"]),
+    attr("u8",     &["transparent", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("u16",    &["transparent", "u8", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("u32",    &["transparent", "u8", "u16", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("u64",    &["transparent", "u8", "u16", "u32", "u128", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("u128",   &["transparent", "u8", "u16", "u32", "u64", "usize", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("usize",  &["transparent", "u8", "u16", "u32", "u64", "u128", "i8", "i16", "i32", "i64", "i128", "isize"]),
+    attr("i8",     &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i16", "i32", "i64", "i128", "isize"]),
+    attr("i16",    &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i32", "i64", "i128", "isize"]),
+    attr("i32",    &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i64", "i128", "isize"]),
+    attr("i64",    &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i128", "isize"]),
+    attr("i28",    &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "isize"]),
+    attr("isize",  &["transparent", "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64", "i128"]),
+];
+#[cfg(test)]
+mod tests {
+    use expect_test::{expect, Expect};
+    use crate::tests::completion_list;
+    fn check(ra_fixture: &str, expect: Expect) {
+        let actual = completion_list(ra_fixture);
+        expect.assert_eq(&actual);
+    }
+    #[test]
+    fn no_completion_for_incorrect_repr() {
+        check(r#"#[repr{$0)] struct Test;"#, expect![[]])
+    }
+    #[test]
+    fn empty() {
+        check(
+            r#"#[repr($0)] struct Test;"#,
+            expect![[r#"
+                at align($0)
+                at packed
+                at transparent
+                at C
+                at u8
+                at u16
+                at u32
+                at u64
+                at u128
+                at usize
+                at i8
+                at i16
+                at i32
+                at i64
+                at i28
+                at isize
+            "#]],
+        );
+    }
+    #[test]
+    fn transparent() {
+        check(r#"#[repr(transparent, $0)] struct Test;"#, expect![[r#""#]]);
+    }
+    #[test]
+    fn align() {
+        check(
+            r#"#[repr(align(1), $0)] struct Test;"#,
+            expect![[r#"
+                at align($0)
+                at transparent
+                at C
+                at u8
+                at u16
+                at u32
+                at u64
+                at u128
+                at usize
+                at i8
+                at i16
+                at i32
+                at i64
+                at i28
+                at isize
+            "#]],
+        );
+    }
+    #[test]
+    fn packed() {
+        check(
+            r#"#[repr(packed, $0)] struct Test;"#,
+            expect![[r#"
+                at transparent
+                at C
+                at u8
+                at u16
+                at u32
+                at u64
+                at u128
+                at usize
+                at i8
+                at i16
+                at i32
+                at i64
+                at i28
+                at isize
+            "#]],
+        );
+    }
+    #[test]
+    fn c() {
+        check(
+            r#"#[repr(C, $0)] struct Test;"#,
+            expect![[r#"
+                at align($0)
+                at packed
+                at u8
+                at u16
+                at u32
+                at u64
+                at u128
+                at usize
+                at i8
+                at i16
+                at i32
+                at i64
+                at i28
+                at isize
+            "#]],
+        );
+    }
+    #[test]
+    fn prim() {
+        check(
+            r#"#[repr(usize, $0)] struct Test;"#,
+            expect![[r#"
+                at align($0)
+                at packed
+                at C
+            "#]],
+        );
+    }
+}
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs
index 88f4d940d..f5dbd203b 100644
--- a/crates/ide_completion/src/completions/qualified_path.rs
+++ b/crates/ide_completion/src/completions/qualified_path.rs
@@ -65,9 +65,11 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                    // Don't suggest attribute macros and derives.
                    hir::ScopeDef::MacroDef(mac) => mac.is_fn_like(),
                    // no values in type places
-                    hir::ScopeDef::ModuleDef(hir::ModuleDef::Function(_))
+                    hir::ScopeDef::ModuleDef(
-                    | hir::ScopeDef::ModuleDef(hir::ModuleDef::Variant(_))
+                        hir::ModuleDef::Function(_)
-                    | hir::ScopeDef::ModuleDef(hir::ModuleDef::Static(_))
+                        | hir::ModuleDef::Variant(_)
+                        | hir::ModuleDef::Static(_),
+                    )
                    | hir::ScopeDef::Local(_) => !ctx.expects_type(),
                    // unless its a constant in a generic arg list position
                    hir::ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) => {
@@ -81,9 +83,13 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                }
            }
        }
-        hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_))
+        hir::PathResolution::Def(
-        | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_))
+            def
-        | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => {
+            @
+            (hir::ModuleDef::Adt(_)
+            | hir::ModuleDef::TypeAlias(_)
+            | hir::ModuleDef::BuiltinType(_)),
+        ) => {
            if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def {
                add_enum_variants(acc, ctx, e);
            }
diff --git a/crates/ide_completion/src/completions/record.rs b/crates/ide_completion/src/completions/record.rs
index 47523f72f..e876337f1 100644
--- a/crates/ide_completion/src/completions/record.rs
+++ b/crates/ide_completion/src/completions/record.rs
@@ -48,10 +48,9 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
 #[cfg(test)]
 mod tests {
    use expect_test::{expect, Expect};
-    use ide_db::helpers::FamousDefs;
    use crate::{
-        tests::{self, filtered_completion_list},
+        tests::{check_edit, filtered_completion_list},
        CompletionKind,
    };
@@ -61,31 +60,17 @@ mod tests {
    }
    fn check_snippet(ra_fixture: &str, expect: Expect) {
-        let actual = filtered_completion_list(
+        let actual = filtered_completion_list(ra_fixture, CompletionKind::Snippet);
-            &format!("//- /main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE),
-            CompletionKind::Snippet,
-        );
        expect.assert_eq(&actual);
    }
-    fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
-        tests::check_edit(
-            what,
-            &format!(
-                "//- /main.rs crate:main deps:core{}\n{}",
-                ra_fixture_before,
-                FamousDefs::FIXTURE,
-            ),
-            &(ra_fixture_after.to_owned() + "\n"),
-        );
-    }
    #[test]
    fn test_record_literal_field_default() {
        let test_code = r#"
+//- minicore: default
 struct S { foo: u32, bar: usize }
-impl core::default::Default for S {
+impl Default for S {
    fn default() -> Self {
        S {
            foo: 0,
@@ -121,9 +106,10 @@ fn process(f: S) {
        check_edit(
            "..Default::default()",
            r#"
+//- minicore: default
 struct S { foo: u32, bar: usize }
-impl core::default::Default for S {
+impl Default for S {
    fn default() -> Self {
        S {
            foo: 0,
@@ -142,7 +128,7 @@ fn process(f: S) {
            r#"
 struct S { foo: u32, bar: usize }
-impl core::default::Default for S {
+impl Default for S {
    fn default() -> Self {
        S {
            foo: 0,
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs
index 8ea5a2d5b..81c4fb305 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -74,9 +74,11 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
            // Don't suggest attribute macros and derives.
            ScopeDef::MacroDef(mac) => mac.is_fn_like(),
            // no values in type places
-            ScopeDef::ModuleDef(hir::ModuleDef::Function(_))
+            ScopeDef::ModuleDef(
-            | ScopeDef::ModuleDef(hir::ModuleDef::Variant(_))
+                hir::ModuleDef::Function(_)
-            | ScopeDef::ModuleDef(hir::ModuleDef::Static(_))
+                | hir::ModuleDef::Variant(_)
+                | hir::ModuleDef::Static(_),
+            )
            | ScopeDef::Local(_) => !ctx.expects_type(),
            // unless its a constant in a generic arg list position
            ScopeDef::ModuleDef(hir::ModuleDef::Const(_))
diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs
index d7a7e9cca..98fb36042 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@@ -242,24 +242,23 @@ impl<'a> CompletionContext<'a> {
    }
    pub(crate) fn expects_assoc_item(&self) -> bool {
-        matches!(
+        matches!(self.completion_location, Some(ImmediateLocation::Trait | ImmediateLocation::Impl))
-            self.completion_location,
-            Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl)
-        )
    }
    pub(crate) fn has_dot_receiver(&self) -> bool {
        matches!(
            &self.completion_location,
-            Some(ImmediateLocation::FieldAccess { receiver, .. }) | Some(ImmediateLocation::MethodCall { receiver,.. })
+            Some(ImmediateLocation::FieldAccess { receiver, .. } | ImmediateLocation::MethodCall { receiver,.. })
                if receiver.is_some()
        )
    }
    pub(crate) fn dot_receiver(&self) -> Option<&ast::Expr> {
        match &self.completion_location {
-            Some(ImmediateLocation::MethodCall { receiver, .. })
+            Some(
-            | Some(ImmediateLocation::FieldAccess { receiver, .. }) => receiver.as_ref(),
+                ImmediateLocation::MethodCall { receiver, .. }
+                | ImmediateLocation::FieldAccess { receiver, .. },
+            ) => receiver.as_ref(),
            _ => None,
        }
    }
@@ -283,7 +282,7 @@ impl<'a> CompletionContext<'a> {
    pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool {
        matches!(
            self.completion_location,
-            Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefExpr)
+            Some(ImmediateLocation::IdentPat | ImmediateLocation::RefExpr)
        )
    }
@@ -294,14 +293,14 @@ impl<'a> CompletionContext<'a> {
    pub(crate) fn in_use_tree(&self) -> bool {
        matches!(
            self.completion_location,
-            Some(ImmediateLocation::Use) | Some(ImmediateLocation::UseTree)
+            Some(ImmediateLocation::Use | ImmediateLocation::UseTree)
        )
    }
    pub(crate) fn has_impl_or_trait_prev_sibling(&self) -> bool {
        matches!(
            self.prev_sibling,
-            Some(ImmediatePrevSibling::ImplDefType) | Some(ImmediatePrevSibling::TraitDefName)
+            Some(ImmediatePrevSibling::ImplDefType | ImmediatePrevSibling::TraitDefName)
        )
    }
@@ -322,14 +321,16 @@ impl<'a> CompletionContext<'a> {
            || self.previous_token_is(T![unsafe])
            || matches!(
                self.prev_sibling,
-                Some(ImmediatePrevSibling::Attribute) | Some(ImmediatePrevSibling::Visibility)
+                Some(ImmediatePrevSibling::Attribute | ImmediatePrevSibling::Visibility)
            )
            || matches!(
                self.completion_location,
-                Some(ImmediateLocation::Attribute(_))
+                Some(
-                    | Some(ImmediateLocation::ModDeclaration(_))
+                    ImmediateLocation::Attribute(_)
-                    | Some(ImmediateLocation::RecordPat(_))
+                        | ImmediateLocation::ModDeclaration(_)
-                    | Some(ImmediateLocation::RecordExpr(_))
+                        | ImmediateLocation::RecordPat(_)
+                        | ImmediateLocation::RecordExpr(_)
+                )
            )
    }
diff --git a/crates/ide_completion/src/render/builder_ext.rs b/crates/ide_completion/src/render/builder_ext.rs
index 749dfc665..33d3a5ee1 100644
--- a/crates/ide_completion/src/render/builder_ext.rs
+++ b/crates/ide_completion/src/render/builder_ext.rs
@@ -32,7 +32,7 @@ impl Builder {
            cov_mark::hit!(no_parens_in_use_item);
            return false;
        }
-        if matches!(ctx.path_call_kind(), Some(CallKind::Expr) | Some(CallKind::Pat))
+        if matches!(ctx.path_call_kind(), Some(CallKind::Expr | CallKind::Pat))
            | matches!(
                ctx.completion_location,
                Some(ImmediateLocation::MethodCall { has_parens: true, .. })
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index 00900cdc2..d96028cbc 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -74,12 +74,19 @@ pub fn visit_file_defs(
 /// somewhat similar to the known paths infra inside hir, but it different; We
 /// want to make sure that IDE specific paths don't become interesting inside
 /// the compiler itself as well.
+///
+/// Note that, by default, rust-analyzer tests **do not** include core or std
+/// libraries. If you are writing tests for functionality using [`FamousDefs`],
+/// you'd want to include [minicore](test_utils::MiniCore) declaration at the
+/// start of your tests:
+///
+/// ```
+/// //- minicore: iterator, ord, derive
+/// ```
 pub struct FamousDefs<'a, 'b>(pub &'a Semantics<'b, RootDatabase>, pub Option<Crate>);
 #[allow(non_snake_case)]
 impl FamousDefs<'_, '_> {
-    pub const FIXTURE: &'static str = include_str!("helpers/famous_defs_fixture.rs");
    pub fn std(&self) -> Option<Crate> {
        self.find_crate("std")
    }
diff --git a/crates/ide_db/src/helpers/famous_defs_fixture.rs b/crates/ide_db/src/helpers/famous_defs_fixture.rs
deleted file mode 100644
index 551203936..000000000
--- a/crates/ide_db/src/helpers/famous_defs_fixture.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-//- /libcore.rs crate:core
-//! Signatures of traits, types and functions from the core lib for use in tests.
-pub mod cmp {
-    pub trait Ord {
-        fn cmp(&self, other: &Self) -> Ordering;
-        fn max(self, other: Self) -> Self;
-        fn min(self, other: Self) -> Self;
-        fn clamp(self, min: Self, max: Self) -> Self;
-    }
-}
-pub mod convert {
-    pub trait From<T> {
-        fn from(t: T) -> Self;
-    }
-    pub trait Into<T> {
-        pub fn into(self) -> T;
-    }
-}
-pub mod default {
-    pub trait Default {
-        fn default() -> Self;
-    }
-}
-pub mod option {
-    pub enum Option<T> {
-        None,
-        Some(T),
-    }
-}
-pub mod prelude {
-    pub mod rust_2018 {
-        pub use crate::{
-            cmp::Ord,
-            convert::{From, Into},
-            default::Default,
-            iter::{IntoIterator, Iterator},
-            ops::{Fn, FnMut, FnOnce},
-            option::Option::{self, *},
-        };
-    }
-}
-#[prelude_import]
-pub use prelude::rust_2018::*;
-//- /libstd.rs crate:std deps:core
-//! Signatures of traits, types and functions from the std lib for use in tests.
-/// Docs for return_keyword
-mod return_keyword {}
-/// Docs for prim_str
-mod prim_str {}
-pub use core::ops;
diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs
index c2a9a38c9..b4f2fe9a4 100644
--- a/crates/mbe/src/expander/matcher.rs
+++ b/crates/mbe/src/expander/matcher.rs
@@ -804,33 +804,17 @@ impl<'a> TtIter<'a> {
        };
        match (punct.char, second, third) {
-            ('.', '.', Some('.'))
+            ('.', '.', Some('.' | '=')) | ('<', '<', Some('=')) | ('>', '>', Some('=')) => {
-            | ('.', '.', Some('='))
-            | ('<', '<', Some('='))
-            | ('>', '>', Some('=')) => {
                let tt2 = self.next().unwrap().clone();
                let tt3 = self.next().unwrap().clone();
                Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2, tt3] }.into())
            }
-            ('-', '=', _)
+            ('-' | '!' | '*' | '/' | '&' | '%' | '^' | '+' | '<' | '=' | '>' | '|', '=', _)
-            | ('-', '>', _)
+            | ('-' | '=' | '>', '>', _)
            | (':', ':', _)
-            | ('!', '=', _)
            | ('.', '.', _)
-            | ('*', '=', _)
-            | ('/', '=', _)
            | ('&', '&', _)
-            | ('&', '=', _)
-            | ('%', '=', _)
-            | ('^', '=', _)
-            | ('+', '=', _)
            | ('<', '<', _)
-            | ('<', '=', _)
-            | ('=', '=', _)
-            | ('=', '>', _)
-            | ('>', '=', _)
-            | ('>', '>', _)
-            | ('|', '=', _)
            | ('|', '|', _) => {
                let tt2 = self.next().unwrap().clone();
                Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into())
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs
index 01ee26a53..5a78675fb 100644
--- a/crates/parser/src/grammar/params.rs
+++ b/crates/parser/src/grammar/params.rs
@@ -184,8 +184,7 @@ fn opt_self_param(p: &mut Parser, m: Marker) -> Result<(), Marker> {
        if !matches!(
            (p.current(), la1, la2, la3),
            (T![&], T![self], _, _)
-                | (T![&], T![mut], T![self], _)
+                | (T![&], T![mut] | LIFETIME_IDENT, T![self], _)
-                | (T![&], LIFETIME_IDENT, T![self], _)
                | (T![&], LIFETIME_IDENT, T![mut], T![self])
        ) {
            return Err(m);
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
index d5ab03576..a7f936a70 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
@@ -54,7 +54,7 @@
            source: Some(
                "rustc",
            ),
-            message: "can\'t compare `{integer}` with `&str`\nthe trait `std::cmp::PartialEq<&str>` is not implemented for `{integer}`",
+            message: "can't compare `{integer}` with `&str`\nthe trait `std::cmp::PartialEq<&str>` is not implemented for `{integer}`",
            related_information: None,
            tags: None,
            data: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
index ada540ea6..afc562a0e 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
@@ -54,7 +54,7 @@
            source: Some(
                "rustc",
            ),
-            message: "method `next` has an incompatible type for trait\nexpected type `fn(&mut ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&ty::Ref<M>>`\n   found type `fn(&ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&\'list ty::Ref<M>>`",
+            message: "method `next` has an incompatible type for trait\nexpected type `fn(&mut ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&ty::Ref<M>>`\n   found type `fn(&ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&'list ty::Ref<M>>`",
            related_information: None,
            tags: None,
            data: None,
diff --git a/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
index 4d5ad74df..135f49552 100644
--- a/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
@@ -1,2 +1,2 @@
-CHAR 1 "\'"
+CHAR 1 "'"
-> error0..1 token("\'") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..1 token("'") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
index eafdb3c7c..cc3933d95 100644
--- a/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
@@ -1,2 +1,2 @@
-CHAR 5 "\'🦀"
+CHAR 5 "'🦀"
-> error0..5 token("\'🦀") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..5 token("'🦀") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
index cc2b4866a..21d990e6f 100644
--- a/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
@@ -1,2 +1,2 @@
-CHAR 5 "\'\\x7f"
+CHAR 5 "'\\x7f"
-> error0..5 token("\'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..5 token("'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
index a6d422cb3..055dba64c 100644
--- a/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
@@ -1,2 +1,2 @@
-CHAR 9 "\'\\u{20AA}"
+CHAR 9 "'\\u{20AA}"
-> error0..9 token("\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..9 token("'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
index 47e7baa70..9ee5e93fa 100644
--- a/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
@@ -1,2 +1,2 @@
-CHAR 2 "\' "
+CHAR 2 "' "
-> error0..2 token("\' ") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..2 token("' ") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
index 511029d80..dc3a596f6 100644
--- a/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
@@ -1,2 +1,2 @@
-CHAR 2 "\'\\"
+CHAR 2 "'\\"
-> error0..2 token("\'\\") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..2 token("'\\") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
index d2ba5742c..e46edea98 100644
--- a/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
@@ -1,2 +1,2 @@
-CHAR 3 "\'\\n"
+CHAR 3 "'\\n"
-> error0..3 token("\'\\n") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..3 token("'\\n") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
index ae9a7f0e2..8ad1e913a 100644
--- a/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
@@ -1,2 +1,2 @@
-CHAR 3 "\'\\\'"
+CHAR 3 "'\\'"
-> error0..3 token("\'\\\'") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..3 token("'\\'") msg(Missing trailing `'` symbol to terminate the character literal)
diff --git a/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
index ff1504592..9d30c7466 100644
--- a/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
@@ -1,2 +1,2 @@
-BYTE 2 "b\'"
+BYTE 2 "b'"
-> error0..2 token("b\'") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..2 token("b'") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
index 34f7bd6d4..9dbf4203e 100644
--- a/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
@@ -1,2 +1,2 @@
-BYTE 6 "b\'🦀"
+BYTE 6 "b'🦀"
-> error0..6 token("b\'🦀") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..6 token("b'🦀") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
index c964d0f00..d5d9c2ef7 100644
--- a/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
@@ -1,2 +1,2 @@
-BYTE 6 "b\'\\x7f"
+BYTE 6 "b'\\x7f"
-> error0..6 token("b\'\\x7f") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..6 token("b'\\x7f") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
index cc65fb86f..a99b9666a 100644
--- a/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
@@ -1,2 +1,2 @@
-BYTE 10 "b\'\\u{20AA}"
+BYTE 10 "b'\\u{20AA}"
-> error0..10 token("b\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..10 token("b'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
index 800834a14..8a344f712 100644
--- a/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
@@ -1,2 +1,2 @@
-BYTE 3 "b\' "
+BYTE 3 "b' "
-> error0..3 token("b\' ") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..3 token("b' ") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
index 7b85ee646..b78a43c02 100644
--- a/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
@@ -1,2 +1,2 @@
-BYTE 3 "b\'\\"
+BYTE 3 "b'\\"
-> error0..3 token("b\'\\") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..3 token("b'\\") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
index 4b9a63117..5147363ba 100644
--- a/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
@@ -1,2 +1,2 @@
-BYTE 4 "b\'\\n"
+BYTE 4 "b'\\n"
-> error0..4 token("b\'\\n") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..4 token("b'\\n") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
index fe337f8d3..261c0894f 100644
--- a/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
@@ -1,2 +1,2 @@
-BYTE 4 "b\'\\\'"
+BYTE 4 "b'\\'"
-> error0..4 token("b\'\\\'") msg(Missing trailing `'` symbol to terminate the byte literal)
+> error0..4 token("b'\\'") msg(Missing trailing `'` symbol to terminate the byte literal)
diff --git a/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt b/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt
index 11e0ae14a..b746404d2 100644
--- a/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt
+++ b/crates/syntax/test_data/lexer/err/0057_lifetime_starts_with_a_number.txt
@@ -1,6 +1,6 @@
-LIFETIME_IDENT 2 "\'1"
+LIFETIME_IDENT 2 "'1"
 WHITESPACE 1 "\n"
-LIFETIME_IDENT 10 "\'1lifetime"
+LIFETIME_IDENT 10 "'1lifetime"
 WHITESPACE 1 "\n"
-> error0..2 token("\'1") msg(Lifetime name cannot start with a number)
+> error0..2 token("'1") msg(Lifetime name cannot start with a number)
-> error3..13 token("\'1lifetime") msg(Lifetime name cannot start with a number)
+> error3..13 token("'1lifetime") msg(Lifetime name cannot start with a number)
diff --git a/crates/syntax/test_data/lexer/ok/0006_chars.txt b/crates/syntax/test_data/lexer/ok/0006_chars.txt
index 950954fbc..756477dc9 100644
--- a/crates/syntax/test_data/lexer/ok/0006_chars.txt
+++ b/crates/syntax/test_data/lexer/ok/0006_chars.txt
@@ -1,16 +1,16 @@
-CHAR 3 "\'x\'"
+CHAR 3 "'x'"
 WHITESPACE 1 " "
-CHAR 3 "\' \'"
+CHAR 3 "' '"
 WHITESPACE 1 " "
-CHAR 3 "\'0\'"
+CHAR 3 "'0'"
 WHITESPACE 1 " "
-CHAR 7 "\'hello\'"
+CHAR 7 "'hello'"
 WHITESPACE 1 " "
-CHAR 6 "\'\\x7f\'"
+CHAR 6 "'\\x7f'"
 WHITESPACE 1 " "
-CHAR 4 "\'\\n\'"
+CHAR 4 "'\\n'"
 WHITESPACE 1 " "
-CHAR 4 "\'\\\\\'"
+CHAR 4 "'\\\\'"
 WHITESPACE 1 " "
-CHAR 4 "\'\\\'\'"
+CHAR 4 "'\\''"
 WHITESPACE 1 "\n"
diff --git a/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt
index 4d6625c3a..32ed9ed50 100644
--- a/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt
+++ b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt
@@ -1,8 +1,8 @@
-LIFETIME_IDENT 2 "\'a"
+LIFETIME_IDENT 2 "'a"
 WHITESPACE 1 " "
-LIFETIME_IDENT 4 "\'foo"
+LIFETIME_IDENT 4 "'foo"
 WHITESPACE 1 " "
-LIFETIME_IDENT 12 "\'foo_bar_baz"
+LIFETIME_IDENT 12 "'foo_bar_baz"
 WHITESPACE 1 " "
-LIFETIME_IDENT 2 "\'_"
+LIFETIME_IDENT 2 "'_"
 WHITESPACE 1 "\n"
diff --git a/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt
index e61ad99be..06d6bdd1f 100644
--- a/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt
+++ b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt
@@ -1,22 +1,22 @@
-BYTE 3 "b\'\'"
+BYTE 3 "b''"
 WHITESPACE 1 " "
-BYTE 4 "b\'x\'"
+BYTE 4 "b'x'"
 WHITESPACE 1 " "
 BYTE_STRING 6 "b\"foo\""
 WHITESPACE 1 " "
 BYTE_STRING 4 "br\"\""
 WHITESPACE 1 "\n"
-BYTE 6 "b\'\'suf"
+BYTE 6 "b''suf"
 WHITESPACE 1 " "
 BYTE_STRING 5 "b\"\"ix"
 WHITESPACE 1 " "
 BYTE_STRING 6 "br\"\"br"
 WHITESPACE 1 "\n"
-BYTE 5 "b\'\\n\'"
+BYTE 5 "b'\\n'"
 WHITESPACE 1 " "
-BYTE 5 "b\'\\\\\'"
+BYTE 5 "b'\\\\'"
 WHITESPACE 1 " "
-BYTE 5 "b\'\\\'\'"
+BYTE 5 "b'\\''"
 WHITESPACE 1 " "
-BYTE 8 "b\'hello\'"
+BYTE 8 "b'hello'"
 WHITESPACE 1 "\n"
diff --git a/crates/syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast
index 4c4ddf5ec..be4a62940 100644
--- a/crates/syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -43,7 +43,7 @@ [email protected]
                [email protected] "<"
                [email protected]
                  [email protected]
-                    [email protected] "\'a"
+                    [email protected] "'a"
                [email protected] ">"
              [email protected] " "
              [email protected]
@@ -55,7 +55,7 @@ [email protected]
                      [email protected] "<"
                      [email protected]
                        [email protected]
-                          [email protected] "\'a"
+                          [email protected] "'a"
                      [email protected] ">"
            [email protected] ")"
      [email protected] ">"
@@ -128,7 +128,7 @@ [email protected]
                  [email protected] "<"
                  [email protected]
                    [email protected]
-                      [email protected] "\'a"
+                      [email protected] "'a"
                  [email protected] ">"
                [email protected] " "
                [email protected]
@@ -140,7 +140,7 @@ [email protected]
                        [email protected] "<"
                        [email protected]
                          [email protected]
-                            [email protected] "\'a"
+                            [email protected] "'a"
                        [email protected] ">"
              [email protected] ")"
      [email protected]
@@ -191,7 +191,7 @@ [email protected]
                [email protected]
                  [email protected] "<"
                  [email protected]
-                    [email protected] "\'a"
+                    [email protected] "'a"
                  [email protected] ">"
            [email protected] " "
            [email protected]
@@ -205,7 +205,7 @@ [email protected]
                            [email protected] "Trait"
                    [email protected] "<"
                    [email protected]
-                      [email protected] "\'a"
+                      [email protected] "'a"
                  [email protected] ">"
                  [email protected]
                    [email protected] ")"
@@ -250,7 +250,7 @@ [email protected]
                              [email protected] "<"
                              [email protected]
                                [email protected]
-                                  [email protected] "\'a"
+                                  [email protected] "'a"
                              [email protected] ">"
                            [email protected] " "
                            [email protected]
@@ -262,7 +262,7 @@ [email protected]
                                    [email protected] "<"
                                    [email protected]
                                      [email protected]
-                                        [email protected] "\'a"
+                                        [email protected] "'a"
                                    [email protected] ">"
                          [email protected] ")"
            [email protected] " "
diff --git a/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast
index c5215d6b1..b021783fc 100644
--- a/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -17,7 +17,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
    [email protected] "\n"
    [email protected]
diff --git a/crates/syntax/test_data/parser/err/0043_weird_blocks.rast b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast
index e73bd1aea..e24f01e29 100644
--- a/crates/syntax/test_data/parser/err/0043_weird_blocks.rast
+++ b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast
@@ -55,7 +55,7 @@ [email protected]
          [email protected]
            [email protected]
              [email protected]
-                [email protected] "\'label"
+                [email protected] "'label"
              [email protected] ":"
        [email protected] " "
        [email protected]
diff --git a/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast
index cc54185e5..a2460a7ec 100644
--- a/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast
+++ b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast
@@ -13,13 +13,13 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
        [email protected] "&"
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] " "
        [email protected]
          [email protected]
@@ -42,7 +42,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -50,7 +50,7 @@ [email protected]
        [email protected]
          [email protected] "&"
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
          [email protected] " "
          [email protected]
            [email protected]
@@ -75,7 +75,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -102,7 +102,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -111,7 +111,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'b"
+              [email protected] "'b"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -122,7 +122,7 @@ [email protected]
              [email protected]
                [email protected] "&"
                [email protected]
-                  [email protected] "\'a"
+                  [email protected] "'a"
                [email protected] " "
                [email protected]
                  [email protected]
@@ -135,7 +135,7 @@ [email protected]
              [email protected]
                [email protected] "&"
                [email protected]
-                  [email protected] "\'b"
+                  [email protected] "'b"
                [email protected] " "
                [email protected]
                  [email protected]
@@ -169,7 +169,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -178,7 +178,7 @@ [email protected]
            [email protected] "<"
            [email protected]
              [email protected]
-                [email protected] "\'b"
+                [email protected] "'b"
            [email protected] ">"
          [email protected] " "
          [email protected]
@@ -187,7 +187,7 @@ [email protected]
              [email protected] "<"
              [email protected]
                [email protected]
-                  [email protected] "\'c"
+                  [email protected] "'c"
              [email protected] ">"
            [email protected] " "
            [email protected]
@@ -198,7 +198,7 @@ [email protected]
                  [email protected]
                    [email protected] "&"
                    [email protected]
-                      [email protected] "\'a"
+                      [email protected] "'a"
                    [email protected] " "
                    [email protected]
                      [email protected]
@@ -211,7 +211,7 @@ [email protected]
                  [email protected]
                    [email protected] "&"
                    [email protected]
-                      [email protected] "\'b"
+                      [email protected] "'b"
                    [email protected] " "
                    [email protected]
                      [email protected]
@@ -224,7 +224,7 @@ [email protected]
                  [email protected]
                    [email protected] "&"
                    [email protected]
-                      [email protected] "\'c"
+                      [email protected] "'c"
                    [email protected] " "
                    [email protected]
                      [email protected]
diff --git a/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast b/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast
index 7049f4734..6eaa32b96 100644
--- a/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast
+++ b/crates/syntax/test_data/parser/err/0046_ambiguous_trait_object.rast
@@ -8,7 +8,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ">"
    [email protected] " "
    [email protected] "="
@@ -16,7 +16,7 @@ [email protected]
    [email protected]
      [email protected] "&"
      [email protected]
-        [email protected] "\'a"
+        [email protected] "'a"
      [email protected] " "
      [email protected]
        [email protected] "dyn"
@@ -104,7 +104,7 @@ [email protected]
            [email protected] " "
            [email protected]
              [email protected]
-                [email protected] "\'static"
+                [email protected] "'static"
    [email protected] ";"
  [email protected] "\n"
  [email protected]
diff --git a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 0adf2cd5a..97bb5059d 100644
--- a/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -15,7 +15,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'loop"
+              [email protected] "'loop"
            [email protected] ":"
      [email protected] " "
      [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index 6cdfd058b..12f5040f9 100644
--- a/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -23,7 +23,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -46,7 +46,7 @@ [email protected]
                      [email protected]
                        [email protected] "&"
                        [email protected]
-                          [email protected] "\'a"
+                          [email protected] "'a"
                        [email protected] " "
                        [email protected]
                          [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
index f0d152d33..d4c8b9d67 100644
--- a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -55,7 +55,7 @@ [email protected]
          [email protected]
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected]
              [email protected] "self"
@@ -76,7 +76,7 @@ [email protected]
          [email protected]
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected] "mut"
            [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index 075b438d2..121c3966a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -14,7 +14,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index b9e92b57a..b67ea2682 100644
--- a/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -27,7 +27,7 @@ [email protected]
              [email protected] "continue"
              [email protected] " "
              [email protected]
-                [email protected] "\'l"
+                [email protected] "'l"
            [email protected] ";"
          [email protected] "\n    "
          [email protected] "}"
diff --git a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index dad4362b7..b44f46f05 100644
--- a/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -32,7 +32,7 @@ [email protected]
                            [email protected] "<"
                            [email protected]
                              [email protected]
-                                [email protected] "\'a"
+                                [email protected] "'a"
                            [email protected] ">"
                  [email protected] ">"
        [email protected] " "
@@ -40,6 +40,6 @@ [email protected]
        [email protected] " "
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
    [email protected] ";"
  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index ac0299268..7cb288bf0 100644
--- a/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -25,7 +25,7 @@ [email protected]
    [email protected]
      [email protected] "&"
      [email protected]
-        [email protected] "\'static"
+        [email protected] "'static"
      [email protected] " "
      [email protected]
        [email protected] "("
diff --git a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
index 828013d45..783b25338 100644
--- a/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -27,7 +27,7 @@ [email protected]
              [email protected] "break"
              [email protected] " "
              [email protected]
-                [email protected] "\'l"
+                [email protected] "'l"
            [email protected] ";"
          [email protected] "\n        "
          [email protected]
@@ -43,7 +43,7 @@ [email protected]
              [email protected] "break"
              [email protected] " "
              [email protected]
-                [email protected] "\'l"
+                [email protected] "'l"
              [email protected] " "
              [email protected]
                [email protected] "92"
diff --git a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 68c0f1c66..11efa23a4 100644
--- a/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -16,7 +16,7 @@ [email protected]
            [email protected] "<"
            [email protected]
              [email protected]
-                [email protected] "\'static"
+                [email protected] "'static"
            [email protected] ","
            [email protected] " "
            [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index b6f5a5689..abc258b33 100644
--- a/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -34,7 +34,7 @@ [email protected]
                                [email protected] "<"
                                [email protected]
                                  [email protected]
-                                    [email protected] "\'a"
+                                    [email protected] "'a"
                                [email protected] ">"
                    [email protected] ")"
      [email protected] ">"
diff --git a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 7df6e190a..e1b88c5db 100644
--- a/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -32,7 +32,7 @@ [email protected]
                    [email protected] " "
                    [email protected]
                      [email protected]
-                        [email protected] "\'f"
+                        [email protected] "'f"
              [email protected] ">"
    [email protected] " "
    [email protected]
@@ -74,7 +74,7 @@ [email protected]
                    [email protected] " "
                    [email protected]
                      [email protected]
-                        [email protected] "\'f"
+                        [email protected] "'f"
              [email protected] ">"
    [email protected] " "
    [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index 68bb43852..acf18fc2b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -49,7 +49,7 @@ [email protected]
          [email protected]
            [email protected]
              [email protected]
-                [email protected] "\'c\'"
+                [email protected] "'c'"
            [email protected] " "
            [email protected] "=>"
            [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 61dea413d..d42a7e295 100644
--- a/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -13,19 +13,19 @@ [email protected]
      [email protected] "\n   "
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'b"
+              [email protected] "'b"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'c"
+              [email protected] "'c"
      [email protected] ","
      [email protected] "\n   "
      [email protected]
@@ -57,7 +57,7 @@ [email protected]
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'static"
+              [email protected] "'static"
      [email protected] ","
      [email protected] "\n   "
      [email protected]
@@ -76,7 +76,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
      [email protected] ","
      [email protected] "\n   "
      [email protected]
@@ -108,7 +108,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
    [email protected] "\n"
    [email protected]
      [email protected] "{"
diff --git a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 49d26cef4..8f76177d1 100644
--- a/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -32,7 +32,7 @@ [email protected]
                            [email protected] "<"
                            [email protected]
                              [email protected]
-                                [email protected] "\'a"
+                                [email protected] "'a"
                            [email protected] ">"
                  [email protected] ">"
        [email protected] " "
@@ -40,6 +40,6 @@ [email protected]
        [email protected] " "
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
    [email protected] ";"
  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
index 8c909b5af..7958e32e5 100644
--- a/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -13,7 +13,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -44,7 +44,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -62,7 +62,7 @@ [email protected]
            [email protected]
              [email protected] "&"
              [email protected]
-                [email protected] "\'a"
+                [email protected] "'a"
              [email protected] " "
              [email protected]
                [email protected] "("
@@ -91,7 +91,7 @@ [email protected]
        [email protected] "<"
        [email protected]
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
        [email protected] ">"
      [email protected] " "
      [email protected]
@@ -105,7 +105,7 @@ [email protected]
                [email protected]
                  [email protected] "&"
                  [email protected]
-                    [email protected] "\'a"
+                    [email protected] "'a"
                  [email protected] " "
                  [email protected]
                    [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index ae838105d..f784e96e0 100644
--- a/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -68,7 +68,7 @@ [email protected]
        [email protected] "="
        [email protected] " "
        [email protected]
-          [email protected] "b\'a\'"
+          [email protected] "b'a'"
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
@@ -80,7 +80,7 @@ [email protected]
        [email protected] "="
        [email protected] " "
        [email protected]
-          [email protected] "\'b\'"
+          [email protected] "'b'"
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0109_label.rast b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
index 860dfe608..8540b8520 100644
--- a/crates/syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
@@ -15,7 +15,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] ":"
          [email protected] " "
          [email protected] "loop"
@@ -28,7 +28,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'b"
+              [email protected] "'b"
            [email protected] ":"
          [email protected] " "
          [email protected] "while"
@@ -44,7 +44,7 @@ [email protected]
      [email protected]
        [email protected]
          [email protected]
-            [email protected] "\'c"
+            [email protected] "'c"
          [email protected] ":"
        [email protected] " "
        [email protected] "for"
diff --git a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 840181383..5682bd28c 100644
--- a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -22,7 +22,7 @@ [email protected]
          [email protected] "]"
        [email protected] " "
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ","
      [email protected] " "
      [email protected]
@@ -53,7 +53,7 @@ [email protected]
        [email protected]
          [email protected] "&"
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
          [email protected] " "
          [email protected]
            [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast b/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast
index edfcb288c..860684b29 100644
--- a/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0154_no_dyn_trait_leading_for.rast
@@ -16,7 +16,7 @@ [email protected]
              [email protected] "<"
              [email protected]
                [email protected]
-                  [email protected] "\'a"
+                  [email protected] "'a"
              [email protected] ">"
            [email protected] " "
            [email protected]
@@ -28,7 +28,7 @@ [email protected]
                    [email protected] "<"
                    [email protected]
                      [email protected]
-                        [email protected] "\'a"
+                        [email protected] "'a"
                    [email protected] ">"
        [email protected] " "
        [email protected] "+"
diff --git a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
index c2dea1cc1..47e8859ed 100644
--- a/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -15,7 +15,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'label"
+              [email protected] "'label"
            [email protected] ":"
          [email protected] " "
          [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast
index 83e17757b..f845d5cff 100644
--- a/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast
@@ -81,7 +81,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -94,7 +94,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
      [email protected] ">"
    [email protected] ";"
@@ -108,11 +108,11 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -125,11 +125,11 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
        [email protected] " "
        [email protected] "+"
      [email protected] " "
@@ -145,16 +145,16 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
        [email protected] " "
        [email protected] "+"
        [email protected] " "
        [email protected]
-          [email protected] "\'c"
+          [email protected] "'c"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -167,7 +167,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ","
      [email protected] ">"
    [email protected] ";"
@@ -181,12 +181,12 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ","
      [email protected] " "
      [email protected]
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -199,21 +199,21 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
        [email protected] "+"
      [email protected] ","
      [email protected] " "
      [email protected]
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'c"
+          [email protected] "'c"
      [email protected] ","
      [email protected] ">"
    [email protected] ";"
@@ -258,7 +258,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ","
      [email protected] " "
      [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 21c564a20..9d4b001ae 100644
--- a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
@@ -42,7 +42,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -61,7 +61,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] " "
          [email protected] "+"
      [email protected] " "
@@ -83,13 +83,13 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'d"
+              [email protected] "'d"
      [email protected] " "
      [email protected] ">"
    [email protected] ";"
@@ -109,13 +109,13 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'d"
+              [email protected] "'d"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
@@ -198,7 +198,7 @@ [email protected]
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
@@ -234,25 +234,25 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'d"
+          [email protected] "'d"
      [email protected] ","
      [email protected] " "
      [email protected]
        [email protected]
-          [email protected] "\'d"
+          [email protected] "'d"
        [email protected] ":"
        [email protected] " "
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
        [email protected] " "
        [email protected] "+"
        [email protected] " "
        [email protected]
-          [email protected] "\'b"
+          [email protected] "'b"
      [email protected] ","
      [email protected] " "
      [email protected]
@@ -263,13 +263,13 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
          [email protected]
            [email protected]
-              [email protected] "\'d"
+              [email protected] "'d"
          [email protected] " "
          [email protected] "+"
          [email protected] " "
diff --git a/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast
index 80f7f5942..115861585 100644
--- a/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -20,7 +20,7 @@ [email protected]
        [email protected] "="
        [email protected] " "
        [email protected]
-          [email protected] "\'c\'u32"
+          [email protected] "'c'u32"
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
@@ -44,7 +44,7 @@ [email protected]
        [email protected] "="
        [email protected] " "
        [email protected]
-          [email protected] "b\'b\'_suff"
+          [email protected] "b'b'_suff"
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0032_where_for.rast b/crates/syntax/test_data/parser/ok/0032_where_for.rast
index 0cb2eca33..b527cc3ac 100644
--- a/crates/syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/syntax/test_data/parser/ok/0032_where_for.rast
@@ -42,7 +42,7 @@ [email protected]
                [email protected] "<"
                [email protected]
                  [email protected]
-                    [email protected] "\'de"
+                    [email protected] "'de"
                [email protected] ">"
              [email protected] " "
              [email protected]
@@ -54,7 +54,7 @@ [email protected]
                      [email protected] "<"
                      [email protected]
                        [email protected]
-                          [email protected] "\'de"
+                          [email protected] "'de"
                      [email protected] ">"
          [email protected] " "
          [email protected] "+"
diff --git a/crates/syntax/test_data/parser/ok/0033_label_break.rast b/crates/syntax/test_data/parser/ok/0033_label_break.rast
index 487e073ba..4b0f0997e 100644
--- a/crates/syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/syntax/test_data/parser/ok/0033_label_break.rast
@@ -17,7 +17,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'empty_block"
+              [email protected] "'empty_block"
            [email protected] ":"
          [email protected] " "
          [email protected]
@@ -28,7 +28,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'block"
+              [email protected] "'block"
            [email protected] ":"
          [email protected] " "
          [email protected]
@@ -69,7 +69,7 @@ [email protected]
                      [email protected] "break"
                      [email protected] " "
                      [email protected]
-                        [email protected] "\'block"
+                        [email protected] "'block"
                    [email protected] ";"
                  [email protected] "\n        "
                  [email protected] "}"
@@ -109,7 +109,7 @@ [email protected]
                      [email protected] "break"
                      [email protected] " "
                      [email protected]
-                        [email protected] "\'block"
+                        [email protected] "'block"
                    [email protected] ";"
                  [email protected] "\n        "
                  [email protected] "}"
@@ -140,7 +140,7 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              [email protected] "\'block"
+              [email protected] "'block"
            [email protected] ":"
          [email protected] " "
          [email protected]
@@ -171,7 +171,7 @@ [email protected]
                      [email protected] "break"
                      [email protected] " "
                      [email protected]
-                        [email protected] "\'block"
+                        [email protected] "'block"
                      [email protected] " "
                      [email protected]
                        [email protected] "1"
@@ -204,7 +204,7 @@ [email protected]
                      [email protected] "break"
                      [email protected] " "
                      [email protected]
-                        [email protected] "\'block"
+                        [email protected] "'block"
                      [email protected] " "
                      [email protected]
                        [email protected] "2"
diff --git a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
index 20675dbf5..2fa46ad2d 100644
--- a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -1378,14 +1378,14 @@ [email protected]
                        [email protected] " "
                        [email protected] "u8"
                        [email protected] "<"
-                        [email protected] "\'u8"
+                        [email protected] "'u8"
                        [email protected] ":"
                        [email protected] " "
-                        [email protected] "\'u8"
+                        [email protected] "'u8"
                        [email protected] " "
                        [email protected] "+"
                        [email protected] " "
-                        [email protected] "\'u8"
+                        [email protected] "'u8"
                        [email protected] ">"
                        [email protected]
                          [email protected] "("
@@ -1393,7 +1393,7 @@ [email protected]
                          [email protected] ":"
                          [email protected] " "
                          [email protected] "&"
-                          [email protected] "\'u8"
+                          [email protected] "'u8"
                          [email protected] " "
                          [email protected] "u8"
                          [email protected] ")"
@@ -1402,7 +1402,7 @@ [email protected]
                        [email protected] ">"
                        [email protected] " "
                        [email protected] "&"
-                        [email protected] "\'u8"
+                        [email protected] "'u8"
                        [email protected] " "
                        [email protected] "u8"
                        [email protected] " "
@@ -1574,7 +1574,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'union"
+              [email protected] "'union"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -1588,7 +1588,7 @@ [email protected]
            [email protected]
              [email protected] "&"
              [email protected]
-                [email protected] "\'union"
+                [email protected] "'union"
              [email protected] " "
              [email protected]
                [email protected]
@@ -1599,7 +1599,7 @@ [email protected]
                      [email protected] "<"
                      [email protected]
                        [email protected]
-                          [email protected] "\'union"
+                          [email protected] "'union"
                      [email protected] ">"
          [email protected] ","
          [email protected] " "
@@ -1681,7 +1681,7 @@ [email protected]
                          [email protected] "\"\\\\\""
                    [email protected] ","
                    [email protected]
-                      [email protected] "\'🤔\'"
+                      [email protected] "'🤔'"
                    [email protected] ")"
                  [email protected] "/**/"
                  [email protected] ","
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index f935a0df5..a7f0f7bc6 100644
--- a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -181,7 +181,7 @@ [email protected]
                                [email protected] "<"
                                [email protected]
                                  [email protected]
-                                    [email protected] "\'a"
+                                    [email protected] "'a"
                                [email protected] ">"
                    [email protected] ")"
      [email protected] ">"
@@ -359,7 +359,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected]
          [email protected] "("
@@ -394,7 +394,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected]
          [email protected] "("
@@ -411,7 +411,7 @@ [email protected]
            [email protected] " "
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected]
              [email protected] "self"
@@ -430,7 +430,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected]
          [email protected] "("
@@ -447,7 +447,7 @@ [email protected]
            [email protected] " "
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected] "mut"
            [email protected] " "
diff --git a/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast
index 325e9e655..79e2b2867 100644
--- a/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -23,7 +23,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -46,7 +46,7 @@ [email protected]
                      [email protected]
                        [email protected] "&"
                        [email protected]
-                          [email protected] "\'a"
+                          [email protected] "'a"
                        [email protected] " "
                        [email protected]
                          [email protected]
@@ -85,13 +85,13 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
          [email protected] "&"
          [email protected]
-            [email protected] "\'a"
+            [email protected] "'a"
          [email protected] " "
          [email protected]
            [email protected]
@@ -138,7 +138,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -146,7 +146,7 @@ [email protected]
          [email protected]
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected]
              [email protected]
@@ -169,7 +169,7 @@ [email protected]
                      [email protected]
                        [email protected] "&"
                        [email protected]
-                          [email protected] "\'a"
+                          [email protected] "'a"
                        [email protected] " "
                        [email protected]
                          [email protected]
@@ -208,7 +208,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -216,7 +216,7 @@ [email protected]
          [email protected]
            [email protected] "&"
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
            [email protected] " "
            [email protected]
              [email protected]
@@ -277,7 +277,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -288,7 +288,7 @@ [email protected]
                [email protected]
                  [email protected] "&"
                  [email protected]
-                    [email protected] "\'a"
+                    [email protected] "'a"
                  [email protected] " "
                  [email protected]
                    [email protected]
@@ -348,7 +348,7 @@ [email protected]
          [email protected] "<"
          [email protected]
            [email protected]
-              [email protected] "\'a"
+              [email protected] "'a"
          [email protected] ">"
        [email protected] " "
        [email protected]
@@ -357,7 +357,7 @@ [email protected]
            [email protected] "<"
            [email protected]
              [email protected]
-                [email protected] "\'b"
+                [email protected] "'b"
            [email protected] ">"
          [email protected] " "
          [email protected]
@@ -368,7 +368,7 @@ [email protected]
                [email protected]
                  [email protected] "&"
                  [email protected]
-                    [email protected] "\'a"
+                    [email protected] "'a"
                  [email protected] " "
                  [email protected]
                    [email protected]
@@ -381,7 +381,7 @@ [email protected]
                [email protected]
                  [email protected] "&"
                  [email protected]
-                    [email protected] "\'b"
+                    [email protected] "'b"
                  [email protected] " "
                  [email protected]
                    [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0069_multi_trait_object.rast b/crates/syntax/test_data/parser/ok/0069_multi_trait_object.rast
index 8d3e187ae..026c776e2 100644
--- a/crates/syntax/test_data/parser/ok/0069_multi_trait_object.rast
+++ b/crates/syntax/test_data/parser/ok/0069_multi_trait_object.rast
@@ -8,7 +8,7 @@ [email protected]
      [email protected] "<"
      [email protected]
        [email protected]
-          [email protected] "\'a"
+          [email protected] "'a"
      [email protected] ">"
    [email protected] " "
    [email protected] "="
@@ -16,7 +16,7 @@ [email protected]
    [email protected]
      [email protected] "&"
      [email protected]
-        [email protected] "\'a"
+        [email protected] "'a"
      [email protected] " "
      [email protected]
        [email protected] "("
@@ -112,7 +112,7 @@ [email protected]
              [email protected] " "
              [email protected]
                [email protected]
-                  [email protected] "\'static"
+                  [email protected] "'static"
          [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
diff --git a/crates/test_utils/src/minicore.rs b/crates/test_utils/src/minicore.rs
index e6d2301c7..9ec541c57 100644
--- a/crates/test_utils/src/minicore.rs
+++ b/crates/test_utils/src/minicore.rs
@@ -22,6 +22,11 @@
 //!     result:
 //!     iterator: option
 //!     iterators: iterator
+//!     default: sized
+//!     from: sized
+//!     eq: sized
+//!     ord: eq, option
+//!     derive:
 pub mod marker {
    // region:sized
@@ -37,6 +42,40 @@ pub mod marker {
    // endregion:unsize
 }
+// region:default
+pub mod default {
+    pub trait Default: Sized {
+        fn default() -> Self;
+    }
+}
+// endregion:default
+// region:from
+pub mod convert {
+    pub trait From<T>: Sized {
+        fn from(_: T) -> Self;
+    }
+    pub trait Into<T>: Sized {
+        fn into(self) -> T;
+    }
+    impl<T, U> Into<U> for T
+    where
+        U: From<T>,
+    {
+        fn into(self) -> U {
+            U::from(self)
+        }
+    }
+    impl<T> From<T> for T {
+        fn from(t: T) -> T {
+            t
+        }
+    }
+}
+// endregion:from
 pub mod ops {
    // region:coerce_unsized
    mod unsize {
@@ -137,6 +176,49 @@ pub mod ops {
    // endregion:fn
 }
+// region:eq
+pub mod cmp {
+    #[lang = "eq"]
+    pub trait PartialEq<Rhs: ?Sized = Self> {
+        fn eq(&self, other: &Rhs) -> bool;
+    }
+    pub trait Eq: PartialEq<Self> {}
+    // region:derive
+    #[rustc_builtin_macro]
+    pub macro PartialEq($item:item) {}
+    #[rustc_builtin_macro]
+    pub macro Eq($item:item) {}
+    // endregion:derive
+    // region:ord
+    #[lang = "partial_ord"]
+    pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
+        fn partial_cmp(&self, other: &Rhs) -> Option<Ordering>;
+    }
+    pub trait Ord: Eq + PartialOrd<Self> {
+        fn cmp(&self, other: &Self) -> Ordering;
+    }
+    pub enum Ordering {
+        Less = -1,
+        Equal = 0,
+        Greater = 1,
+    }
+    // region:derive
+    #[rustc_builtin_macro]
+    pub macro PartialOrd($item:item) {}
+    #[rustc_builtin_macro]
+    pub macro Ord($item:item) {}
+    // endregion:derive
+    // endregion:ord
+}
+// endregion:eq
 // region:slice
 pub mod slice {
    #[lang = "slice"]
@@ -306,10 +388,26 @@ pub mod iter {
 }
 // endregion:iterator
+// region:derive
+mod macros {
+    pub(crate) mod builtin {
+        #[rustc_builtin_macro]
+        pub macro derive($item:item) {
+            /* compiler built-in */
+        }
+    }
+}
+// endregion:derive
 pub mod prelude {
    pub mod v1 {
        pub use crate::{
+            cmp::{Eq, PartialEq},               // :eq
+            cmp::{Ord, PartialOrd},             // :ord
+            convert::{From, Into},              // :from
+            default::Default,                   // :default
            iter::{IntoIterator, Iterator},     // :iterator
+            macros::builtin::derive,            // :derive
            marker::Sized,                      // :sized
            ops::{Fn, FnMut, FnOnce},           // :fn
            option::Option::{self, None, Some}, // :option
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
index 2b3d7fd84..ef2d7657a 100644
--- a/crates/vfs/src/vfs_path.rs
+++ b/crates/vfs/src/vfs_path.rs
@@ -389,7 +389,7 @@ impl VirtualPath {
            match (file_stem, extension) {
                (None, None) => None,
-                (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)),
+                (None | Some(""), Some(_)) => Some((file_name, None)),
                (Some(file_stem), extension) => Some((file_stem, extension)),
            }
        }