From d8fa1455e5a7aee2a54ab78fe2fa19d755f3890d Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 17 Sep 2020 11:55:44 -0700 Subject: [PATCH 1/3] change default language version --- src/fsharp/LanguageFeatures.fs | 4 ++-- .../fsc/langversion/langversionhelp.437.1033.bsl | 4 ++-- .../fsi/langversion/langversionhelp.437.1033.bsl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fsharp/LanguageFeatures.fs b/src/fsharp/LanguageFeatures.fs index 9afe3c59abe..8b60a9361ed 100644 --- a/src/fsharp/LanguageFeatures.fs +++ b/src/fsharp/LanguageFeatures.fs @@ -44,9 +44,9 @@ type LanguageVersion (specifiedVersionAsString) = static let languageVersion47 = 4.7m static let languageVersion50 = 5.0m static let previewVersion = 9999m // Language version when preview specified - static let defaultVersion = languageVersion47 // Language version when default specified + static let defaultVersion = languageVersion50 // Language version when default specified static let latestVersion = defaultVersion // Language version when latest specified - static let latestMajorVersion = languageVersion47 // Language version when latestmajor specified + static let latestMajorVersion = languageVersion50 // Language version when latestmajor specified static let validOptions = [| "preview"; "default"; "latest"; "latestmajor" |] static let languageVersions = set [| languageVersion46; languageVersion47 ; languageVersion50 |] diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl index 35fc56a3abe..b7f6805220b 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl @@ -4,5 +4,5 @@ default latest latestmajor 4.6 -4.7 (Default) -5.0 \ No newline at end of file +4.7 +5.0 (Default) \ No newline at end of file diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl index 35fc56a3abe..b7f6805220b 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl @@ -4,5 +4,5 @@ default latest latestmajor 4.6 -4.7 (Default) -5.0 \ No newline at end of file +4.7 +5.0 (Default) \ No newline at end of file From 17616eea2c248e78f050241f3a89f0670ede3e87 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 17 Sep 2020 13:34:45 -0700 Subject: [PATCH 2/3] Update error message --- .../ErrorMessages/ConstructorTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs index dbad94ed4b8..5b0c17da33e 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs @@ -46,7 +46,7 @@ let p = |> typecheck |> shouldFail |> withDiagnostics [ - (Error 39, Line 7, Col 12, Line 7, Col 16, "The value or constructor 'Name' is not defined. Maybe you want one of the following:" + System.Environment.NewLine + " nan") + (Error 39, Line 7, Col 12, Line 7, Col 16, "The value or constructor 'Name' is not defined. Maybe you want one of the following:" + System.Environment.NewLine + " nameof" + System.Environment.NewLine + " nan") (Warning 20, Line 7, Col 12, Line 7, Col 25, "The result of this equality expression has type 'bool' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'.") (Error 39, Line 8, Col 12, Line 8, Col 15, "The value or constructor 'Age' is not defined.") (Error 501, Line 7, Col 5, Line 8, Col 21, "The object constructor 'Person' takes 0 argument(s) but is here given 1. The required signature is 'new : unit -> Person'. If some of the arguments are meant to assign values to properties, consider separating those arguments with a comma (',').")] From 33a391bba7c5b5acfb0f65929c38835de4f100e7 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 17 Sep 2020 21:07:45 -0700 Subject: [PATCH 3/3] fix tests --- tests/fsharp/Compiler/Language/StringInterpolation.fs | 4 ++-- .../neg_System.Convert.ToString.OverloadList.bsl | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/fsharp/Compiler/Language/StringInterpolation.fs b/tests/fsharp/Compiler/Language/StringInterpolation.fs index c08b7a28ece..dd1890fcc4f 100644 --- a/tests/fsharp/Compiler/Language/StringInterpolation.fs +++ b/tests/fsharp/Compiler/Language/StringInterpolation.fs @@ -610,8 +610,8 @@ check "vcewweh23" $"abc{({| A=1 |})}def" "abc{ A = 1 }def" [] - let ``Basic string interpolation (no preview)`` () = - CompilerAssert.TypeCheckWithErrorsAndOptions [| |] + let ``Basic string interpolation (4.7)`` () = + CompilerAssert.TypeCheckWithErrorsAndOptions [| "--langversion:4.7" |] """ let x = $"one" """ diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl index 1eb33e50b6e..00c7ea58752 100644 --- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl +++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl @@ -46,11 +46,3 @@ Available overloads: - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - -neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed. - -Known types of arguments: provider:'a0 * value:int when 'a0 : null - -Candidates: - - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string - - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string