From 9b32f28bf6ba2a50f2b69f0ce5fe1b863b0f73d1 Mon Sep 17 00:00:00 2001 From: lr Date: Sun, 18 Mar 2018 18:39:48 +0100 Subject: [PATCH] buildFromSource #2 (please make this go away :\ ) --- src/buildfromsource/FSharp.Compiler.Private/FSComp.fs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index ac222406a21a..c417f09b1f33 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -4306,6 +4306,12 @@ type internal SR private() = /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. /// (Originally from ..\FSComp.txt:1426) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) + /// '%s' cannot implement the interface '%s' with the two instantiations '%s' and '%s' because they may unify. + /// (Originally from ..\FSComp.txt:1427) + static member typrelInterfaceWithConcreteAndVariable(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3223, GetStringFunc("typrelInterfaceWithConcreteAndVariable",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) + /// You cannot implement the interface '%s' with the two instantiations '%s' and '%s' because they may unify. + /// (Originally from ..\FSComp.txt:1428) + static member typrelInterfaceWithConcreteAndVariableObjectExpression(a0 : System.String, a1 : System.String, a2 : System.String) = (3223, GetStringFunc("typrelInterfaceWithConcreteAndVariableObjectExpression",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5706,4 +5712,6 @@ type internal SR private() = ignore(GetString("tcTupleMemberNotNormallyUsed")) ignore(GetString("implicitlyDiscardedInSequenceExpression")) ignore(GetString("implicitlyDiscardedSequenceInSequenceExpression")) + ignore(GetString("typrelInterfaceWithConcreteAndVariable")) + ignore(GetString("typrelInterfaceWithConcreteAndVariableObjectExpression")) ()