From 444b9b1ae7e7801d90d68eeb8a51855a1b028480 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Sun, 15 Sep 2024 19:32:18 +0200 Subject: [PATCH 1/3] Move attribute enforcement from v9 to preview --- src/Compiler/Facilities/LanguageFeatures.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 530d0e5f2b..232fbb902e 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -212,11 +212,11 @@ type LanguageVersion(versionText) = LanguageFeature.LowerIntegralRangesToFastLoops, languageVersion90 LanguageFeature.LowerSimpleMappingsInComprehensionsToFastLoops, languageVersion90 LanguageFeature.ParsedHashDirectiveArgumentNonQuotes, languageVersion90 - LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 - LanguageFeature.EnforceAttributeTargets, languageVersion90 + LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 LanguageFeature.ConsistentNowarnLineDirectiveInteraction, languageVersion90 // F# preview + LanguageFeature.EnforceAttributeTargets, previewVersion // waiting for fix of https://github.com/dotnet/fsharp/issues/17731 LanguageFeature.UnmanagedConstraintCsharpInterop, previewVersion // not enabled because: https://github.com/dotnet/fsharp/issues/17509 LanguageFeature.FromEndSlicing, previewVersion // Unfinished features --- needs work LanguageFeature.AllowAccessModifiersToAutoPropertiesGettersAndSetters, previewVersion From 6b65528f94e31a91663f9aea15d82a9ba1ee910c Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Sun, 15 Sep 2024 20:47:59 +0200 Subject: [PATCH 2/3] fantomas, bug repro in tests --- src/Compiler/Facilities/LanguageFeatures.fs | 2 +- tests/fsharp/typecheck/sigs/neg110.bsl | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Compiler/Facilities/LanguageFeatures.fs b/src/Compiler/Facilities/LanguageFeatures.fs index 232fbb902e..5f16aead30 100644 --- a/src/Compiler/Facilities/LanguageFeatures.fs +++ b/src/Compiler/Facilities/LanguageFeatures.fs @@ -212,7 +212,7 @@ type LanguageVersion(versionText) = LanguageFeature.LowerIntegralRangesToFastLoops, languageVersion90 LanguageFeature.LowerSimpleMappingsInComprehensionsToFastLoops, languageVersion90 LanguageFeature.ParsedHashDirectiveArgumentNonQuotes, languageVersion90 - LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 + LanguageFeature.EmptyBodiedComputationExpressions, languageVersion90 LanguageFeature.ConsistentNowarnLineDirectiveInteraction, languageVersion90 // F# preview diff --git a/tests/fsharp/typecheck/sigs/neg110.bsl b/tests/fsharp/typecheck/sigs/neg110.bsl index 7df6800489..24d644025d 100644 --- a/tests/fsharp/typecheck/sigs/neg110.bsl +++ b/tests/fsharp/typecheck/sigs/neg110.bsl @@ -1,3 +1 @@ -neg110.fs(5,3,5,15): typecheck error FS1133: No constructors are available for the type 'NotAttribute' - -neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. +neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. \ No newline at end of file From 17af76e5b5d2b23921aa5c3055e324a635f6adf7 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Sun, 15 Sep 2024 21:55:05 +0200 Subject: [PATCH 3/3] bsl newline --- tests/fsharp/typecheck/sigs/neg110.bsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/fsharp/typecheck/sigs/neg110.bsl b/tests/fsharp/typecheck/sigs/neg110.bsl index 24d644025d..1cdd563a74 100644 --- a/tests/fsharp/typecheck/sigs/neg110.bsl +++ b/tests/fsharp/typecheck/sigs/neg110.bsl @@ -1 +1,2 @@ -neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. \ No newline at end of file +neg110.fs(5,3,5,15): typecheck error FS3242: This type does not inherit Attribute, it will not work correctly with other .NET languages. +