Be explicit

SteveGilham · Feb 28, 2020 · 5c64f8d · 5c64f8d
1 parent 5e17afa
commit 5c64f8d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/AltCover.Visualizer/CoverageFile.fs b/AltCover.Visualizer/CoverageFile.fs
@@ -23,14 +23,12 @@ type InvalidFile =
 module Transformer =
   let internal DefaultHelper (_ : XDocument) (document : XDocument) = document
 
-  [<System.Diagnostics.CodeAnalysis.SuppressMessage(
-      "Gendarme.Rules.Correctness",
-      "EnsureLocalDisposalRule",
-      Justification = "Fails on travis -- FIXME"
-  )>]
+  [<System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202",
+                                 Justification = "Multiple Close() should be safe")>]
   let internal LoadTransform(path : string) =
-    let stylesheet =
-      XmlReader.Create(Assembly.GetExecutingAssembly().GetManifestResourceStream(path))
+    use str = Assembly.GetExecutingAssembly().GetManifestResourceStream(path)
+    use stylesheet =
+      XmlReader.Create(str)
     let xmlTransform = new XslCompiledTransform()
     xmlTransform.Load(stylesheet, new XsltSettings(false, true), null)
     xmlTransform
@@ -52,6 +50,8 @@ module Transformer =
       TransformFromOtherCover document "AltCover.Visualizer.OpenCoverToNCoverEx.xsl"
     report
 
+  [<System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202",
+                                 Justification = "Multiple Close() should be safe")>]
   // PartCover to NCover style sheet
   let internal ConvertFile (helper : CoverageTool -> XDocument -> XDocument -> XDocument)
       (document : XDocument) =

diff --git a/AltCover.Visualizer/Visualizer.fs b/AltCover.Visualizer/Visualizer.fs
@@ -164,11 +164,6 @@ module internal Persistence =
       "DoNotSwallowErrorsCatchingNonSpecificExceptionsRule",
       Justification = "need to exhaustively list the espected ones"
   )>]
-  [<System.Diagnostics.CodeAnalysis.SuppressMessage(
-      "Gendarme.Rules.Correctness",
-      "EnsureLocalDisposalRule",
-      Justification = "Fails on travis -- FIXME"
-  )>]
   let private EnsureFile() =
     let profileDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
     let dir = Directory.CreateDirectory(Path.Combine(profileDir, ".altcover"))
@@ -182,10 +177,11 @@ module internal Persistence =
         let doc = XDocument.Load(file)
         try
           let schemas = new XmlSchemaSet()
-          use xsd =
-            new StreamReader(Assembly.GetExecutingAssembly()
-                                     .GetManifestResourceStream("AltCover.Visualizer.config.xsd"))
-                                     |> XmlReader.Create
+          use str = Assembly.GetExecutingAssembly()
+                                     .GetManifestResourceStream("AltCover.Visualizer.config.xsd")
+          use xr = new StreamReader(str)
+          use xsd = xr |> XmlReader.Create
+
           schemas.Add(String.Empty,  xsd) |> ignore
           doc.Validate(schemas, null)
           (file, doc)