more error message improvements

Author: ghik

commons-macros/src/main/scala/com/avsystem/commons/macros/rpc/RpcMappings.scala

@@ -11,7 +11,7 @@ trait RpcMappings { this: RpcMacroCommons with RpcSymbols =>
   import c.universe._
 
   def collectMethodMappings[Raw <: TagMatchingSymbol with AritySymbol, M](
-    rawSymbols: List[Raw], rawShortDesc: String, realMethods: List[RealMethod])(
+    rawSymbols: List[Raw], errorBase: String, realMethods: List[RealMethod])(
     createMapping: (Raw, MatchedMethod) => Res[M]): List[M] = {
 
     val failedReals = new ListBuffer[String]
@@ -31,7 +31,7 @@ trait RpcMappings { this: RpcMacroCommons with RpcSymbols =>
         val unmatchedReport = errors.map { case (raw, err) =>
           s" * ${raw.shortDescription} ${raw.nameStr} did not match: ${indent(err, " ")}"
         }.mkString("\n")
-        s"it has no matching $rawShortDesc:\n$unmatchedReport"
+        s"$errorBase:\n$unmatchedReport"
       } match {
         case Ok(v) => Some(v)
         case Fail(msg) =>
@@ -40,10 +40,6 @@ trait RpcMappings { this: RpcMacroCommons with RpcSymbols =>
       }
     }
 
-    if (failedReals.nonEmpty) {
-      abort(s"Following real methods could not be mapped to $rawShortDesc: ${failedReals.mkString(",")}")
-    }
-
     result
   }
 
@@ -307,8 +303,10 @@ trait RpcMappings { this: RpcMacroCommons with RpcSymbols =>
       } yield MethodMapping(matchedMethod, rawMethod, paramMappings, resultConv)
     }
 
-    lazy val methodMappings: List[MethodMapping] =
-      collectMethodMappings(raw.rawMethods, "raw methods", real.realMethods)(mappingRes)
+    lazy val methodMappings: List[MethodMapping] = {
+      val errorBase = s"it has no matching raw methods in ${raw.description}"
+      collectMethodMappings(raw.rawMethods, errorBase, real.realMethods)(mappingRes)
+    }
 
     def ensureUniqueRpcNames(): Unit =
       methodMappings.groupBy(_.matchedMethod.rpcName).foreach {

commons-macros/src/main/scala/com/avsystem/commons/macros/rpc/RpcMetadatas.scala

@@ -107,8 +107,10 @@ trait RpcMetadatas extends MacroMetadatas { this: RpcMacroCommons with RpcSymbol
     def compositeConstructor(param: CompositeParam): MetadataConstructor =
       new RpcTraitMetadataConstructor(param.actualType, Some(param))
 
-    def methodMappings(rpc: RealRpcTrait): Map[MethodMetadataParam, List[MethodMetadataMapping]] =
-      collectMethodMappings(methodMdParams, "metadata parameters", rpc.realMethods)(_.mappingFor(_)).groupBy(_.mdParam)
+    def methodMappings(rpc: RealRpcTrait): Map[MethodMetadataParam, List[MethodMetadataMapping]] = {
+      val errorBase = s"it has no matching metadata parameters in $description"
+      collectMethodMappings(methodMdParams, errorBase, rpc.realMethods)(_.mappingFor(_)).groupBy(_.mdParam)
+    }
 
     def tryMaterializeFor(rpc: RealRpcTrait, methodMappings: Map[MethodMetadataParam, List[MethodMetadataMapping]]): Res[Tree] =
       tryMaterialize(MatchedRpcTrait(rpc)) { case mmp: MethodMetadataParam =>