Skip to content

Commit 4d29724

Browse files
authored
Merge pull request #13795 from dotnet/merges/main-to-release/dev17.4
Merge main to release/dev17.4
2 parents 4ea0cae + 9d84a7a commit 4d29724

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/Compiler/Checking/AttributeChecking.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ open Internal.Utilities.Library
1010
open FSharp.Compiler.AbstractIL.IL
1111
open FSharp.Compiler
1212
open FSharp.Compiler.DiagnosticsLogger
13+
open FSharp.Compiler.Features
1314
open FSharp.Compiler.Import
1415
open FSharp.Compiler.Infos
1516
open FSharp.Compiler.TcGlobals
@@ -21,8 +22,6 @@ open FSharp.Compiler.TypeHierarchy
2122
#if !NO_TYPEPROVIDERS
2223
open FSharp.Compiler.TypeProviders
2324
open FSharp.Core.CompilerServices
24-
open Features
25-
2625
#endif
2726

2827
exception ObsoleteWarning of string * range

src/FSharp.Core/prim-types.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,6 +4107,7 @@ namespace Microsoft.FSharp.Collections
41074107
let start = if i < 0 then 0 else i
41084108
PrivateListHelpers.sliceTake (j - start) (PrivateListHelpers.sliceSkip start l)
41094109

4110+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
41104111
member l.GetReverseIndex(_: int, offset: int) =
41114112
l.Length - offset - 1
41124113

@@ -6902,6 +6903,7 @@ namespace Microsoft.FSharp.Core
69026903
[<AutoOpen>]
69036904
module ArrayExtensions =
69046905
type ``[,,,]``<'T> with
6906+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
69056907
member arr.GetReverseIndex(dim: int, offset: int) =
69066908
let len =
69076909
match dim with
@@ -6914,6 +6916,7 @@ namespace Microsoft.FSharp.Core
69146916
len - offset - 1
69156917

69166918
type ``[,,]``<'T> with
6919+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
69176920
member arr.GetReverseIndex(dim: int, offset: int) =
69186921
let len =
69196922
match dim with
@@ -6925,6 +6928,7 @@ namespace Microsoft.FSharp.Core
69256928
len - offset - 1
69266929

69276930
type ``[,]``<'T> with
6931+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
69286932
member arr.GetReverseIndex(dim: int, offset: int) =
69296933
let len =
69306934
match dim with
@@ -6935,9 +6939,11 @@ namespace Microsoft.FSharp.Core
69356939
len - offset - 1
69366940

69376941
type ``[]``<'T> with
6942+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
69386943
member arr.GetReverseIndex (_: int, offset: int) = arr.Length - offset - 1
69396944

69406945
type String with
6946+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
69416947
member str.GetReverseIndex (_: int, offset: int) = str.Length - offset - 1
69426948

69436949
namespace Microsoft.FSharp.Control

src/FSharp.Core/prim-types.fsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,6 +2555,7 @@ namespace Microsoft.FSharp.Collections
25552555
/// <param name="offset">The offset from the end.</param>
25562556
///
25572557
/// <returns>The corresponding index from the start.</returns>
2558+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
25582559
member GetReverseIndex: rank: int * offset: int -> int
25592560

25602561
/// <summary>Returns a list with <c>head</c> as its first element and <c>tail</c> as its subsequent elements</summary>
@@ -4608,6 +4609,7 @@ namespace Microsoft.FSharp.Core
46084609
/// <param name="offset">The offset from the end.</param>
46094610
///
46104611
/// <returns>The corresponding index from the start.</returns>
4612+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
46114613
member GetReverseIndex: rank: int * offset: int -> int
46124614

46134615
type ``[,,]``<'T> with
@@ -4617,6 +4619,7 @@ namespace Microsoft.FSharp.Core
46174619
/// <param name="offset">The offset from the end.</param>
46184620
///
46194621
/// <returns>The corresponding index from the start.</returns>
4622+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
46204623
member GetReverseIndex: rank: int * offset: int -> int
46214624

46224625
type ``[,]``<'T> with
@@ -4626,6 +4629,7 @@ namespace Microsoft.FSharp.Core
46264629
/// <param name="offset">The offset from the end.</param>
46274630
///
46284631
/// <returns>The corresponding index from the start.</returns>
4632+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
46294633
member GetReverseIndex: rank: int * offset: int -> int
46304634

46314635
type ``[]``<'T> with
@@ -4635,6 +4639,7 @@ namespace Microsoft.FSharp.Core
46354639
/// <param name="offset">The offset from the end.</param>
46364640
///
46374641
/// <returns>The corresponding index from the start.</returns>
4642+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
46384643
member GetReverseIndex: rank: int * offset: int -> int
46394644

46404645
type System.String with
@@ -4644,6 +4649,7 @@ namespace Microsoft.FSharp.Core
46444649
/// <param name="offset">The offset from the end.</param>
46454650
///
46464651
/// <returns>The corresponding index from the start.</returns>
4652+
[<Experimental("Experimental library feature, requires '--langversion:preview'")>]
46474653
member GetReverseIndex: rank: int * offset: int -> int
46484654

46494655
/// <summary>A module of compiler intrinsic functions for efficient implementations of F# integer ranges

0 commit comments

Comments
 (0)