From b928fe2585054024b36bcc85ce9b49c031bdb859 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Mon, 13 Jul 2020 15:27:09 -0700 Subject: [PATCH 1/2] remove attributes (#9671) --- src/fsharp/FSharp.Core/async.fs | 1 - src/fsharp/FSharp.Core/async.fsi | 1 - src/fsharp/FSharp.Core/map.fs | 2 -- src/fsharp/FSharp.Core/map.fsi | 2 -- 4 files changed, 6 deletions(-) diff --git a/src/fsharp/FSharp.Core/async.fs b/src/fsharp/FSharp.Core/async.fs index ad172d40ae1..4224440e6f1 100644 --- a/src/fsharp/FSharp.Core/async.fs +++ b/src/fsharp/FSharp.Core/async.fs @@ -1405,7 +1405,6 @@ namespace Microsoft.FSharp.Control static member Sleep (millisecondsDueTime: int32) : Async = Async.Sleep (millisecondsDueTime |> int64) - [] static member Sleep (dueTime: TimeSpan) = if dueTime < TimeSpan.Zero then raise (ArgumentOutOfRangeException("dueTime")) diff --git a/src/fsharp/FSharp.Core/async.fsi b/src/fsharp/FSharp.Core/async.fsi index bd0d54aeb90..72502b9d26e 100644 --- a/src/fsharp/FSharp.Core/async.fsi +++ b/src/fsharp/FSharp.Core/async.fsi @@ -288,7 +288,6 @@ namespace Microsoft.FSharp.Control /// The amount of time to sleep. /// An asynchronous computation that will sleep for the given time. /// Thrown when the due time is negative. - [] static member Sleep: dueTime:TimeSpan -> Async /// Creates an asynchronous computation in terms of a Begin/End pair of actions in diff --git a/src/fsharp/FSharp.Core/map.fs b/src/fsharp/FSharp.Core/map.fs index f1aead43900..079c5cac585 100644 --- a/src/fsharp/FSharp.Core/map.fs +++ b/src/fsharp/FSharp.Core/map.fs @@ -549,7 +549,6 @@ type Map<[]'Key, [(comparer, MapTree.add comparer key value tree) - [] member m.Change(key, f) : Map<'Key, 'Value> = new Map<'Key, 'Value>(comparer, MapTree.change comparer key f tree) @@ -770,7 +769,6 @@ module Map = let add key value (table: Map<_, _>) = table.Add (key, value) - [] [] let change key f (table: Map<_, _>) = table.Change (key, f) diff --git a/src/fsharp/FSharp.Core/map.fsi b/src/fsharp/FSharp.Core/map.fsi index 7a7b67d6555..04e6b048326 100644 --- a/src/fsharp/FSharp.Core/map.fsi +++ b/src/fsharp/FSharp.Core/map.fsi @@ -26,7 +26,6 @@ namespace Microsoft.FSharp.Collections /// The input key. /// The change function. /// The resulting map. - [] member Change: key:'Key * f:('Value option -> 'Value option) -> Map<'Key,'Value> /// Returns true if there are no bindings in the map. @@ -98,7 +97,6 @@ namespace Microsoft.FSharp.Collections /// The change function. /// The input map. /// The resulting map. - [] [] val change: key:'Key -> f:('T option -> 'T option) -> table:Map<'Key,'T> -> Map<'Key,'T> From 6b84cb5cd1b5af500d52588a895f8a108124530c Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Mon, 13 Jul 2020 17:04:33 -0700 Subject: [PATCH 2/2] slight cleanup (#9686) --- .../FSharp.DependencyManager.fs | 18 ++++----- .../DependencyProvider.fs | 38 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs b/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs index c03e0da4be0..2a39ee1ecd6 100644 --- a/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs +++ b/src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs @@ -103,22 +103,22 @@ module FSharpDependencyManager = type ResolveDependenciesResult (success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) = /// Succeded? - member __.Success = success + member _.Success = success /// The resolution output log - member __.StdOut = stdOut + member _.StdOut = stdOut /// The resolution error log (* process stderror *) - member __.StdError = stdError + member _.StdError = stdError /// The resolution paths - member __.Resolutions = resolutions + member _.Resolutions = resolutions /// The source code file paths - member __.SourceFiles = sourceFiles + member _.SourceFiles = sourceFiles /// The roots to package directories - member __.Roots = roots + member _.Roots = roots [] type FSharpDependencyManager (outputDir:string option) = @@ -159,11 +159,11 @@ type FSharpDependencyManager (outputDir:string option) = do if deleteAtExit then AppDomain.CurrentDomain.ProcessExit |> Event.add(fun _ -> deleteScripts () ) - member __.Name = name + member _.Name = name - member __.Key = key + member _.Key = key - member __.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj = + member _.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj = let scriptExt, poundRprefix = match scriptExt with diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs b/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs index 09d65272805..1beb7ed3629 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs +++ b/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs @@ -128,37 +128,37 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn static member MakeResultFromObject(result: obj) = { new IResolveDependenciesResult with /// Succeded? - member __.Success = + member _.Success = match getInstanceProperty (result.GetType()) "Success" with | None -> false | Some p -> p.GetValue(result) :?> bool /// The resolution output log - member __.StdOut = + member _.StdOut = match getInstanceProperty (result.GetType()) "StdOut" with | None -> Array.empty | Some p -> p.GetValue(result) :?> string array /// The resolution error log (* process stderror *) - member __.StdError = + member _.StdError = match getInstanceProperty (result.GetType()) "StdError" with | None -> Array.empty | Some p -> p.GetValue(result) :?> string array /// The resolution paths - member __.Resolutions = + member _.Resolutions = match getInstanceProperty (result.GetType()) "Resolutions" with | None -> Seq.empty | Some p -> p.GetValue(result) :?> string seq /// The source code file paths - member __.SourceFiles = + member _.SourceFiles = match getInstanceProperty (result.GetType()) "SourceFiles" with | None -> Seq.empty | Some p -> p.GetValue(result) :?> string seq /// The roots to package directories - member __.Roots = + member _.Roots = match getInstanceProperty (result.GetType()) "Roots" with | None -> Seq.empty | Some p -> p.GetValue(result) :?> string seq @@ -167,32 +167,32 @@ type ReflectionDependencyManagerProvider(theType: Type, nameProperty: PropertyIn static member MakeResultFromFields(success: bool, stdOut: string array, stdError: string array, resolutions: string seq, sourceFiles: string seq, roots: string seq) = { new IResolveDependenciesResult with /// Succeded? - member __.Success = success + member _.Success = success /// The resolution output log - member __.StdOut = stdOut + member _.StdOut = stdOut /// The resolution error log (* process stderror *) - member __.StdError = stdError + member _.StdError = stdError /// The resolution paths - member __.Resolutions = resolutions + member _.Resolutions = resolutions /// The source code file paths - member __.SourceFiles = sourceFiles + member _.SourceFiles = sourceFiles /// The roots to package directories - member __.Roots = roots + member _.Roots = roots } interface IDependencyManagerProvider with /// Name of dependency Manager - member __.Name = instance |> nameProperty + member _.Name = instance |> nameProperty /// Key of dependency Manager: used for #r "key: ... " E.g nuget - member __.Key = instance |> keyProperty + member _.Key = instance |> keyProperty /// Resolve the dependencies for the given arguments member this.ResolveDependencies(scriptDir, mainScriptName, scriptName, scriptExt, packageManagerTextLines, tfm, rid): IResolveDependenciesResult = @@ -302,7 +302,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr new DependencyProvider(Unchecked.defaultof, nativeProbingRoots) /// Returns a formatted error message for the host to present - member __.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) = + member _.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) = let registeredKeys = String.Join(", ", RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError |> Seq.map (fun kv -> kv.Value.Key)) let searchPaths = assemblySearchPaths.Force() DependencyManager.SR.packageManagerUnknown(packageManagerKey, String.Join(", ", searchPaths, compilerTools), registeredKeys) @@ -330,12 +330,12 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr null, Unchecked.defaultof /// Remove the dependency mager with the specified key - member __.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string = + member _.RemoveDependencyManagerKey(packageManagerKey:string, path:string): string = path.Substring(packageManagerKey.Length + 1).Trim() /// Fetch a dependencymanager that supports a specific key - member __.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider = + member _.TryFindDependencyManagerByKey (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, key: string): IDependencyManagerProvider = try RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError @@ -350,7 +350,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr Unchecked.defaultof /// Resolve reference for a list of package manager lines - member __.Resolve (packageManager:IDependencyManagerProvider, + member _.Resolve (packageManager:IDependencyManagerProvider, scriptExt: string, packageManagerTextLines: string seq, reportError: ResolvingErrorReport, @@ -376,7 +376,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr interface IDisposable with - member __.Dispose() = + member _.Dispose() = // Unregister everything registeredDependencyManagers <- None