remove UnaryPlus trait; cleanup

Author: sbillig

crates/hir-analysis/src/name_resolution/method_selection.rs

@@ -49,7 +49,6 @@ impl<'db> TraitMethodCand<'db> {
     }
 }
 
-// xxx #[salsa::tracked]
 pub(crate) fn select_method_candidate<'db>(
     db: &'db dyn HirAnalysisDb,
     receiver: Canonical<TyId<'db>>,

crates/hir-analysis/src/name_resolution/path_resolver.rs

@@ -172,7 +172,7 @@ impl<'db> PathResError<'db> {
         expected: ExpectedPathKind,
     ) -> Option<PathResDiag<'db>> {
         let failed_at = self.failed_at;
-        let ident = failed_at.ident(db).to_opt()?; // xxx PathKind::QualifiedType
+        let ident = failed_at.ident(db).to_opt()?; // TODO: handle PathKind::QualifiedType
 
         let diag = match self.kind {
             PathResErrorKind::ParseError => return None,
@@ -343,7 +343,7 @@ impl<'db> PathRes<'db> {
             PathRes::Func(ty) => PathRes::Func(f(ty)),
             PathRes::Const(ty) => PathRes::Const(f(ty)),
             PathRes::EnumVariant(v) => PathRes::EnumVariant(ResolvedVariant { ty: f(v.ty), ..v }),
-            // xxx map over candidate ty?
+            // TODO: map over candidate ty?
             PathRes::Method(ty, candidate) => PathRes::Method(f(ty), candidate),
             r @ (PathRes::Trait(_) | PathRes::Mod(_) | PathRes::FuncParam(..)) => r,
         }

crates/hir-analysis/src/ty/trait_resolution/proof_forest.rs

@@ -361,7 +361,7 @@ impl GeneratorNode {
             let mut table = g_node.table.clone();
             let gen_cand = table.instantiate_with_fresh_vars(cand);
 
-            // xxx require candidates to be pre-normalized
+            // TODO: require candidates to be pre-normalized
             // Normalize trait instance arguments before unification
             let normalized_gen_cand = {
                 let trait_inst = gen_cand.trait_(db);

crates/hir-analysis/src/ty/ty_check/expr.rs

@@ -111,6 +111,10 @@ impl<'db> TyChecker<'db> {
             unreachable!()
         };
         let prop = self.check_expr_unknown(*lhs);
+        if *op == UnOp::Plus {
+            // TODO: remove support for unary plus? what should it do?
+            return prop;
+        }
         if prop.ty.has_invalid(self.db) {
             return ExprProp::invalid(self.db);
         }
@@ -155,7 +159,7 @@ impl<'db> TyChecker<'db> {
         }
 
         if matches!(op, BinOp::Index) && lhs.ty.is_array(self.db) {
-            // Built-in array indexing (xxx move to trait impl)
+            // Built-in array indexing (TODO: move to trait impl)
             let args = lhs.ty.generic_args(self.db);
             let elem_ty = args[0];
             let index_ty = args[1].const_ty_ty(self.db).unwrap();
@@ -1335,13 +1339,8 @@ impl TraitOps for BinOp {
                 }
             }
 
-            BinOp::Logical(logical_op) => {
-                use hir::hir_def::LogicalBinOp::*;
-
-                match logical_op {
-                    And => ["And", "and", "&&"],
-                    Or => ["Or", "or", "||"],
-                }
+            BinOp::Logical(_) => {
+                unreachable!()
             }
 
             BinOp::Index => ["Index", "index", "[]"],

crates/hir-analysis/src/ty/ty_lower.rs

@@ -233,7 +233,7 @@ pub(crate) fn lower_generic_arg_list<'db>(
             }
 
             GenericArg::AssocType(_assoc_type_arg) => {
-                // xxx
+                // TODO: ?
                 TyId::invalid(db, InvalidCause::Other)
             }
         })

crates/parser/src/ast/item.rs

@@ -447,7 +447,7 @@ ast_node! {
 ast_node! {
     pub struct ImplItemList,
     SK::ImplItemList,
-    IntoIterator<Item=Func>, // xxx ImplTraitItem
+    IntoIterator<Item=Func>, // TODO: ImplTraitItem
 }
 
 ast_node! {

crates/uitest/fixtures/ty_check/generic_arg_path_resolution_fail.fe

@@ -36,7 +36,6 @@ struct S2<T> {
 
 // Case 4: Associated type on concrete type that doesn't implement the trait
 struct Concrete {}
-// xxx this shouldn't be a conflicting trait impl!
 impl Tr1 for S1<Concrete> {
     type Foo = Concrete::Bar  // Error: Concrete doesn't have associated type Bar
 

crates/uitest/fixtures/ty_check/generic_arg_path_resolution_fail.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/uitest/tests/ty_check.rs
-assertion_line: 20
 expression: diags
 input_file: fixtures/ty_check/generic_arg_path_resolution_fail.fe
 ---
@@ -17,13 +16,13 @@ error[2-0002]: `NonExistent` is not found
    │            ^^^^^^^^^^^ `NonExistent` is not found
 
 error[2-0002]: `Bar` is not found
-   ┌─ generic_arg_path_resolution_fail.fe:41:26
+   ┌─ generic_arg_path_resolution_fail.fe:40:26
    │
-41 │     type Foo = Concrete::Bar  // Error: Concrete doesn't have associated type Bar
+40 │     type Foo = Concrete::Bar  // Error: Concrete doesn't have associated type Bar
    │                          ^^^ `Bar` is not found
 
 error[2-0002]: `Missing` is not found
-   ┌─ generic_arg_path_resolution_fail.fe:54:26
+   ┌─ generic_arg_path_resolution_fail.fe:53:26
    │
-54 │     type Foo = T::Inner::Missing  // Error: T::Inner doesn't have associated type Missing
+53 │     type Foo = T::Inner::Missing  // Error: T::Inner doesn't have associated type Missing
    │                          ^^^^^^^ `Missing` is not found

crates/uitest/fixtures/ty_check/unary.fe

@@ -5,4 +5,4 @@ fn foo() {
     +f
     -f
     !f
-}
+}

crates/uitest/fixtures/ty_check/unary.snap

@@ -3,15 +3,6 @@ source: crates/uitest/tests/ty_check.rs
 expression: diags
 input_file: fixtures/ty_check/unary.fe
 ---
-error[8-0016]: `core::ops::UnaryPlus` trait is not implemented
-  ┌─ unary.fe:5:5
-  │
-5 │     +f
-  │     ^^
-  │     │
-  │     `+` can't be applied to `Foo`
-  │     Try implementing `core::ops::UnaryPlus` for `Foo`
-
 error[8-0016]: `core::ops::Neg` trait is not implemented
   ┌─ unary.fe:6:5
   │