Cleanup: remove redundant qualifiers

Author: auduchinok

src/Compiler/AbstractIL/il.fsi

@@ -111,7 +111,7 @@ type ILAssemblyRef =
 
     member EqualsIgnoringVersion: ILAssemblyRef -> bool
 
-    interface System.IComparable
+    interface IComparable
 
 [<Sealed>]
 type ILModuleRef =
@@ -123,7 +123,7 @@ type ILModuleRef =
 
     member Hash: byte[] option
 
-    interface System.IComparable
+    interface IComparable
 
 // Scope references
 [<StructuralEquality; StructuralComparison; RequireQualifiedAccess>]
@@ -239,7 +239,7 @@ type ILTypeRef =
 
     override ToString: unit -> string
 
-    interface System.IComparable
+    interface IComparable
 
 /// Type specs and types.
 [<Sealed>]
@@ -267,7 +267,7 @@ type ILTypeSpec =
 
     member internal EqualsWithPrimaryScopeRef: ILScopeRef * obj -> bool
 
-    interface System.IComparable
+    interface IComparable
 
 [<RequireQualifiedAccess; StructuralEquality; StructuralComparison>]
 type ILType =
@@ -371,7 +371,7 @@ type ILMethodRef =
 
     member GetCallingSignature: unit -> ILCallingSignature
 
-    interface System.IComparable
+    interface IComparable
 
 /// Formal identities of fields.
 [<StructuralEquality; StructuralComparison>]
@@ -403,7 +403,7 @@ type ILMethodSpec =
 
     member FormalReturnType: ILType
 
-    interface System.IComparable
+    interface IComparable
 
 /// Field specs.  The data given for a ldfld, stfld etc. instruction.
 [<StructuralEquality; StructuralComparison>]
@@ -2490,7 +2490,7 @@ type internal ILPropertyRef =
     static member Create: ILTypeRef * string -> ILPropertyRef
     member DeclaringTypeRef: ILTypeRef
     member Name: string
-    interface System.IComparable
+    interface IComparable
 
 type ILReferences =
     { AssemblyReferences: ILAssemblyRef[]

src/Compiler/AbstractIL/ilreflect.fs

@@ -550,7 +550,7 @@ let emEnv0 =
         delayedFieldInits = []
     }
 
-let envBindTypeRef emEnv (tref: ILTypeRef) (typT: System.Type MaybeNull, typB, typeDef) =
+let envBindTypeRef emEnv (tref: ILTypeRef) (typT: Type MaybeNull, typB, typeDef) =
     match typT with
     | Null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name
     | NonNull typT ->

src/Compiler/AbstractIL/ilwrite.fs

@@ -2623,7 +2623,7 @@ let GenMethodDefSigAsBlobIdx cenv env mdef =
     GetBytesAsBlobIdx cenv (GetMethodDefSigAsBytes cenv env mdef)
 
 let ilMethodBodyThrowNull =
-    let ilCode = IL.buildILCode "" (Dictionary()) [|ILInstr.AI_ldnull; ILInstr.I_throw|] [] []
+    let ilCode = buildILCode "" (Dictionary()) [|ILInstr.AI_ldnull; ILInstr.I_throw|] [] []
     mkILMethodBody(false, ILLocals.Empty, 0, ilCode, None, None)
 
 let GenMethodDefAsRow cenv env midx (mdef: ILMethodDef) =
@@ -4166,7 +4166,7 @@ let writeBinaryAux (stream: Stream, options: options, modul, normalizeAssemblyRe
             [| hCode
                hData
                match options.referenceAssemblyOnly, options.referenceAssemblySignatureHash with
-               | true, Some impliedSigHash -> System.BitConverter.GetBytes(impliedSigHash)
+               | true, Some impliedSigHash -> BitConverter.GetBytes(impliedSigHash)
                | _ -> sha.ComputeHash metadata |] 
             |> Array.collect id 
             |> sha.ComputeHash

src/Compiler/Checking/AttributeChecking.fs

@@ -76,7 +76,7 @@ let rec private evalFSharpAttribArg g attribExpr =
 
 type AttribInfo = 
     | FSAttribInfo of TcGlobals * Attrib
-    | ILAttribInfo of TcGlobals * Import.ImportMap * ILScopeRef * ILAttribute * range
+    | ILAttribInfo of TcGlobals * ImportMap * ILScopeRef * ILAttribute * range
 
     member x.Range = 
          match x with 

src/Compiler/Checking/CheckDeclarations.fs

@@ -309,7 +309,7 @@ let AddRootModuleOrNamespaceRefs g amap m env modrefs =
 
 /// Adjust the TcEnv to make more things 'InternalsVisibleTo'
 let addInternalsAccessibility env (ccu: CcuThunk) =
-    let compPath = CompPath (ccu.ILScopeRef, TypedTree.SyntaxAccess.Unknown, [])    
+    let compPath = CompPath (ccu.ILScopeRef, SyntaxAccess.Unknown, [])    
     let eInternalsVisibleCompPaths = compPath :: env.eInternalsVisibleCompPaths
     { env with 
         eAccessRights = ComputeAccessRights env.eAccessPath eInternalsVisibleCompPaths env.eFamilyType // update this computed field
@@ -1180,7 +1180,7 @@ module MutRecBindingChecking =
                           TyconBindingPhase2A.Phase2AMember {
                             SyntacticBinding = NormalizedBinding(pat = SynPat.Named(ident = SynIdent(ident = Get_OrSet_Ident & setIdent)))
                             RecBindingInfo = RecursiveBindingInfo(vspec = vSet)
-                          } when Range.equals getIdent.idRange setIdent.idRange ->
+                          } when equals getIdent.idRange setIdent.idRange ->
                             match  vGet.ApparentEnclosingEntity with
                             | ParentNone -> ()
                             | Parent parentRef ->

src/Compiler/Checking/CheckFormatStrings.fs

@@ -55,7 +55,7 @@ let escapeDotnetFormatString str =
     // We need to double '{' and '}', because even if they were escaped in the
     // original string, extra curly braces were stripped away by the F# lexer.
     |> Seq.collect (fun x -> if x = '{' || x = '}' then [x;x] else [x])
-    |> System.String.Concat
+    |> String.Concat
 
 [<return: Struct>]
 let (|PrefixedBy|_|) (prefix: string) (str: string) =
@@ -140,13 +140,13 @@ module internal Parse =
     let rec digitsPrecision (fmt: string) (fmtPos: int) =
         if fmtPos >= fmt.Length then failwith (FSComp.SR.forBadPrecision())
         match fmt[fmtPos] with
-        | c when System.Char.IsDigit c -> digitsPrecision fmt (fmtPos+1)
+        | c when Char.IsDigit c -> digitsPrecision fmt (fmtPos+1)
         | _ -> fmtPos
 
     let precision (info: FormatInfoRegister) (fmt: string) (fmtPos: int) =
         if fmtPos >= fmt.Length then failwith (FSComp.SR.forBadWidth())
         match fmt[fmtPos] with
-        | c when System.Char.IsDigit c -> info.precision <- true; false,digitsPrecision fmt (fmtPos+1)
+        | c when Char.IsDigit c -> info.precision <- true; false,digitsPrecision fmt (fmtPos+1)
         | '*' -> info.precision <- true; true,(fmtPos+1)
         | _ -> failwith (FSComp.SR.forPrecisionMissingAfterDot())
 
@@ -161,14 +161,14 @@ module internal Parse =
         let rec go pos n =
             if pos >= len then failwith (FSComp.SR.forBadPrecision())
             match fmt[pos] with
-            | c when System.Char.IsDigit c -> go (pos+1) (n*10 + int c - int '0')
+            | c when Char.IsDigit c -> go (pos+1) (n*10 + int c - int '0')
             | _ -> Some n, optionalDotAndPrecision info fmt pos
         go fmtPos intAcc
 
     let widthAndPrecision (info: FormatInfoRegister) (fmt: string) (fmtPos: int) =
         if fmtPos >= fmt.Length then failwith (FSComp.SR.forBadPrecision())
         match fmt[fmtPos] with
-        | c when System.Char.IsDigit c -> false,digitsWidthAndPrecision info fmt fmtPos 0
+        | c when Char.IsDigit c -> false,digitsWidthAndPrecision info fmt fmtPos 0
         | '*' -> true, (None, optionalDotAndPrecision info fmt (fmtPos+1))
         | _ -> false, (None, optionalDotAndPrecision info fmt fmtPos)
 
@@ -178,7 +178,7 @@ module internal Parse =
         let rec digitsPosition n pos =
             if pos >= len then failwith (FSComp.SR.forBadPrecision())
             match fmt[pos] with
-            | c when System.Char.IsDigit c -> digitsPosition (n*10 + int c - int '0') (pos+1)
+            | c when Char.IsDigit c -> digitsPosition (n*10 + int c - int '0') (pos+1)
             | '$' -> Some n, pos+1
             | _ -> None, pos
 
@@ -296,7 +296,7 @@ let parseFormatStringInternal
                else
                    failwith (FSComp.SR.forPositionalSpecifiersNotPermitted())
            argTys
-       elif System.Char.IsSurrogatePair(fmt,i) then
+       elif Char.IsSurrogatePair(fmt,i) then
           appendToDotnetFormatString fmt[i..i+1]
           parseLoop acc (i+2, fragLine, fragCol+2) fragments
        else
@@ -397,7 +397,7 @@ let parseFormatStringInternal
             let ch = fmt[i]
             match ch with
             | 'd' | 'i' | 'u' | 'B' | 'o' | 'x' | 'X' ->
-                if ch = 'B' then DiagnosticsLogger.checkLanguageFeatureError g.langVersion Features.LanguageFeature.PrintfBinaryFormat m
+                if ch = 'B' then checkLanguageFeatureError g.langVersion Features.LanguageFeature.PrintfBinaryFormat m
                 if info.precision then failwith (FSComp.SR.forFormatDoesntSupportPrecision(ch.ToString()))
                 collectSpecifierLocation fragLine fragCol 1
                 let i = skipPossibleInterpolationHole (i+1)

src/Compiler/Checking/ConstraintSolver.fs

@@ -80,7 +80,7 @@ open FSharp.Compiler.TypeProviders
 // of the constraint resolution carried out by type checking.
 //------------------------------------------------------------------------- 
 
-let compgenId = mkSynId Range.range0 unassignedTyparName
+let compgenId = mkSynId range0 unassignedTyparName
 
 let NewCompGenTypar (kind, rigid, staticReq, dynamicReq, error) = 
     Construct.NewTypar(kind, rigid, SynTypar(compgenId, staticReq, true), error, dynamicReq, [], false, false) 

src/Compiler/Checking/Expressions/CheckComputationExpressions.fs

@@ -1381,7 +1381,7 @@ let rec TryTranslateComputationExpression
 
                     let condBinding =
                         mkSynBinding
-                            (Xml.PreXmlDoc.Empty, patCond)
+                            (PreXmlDoc.Empty, patCond)
                             (None,
                              false,
                              true,
@@ -1545,7 +1545,7 @@ let rec TryTranslateComputationExpression
                 // and so we use a more specific error message for clarity.
                 | SynExpr.Const(SynConst.Unit, mUnit) when
                     cenv.g.langVersion.SupportsFeature LanguageFeature.EmptyBodiedComputationExpressions
-                    && Range.equals mUnit range0
+                    && equals mUnit range0
                     ->
                     error (Error(FSComp.SR.tcEmptyBodyRequiresBuilderZeroMethod (), ceenv.mWhole))
                 | _ -> error (Error(FSComp.SR.tcRequireBuilderMethod ("Zero"), m))

src/Compiler/Checking/Expressions/CheckExpressions.fs

@@ -4967,7 +4967,7 @@ and CrackStaticConstantArgs (cenv: cenv) env tpenv (staticParameters: Tainted<Pr
 
     let argsInStaticParameterOrderIncludingDefaults =
         staticParameters |> Array.mapi (fun i sp ->
-            let spKind = Import.ImportProvidedType cenv.amap m (sp.PApply((fun x -> x.ParameterType), m))
+            let spKind = ImportProvidedType cenv.amap m (sp.PApply((fun x -> x.ParameterType), m))
             let spName = sp.PUntaint((fun sp -> sp.Name), m)
             if i < unnamedArgs.Length then
                 let v = unnamedArgs[i]
@@ -5050,7 +5050,7 @@ and TcProvidedTypeApp (cenv: cenv) env tpenv tcref args m =
     if hasNoArgs then
         mkWoNullAppTy tcref [], tpenv
     else
-        let ty = Import.ImportProvidedType cenv.amap m providedTypeAfterStaticArguments
+        let ty = ImportProvidedType cenv.amap m providedTypeAfterStaticArguments
         ty, tpenv
 #endif
 
@@ -6598,11 +6598,11 @@ and ExpandIndexArgs (cenv: cenv) (synLeftExprOpt: SynExpr option) indexArgs =
 
     let mkSynSomeExpr (m: range) x =
         let m = m.MakeSynthetic()
-        SynExpr.App (ExprAtomicFlag.NonAtomic, false, mkSynLidGet m FSharpLib.CorePath "Some", x, m)
+        SynExpr.App (ExprAtomicFlag.NonAtomic, false, mkSynLidGet m CorePath "Some", x, m)
 
     let mkSynNoneExpr (m: range) =
         let m = m.MakeSynthetic()
-        mkSynLidGet m FSharpLib.CorePath "None"
+        mkSynLidGet m CorePath "None"
 
     let expandedIndexArgs =
         indexArgs
@@ -10440,7 +10440,7 @@ and TcSetterArgExpr (cenv: cenv) env denv objExpr ad assignedSetter calledFromCo
             MethInfoChecks g cenv.amap true None [objExpr] ad m pminfo
             let calledArgTy = List.head (List.head (pminfo.GetParamTypes(cenv.amap, m, pminst)))
             let tcVal = LightweightTcValForUsingInBuildMethodCall g
-            let argExprPrebinder, argExpr = MethodCalls.AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
+            let argExprPrebinder, argExpr = AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
             let mut = (if isStructTy g (tyOfExpr g objExpr) then DefinitelyMutates else PossiblyMutates)
             let action = BuildPossiblyConditionalMethodCall cenv env mut m true pminfo NormalValUse pminst [objExpr] [argExpr] propStaticTyOpt |> fst
             argExprPrebinder, action, Item.Property (pinfo.PropertyName, [pinfo], None)
@@ -10450,7 +10450,7 @@ and TcSetterArgExpr (cenv: cenv) env denv objExpr ad assignedSetter calledFromCo
             ILFieldInstanceChecks g cenv.amap ad m finfo
             let calledArgTy = finfo.FieldType (cenv.amap, m)
             let tcVal = LightweightTcValForUsingInBuildMethodCall g
-            let argExprPrebinder, argExpr = MethodCalls.AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
+            let argExprPrebinder, argExpr = AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
             let action = BuildILFieldSet g m objExpr finfo argExpr
             argExprPrebinder, action, Item.ILField finfo
 
@@ -10459,7 +10459,7 @@ and TcSetterArgExpr (cenv: cenv) env denv objExpr ad assignedSetter calledFromCo
             let calledArgTy = rfinfo.FieldType
             CheckRecdFieldMutation m denv rfinfo
             let tcVal = LightweightTcValForUsingInBuildMethodCall g
-            let argExprPrebinder, argExpr = MethodCalls.AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
+            let argExprPrebinder, argExpr = AdjustCallerArgExpr tcVal g cenv.amap cenv.infoReader ad false calledArgTy ReflectedArgInfo.None callerArgTy m argExpr
             let action = BuildRecdFieldSet g m objExpr rfinfo argExpr
             argExprPrebinder, action, Item.RecdField rfinfo
 

src/Compiler/Checking/InfoReader.fs

@@ -352,7 +352,7 @@ type private IndexedList<'T>(itemLists: 'T list list, itemsByName: NameMultiMap<
 
 /// An InfoReader is an object to help us read and cache infos. 
 /// We create one of these for each file we typecheck. 
-type InfoReader(g: TcGlobals, amap: Import.ImportMap) as this =
+type InfoReader(g: TcGlobals, amap: ImportMap) as this =
 
     /// Get the declared IL fields of a type, not including inherited fields
     let GetImmediateIntrinsicILFieldsOfType (optFilter, ad) m ty =