For diagnostics where the message changed, instead of producing something like:
For diagnostics where the message changed, instead of producing something like:

/Users/sabre/Projects/swiftsource/swift/test/Constraints/errortype_bridging.swift:37:7: error: unexpected error produced: 'protocol<HairyErrorType, Runcible>' is not convertible to 'NSError'
ns4 = compo // expected-error{{cannot assign a value of type 'protocol<HairyErrorType, Runcible>' to a value of type 'NSError'}}
      ^
/Users/sabre/Projects/swiftsource/swift/test/Constraints/errortype_bridging.swift:37:16: error: expected error not produced
ns4 = compo // expected-error{{cannot assign a value of type 'protocol<HairyErrorType, Runcible>' to a value of type 'NSError'}}
               ^

produce a single message like:

/Users/sabre/Projects/swiftsource/swift/test/Constraints/errortype_bridging.swift:37:16: error: error had incorrect message: 'protocol<HairyErrorType, Runcible>' is not convertible to 'NSError'
ns4 = compo // expected-error{{cannot assign a value of type 'protocol<HairyErrorType, Runcible>' to a value of type 'NSError'}}
               ^



Swift SVN r30623

gmilos/swift,kusl/swift,amraboelela/swift,tinysun212/swift-windows,aschwaighofer/swift,shajrawi/swift,jtbandes/swift,xwu/swift,adrfer/swift,xwu/swift,gottesmm/swift,KrishMunot/swift,codestergit/swift,roambotics/swift,emilstahl/swift,devincoughlin/swift,gregomni/swift,practicalswift/swift,return/swift,jtbandes/swift,CodaFi/swift,uasys/swift,arvedviehweger/swift,atrick/swift,huonw/swift,ahoppen/swift,therealbnut/swift,Jnosh/swift,ahoppen/swift,JGiola/swift,harlanhaskins/swift,calebd/swift,felix91gr/swift,atrick/swift,dduan/swift,natecook1000/swift,xwu/swift,deyton/swift,jmgc/swift,kusl/swift,mightydeveloper/swift,apple/swift,swiftix/swift,LeoShimonaka/swift,huonw/swift,emilstahl/swift,JGiola/swift,swiftix/swift,natecook1000/swift,amraboelela/swift,IngmarStein/swift,khizkhiz/swift,milseman/swift,jopamer/swift,allevato/swift,parkera/swift,uasys/swift,lorentey/swift,sdulal/swift,danielmartin/swift,brentdax/swift,tardieu/swift,swiftix/swift.old,cbrentharris/swift,parkera/swift,djwbrown/swift,amraboelela/swift,tinysun212/swift-windows,glessard/swift,tardieu/swift,parkera/swift,jckarter/swift,MukeshKumarS/Swift,zisko/swift,airspeedswift/swift,Jnosh/swift,danielmartin/swift,gregomni/swift,apple/swift,sschiau/swift,hughbe/swift,modocache/swift,SwiftAndroid/swift,jopamer/swift,gregomni/swift,tjw/swift,nathawes/swift,kentya6/swift,tjw/swift,deyton/swift,khizkhiz/swift,CodaFi/swift,hughbe/swift,SwiftAndroid/swift,modocache/swift,frootloops/swift,allevato/swift,jtbandes/swift,gribozavr/swift,adrfer/swift,huonw/swift,manavgabhawala/swift,kusl/swift,deyton/swift,benlangmuir/swift,benlangmuir/swift,JGiola/swift,deyton/swift,SwiftAndroid/swift,stephentyrone/swift,practicalswift/swift,karwa/swift,hooman/swift,russbishop/swift,ken0nek/swift,dduan/swift,frootloops/swift,emilstahl/swift,swiftix/swift.old,johnno1962d/swift,Jnosh/swift,return/swift,alblue/swift,russbishop/swift,huonw/swift,kperryua/swift,manavgabhawala/swift,gribozavr/swift,jckarter/swift,tkremenek/swift,bitjammer/swift,amraboelela/swift,CodaFi/swift,bitjammer/swift,kusl/swift,mightydeveloper/swift,mightydeveloper/swift,tkremenek/swift,natecook1000/swift,gregomni/swift,rudkx/swift,return/swift,shajrawi/swift,frootloops/swift,gottesmm/swift,KrishMunot/swift,bitjammer/swift,deyton/swift,aschwaighofer/swift,adrfer/swift,jmgc/swift,hooman/swift,jtbandes/swift,mightydeveloper/swift,rudkx/swift,slavapestov/swift,milseman/swift,cbrentharris/swift,johnno1962d/swift,brentdax/swift,gribozavr/swift,cbrentharris/swift,uasys/swift,uasys/swift,felix91gr/swift,emilstahl/swift,SwiftAndroid/swift,OscarSwanros/swift,shajrawi/swift,zisko/swift,alblue/swift,johnno1962d/swift,ben-ng/swift,emilstahl/swift,LeoShimonaka/swift,lorentey/swift,xwu/swift,gribozavr/swift,modocache/swift,codestergit/swift,IngmarStein/swift,kentya6/swift,aschwaighofer/swift,swiftix/swift.old,tardieu/swift,danielmartin/swift,LeoShimonaka/swift,lorentey/swift,shajrawi/swift,devincoughlin/swift,cbrentharris/swift,xedin/swift,khizkhiz/swift,CodaFi/swift,JGiola/swift,tjw/swift,hughbe/swift,OscarSwanros/swift,dduan/swift,gribozavr/swift,gottesmm/swift,apple/swift,roambotics/swift,kentya6/swift,xedin/swift,swiftix/swift,nathawes/swift,gribozavr/swift,zisko/swift,sschiau/swift,shahmishal/swift,therealbnut/swift,kstaring/swift,Ivacker/swift,SwiftAndroid/swift,jmgc/swift,jtbandes/swift,zisko/swift,return/swift,nathawes/swift,MukeshKumarS/Swift,xedin/swift,MukeshKumarS/Swift,xedin/swift,ken0nek/swift,arvedviehweger/swift,frootloops/swift,shajrawi/swift,return/swift,djwbrown/swift,felix91gr/swift,modocache/swift,kentya6/swift,codestergit/swift,IngmarStein/swift,tardieu/swift,stephentyrone/swift,swiftix/swift.old,calebd/swift,adrfer/swift,glessard/swift,austinzheng/swift,kusl/swift,milseman/swift,milseman/swift,rudkx/swift,kperryua/swift,devincoughlin/swift,glessard/swift,therealbnut/swift,cbrentharris/swift,gmilos/swift,slavapestov/swift,milseman/swift,swiftix/swift,swiftix/swift.old,gribozavr/swift,jtbandes/swift,apple/swift,harlanhaskins/swift,natecook1000/swift,amraboelela/swift,JGiola/swift,shajrawi/swift,swiftix/swift.old,frootloops/swift,khizkhiz/swift,sschiau/swift,parkera/swift,gmilos/swift,sschiau/swift,manavgabhawala/swift,danielmartin/swift,rudkx/swift,devincoughlin/swift,IngmarStein/swift,benlangmuir/swift,tkremenek/swift,practicalswift/swift,return/swift,karwa/swift,harlanhaskins/swift,ahoppen/swift,calebd/swift,russbishop/swift,xwu/swift,airspeedswift/swift,shajrawi/swift,djwbrown/swift,calebd/swift,harlanhaskins/swift,jckarter/swift,Jnosh/swift,emilstahl/swift,shahmishal/swift,zisko/swift,parkera/swift,swiftix/swift,CodaFi/swift,djwbrown/swift,kusl/swift,xedin/swift,hooman/swift,practicalswift/swift,lorentey/swift,glessard/swift,aschwaighofer/swift,johnno1962d/swift,kperryua/swift,austinzheng/swift,KrishMunot/swift,slavapestov/swift,slavapestov/swift,kusl/swift,lorentey/swift,codestergit/swift,bitjammer/swift,gmilos/swift,arvedviehweger/swift,kperryua/swift,karwa/swift,khizkhiz/swift,shahmishal/swift,slavapestov/swift,mightydeveloper/swift,return/swift,JGiola/swift,djwbrown/swift,frootloops/swift,airspeedswift/swift,allevato/swift,airspeedswift/swift,danielmartin/swift,sdulal/swift,practicalswift/swift,deyton/swift,ben-ng/swift,khizkhiz/swift,tardieu/swift,atrick/swift,parkera/swift,slavapestov/swift,hooman/swift,austinzheng/swift,modocache/swift,therealbnut/swift,brentdax/swift,xedin/swift,gottesmm/swift,bitjammer/swift,tinysun212/swift-windows,hooman/swift,codestergit/swift,kusl/swift,tjw/swift,parkera/swift,tkremenek/swift,kperryua/swift,kentya6/swift,nathawes/swift,calebd/swift,kentya6/swift,LeoShimonaka/swift,tjw/swift,natecook1000/swift,brentdax/swift,glessard/swift,arvedviehweger/swift,adrfer/swift,Ivacker/swift,Jnosh/swift,therealbnut/swift,stephentyrone/swift,MukeshKumarS/Swift,roambotics/swift,manavgabhawala/swift,CodaFi/swift,devincoughlin/swift,kperryua/swift,hughbe/swift,alblue/swift,emilstahl/swift,alblue/swift,Ivacker/swift,jmgc/swift,glessard/swift,bitjammer/swift,deyton/swift,OscarSwanros/swift,milseman/swift,OscarSwanros/swift,russbishop/swift,benlangmuir/swift,practicalswift/swift,kperryua/swift,JaSpa/swift,xwu/swift,natecook1000/swift,alblue/swift,MukeshKumarS/Swift,harlanhaskins/swift,roambotics/swift,ahoppen/swift,jckarter/swift,Jnosh/swift,brentdax/swift,russbishop/swift,stephentyrone/swift,tinysun212/swift-windows,MukeshKumarS/Swift,sdulal/swift,aschwaighofer/swift,OscarSwanros/swift,practicalswift/swift,tkremenek/swift,gmilos/swift,arvedviehweger/swift,hughbe/swift,hooman/swift,uasys/swift,cbrentharris/swift,ken0nek/swift,huonw/swift,nathawes/swift,johnno1962d/swift,rudkx/swift,shajrawi/swift,tinysun212/swift-windows,karwa/swift,JaSpa/swift,lorentey/swift,devincoughlin/swift,kentya6/swift,sdulal/swift,frootloops/swift,djwbrown/swift,jckarter/swift,therealbnut/swift,natecook1000/swift,Ivacker/swift,xwu/swift,Jnosh/swift,sdulal/swift,IngmarStein/swift,harlanhaskins/swift,modocache/swift,atrick/swift,hughbe/swift,CodaFi/swift,sdulal/swift,nathawes/swift,SwiftAndroid/swift,jopamer/swift,parkera/swift,tkremenek/swift,brentdax/swift,LeoShimonaka/swift,austinzheng/swift,karwa/swift,ben-ng/swift,shahmishal/swift,djwbrown/swift,tinysun212/swift-windows,nathawes/swift,ahoppen/swift,johnno1962d/swift,LeoShimonaka/swift,KrishMunot/swift,sschiau/swift,ben-ng/swift,shahmishal/swift,gmilos/swift,JaSpa/swift,airspeedswift/swift,stephentyrone/swift,allevato/swift,LeoShimonaka/swift,swiftix/swift.old,arvedviehweger/swift,tkremenek/swift,johnno1962d/swift,xedin/swift,sschiau/swift,shahmishal/swift,uasys/swift,codestergit/swift,felix91gr/swift,karwa/swift,amraboelela/swift,kstaring/swift,ken0nek/swift,khizkhiz/swift,brentdax/swift,amraboelela/swift,austinzheng/swift,jopamer/swift,tinysun212/swift-windows,aschwaighofer/swift,tardieu/swift,dduan/swift,xedin/swift,swiftix/swift,IngmarStein/swift,stephentyrone/swift,gmilos/swift,MukeshKumarS/Swift,jtbandes/swift,atrick/swift,sschiau/swift,allevato/swift,sschiau/swift,ben-ng/swift,cbrentharris/swift,lorentey/swift,danielmartin/swift,jopamer/swift,JaSpa/swift,zisko/swift,sdulal/swift,benlangmuir/swift,russbishop/swift,ben-ng/swift,danielmartin/swift,IngmarStein/swift,felix91gr/swift,tjw/swift,karwa/swift,hooman/swift,ken0nek/swift,airspeedswift/swift,kstaring/swift,manavgabhawala/swift,shahmishal/swift,ken0nek/swift,calebd/swift,tardieu/swift,arvedviehweger/swift,swiftix/swift.old,mightydeveloper/swift,uasys/swift,LeoShimonaka/swift,dduan/swift,zisko/swift,alblue/swift,roambotics/swift,KrishMunot/swift,milseman/swift,allevato/swift,felix91gr/swift,JaSpa/swift,cbrentharris/swift,KrishMunot/swift,gottesmm/swift,airspeedswift/swift,mightydeveloper/swift,Ivacker/swift,stephentyrone/swift,tjw/swift,gottesmm/swift,jckarter/swift,JaSpa/swift,adrfer/swift,jmgc/swift,kstaring/swift,benlangmuir/swift,therealbnut/swift,austinzheng/swift,harlanhaskins/swift,gregomni/swift,jckarter/swift,dduan/swift,sdulal/swift,felix91gr/swift,rudkx/swift,swiftix/swift,adrfer/swift,kstaring/swift,jmgc/swift,hughbe/swift,dduan/swift,karwa/swift,ken0nek/swift,atrick/swift,calebd/swift,aschwaighofer/swift,jopamer/swift,gregomni/swift,shahmishal/swift,lorentey/swift,russbishop/swift,kstaring/swift,practicalswift/swift,devincoughlin/swift,manavgabhawala/swift,SwiftAndroid/swift,Ivacker/swift,KrishMunot/swift,apple/swift,huonw/swift,manavgabhawala/swift,emilstahl/swift,slavapestov/swift,Ivacker/swift,ahoppen/swift,austinzheng/swift,OscarSwanros/swift,dreamsxin/swift,allevato/swift,gottesmm/swift,modocache/swift,Ivacker/swift,ben-ng/swift,gribozavr/swift,kentya6/swift,JaSpa/swift,huonw/swift,alblue/swift,jmgc/swift,roambotics/swift,devincoughlin/swift,OscarSwanros/swift,bitjammer/swift,dreamsxin/swift,kstaring/swift,jopamer/swift,apple/swift,mightydeveloper/swift,codestergit/swift