From 8b730e6746c5ea65ab62aa94e82ad249a4e49a68 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sun, 7 Sep 2014 18:11:39 -0600 Subject: [PATCH] Fix capitalisation in implicitAmbiguous error --- src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 +- test/files/neg/implicit-ambiguous-invalid.check | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index d22008c02ef7..168a6c0abb90 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -1470,7 +1470,7 @@ trait Implicits { object ImplicitNotFoundMsg extends ImplicitAnnotationMsg(_.implicitNotFoundMsg, ImplicitNotFoundClass, "implicitNotFound") - object ImplicitAmbiguousMsg extends ImplicitAnnotationMsg(_.implicitAmbiguousMsg, ImplicitAmbiguousClass, "implicitAMbiguous") + object ImplicitAmbiguousMsg extends ImplicitAnnotationMsg(_.implicitAmbiguousMsg, ImplicitAmbiguousClass, "implicitAmbiguous") class Message(sym: Symbol, msg: String, annotationName: String) { // http://dcsobral.blogspot.com/2010/01/string-interpolation-in-scala-with.html diff --git a/test/files/neg/implicit-ambiguous-invalid.check b/test/files/neg/implicit-ambiguous-invalid.check index 2037ab84a97c..68b607c4c28d 100644 --- a/test/files/neg/implicit-ambiguous-invalid.check +++ b/test/files/neg/implicit-ambiguous-invalid.check @@ -1,5 +1,5 @@ implicit-ambiguous-invalid.scala:5: warning: Invalid implicitAmbiguous message for method neqAmbig1 in object Test: -The type parameter B referenced in the message of the @implicitAMbiguous annotation is not defined by method neqAmbig1. +The type parameter B referenced in the message of the @implicitAmbiguous annotation is not defined by method neqAmbig1. implicit def neqAmbig1[A] : A =!= A = null ^ error: No warnings can be incurred under -Xfatal-warnings.