From 044d14c8b47e72df343537516c3bba5681f2086e Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Mon, 7 Dec 2020 15:14:34 +0100
Subject: [PATCH] Use private imports in generated code

---
 generator/src/ql.rs                                 | 2 +-
 ql/src/codeql_ruby/ast/internal/TreeSitter.qll      | 4 ++--
 ql/src/codeql_ruby/controlflow/BasicBlocks.qll      | 1 +
 ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/generator/src/ql.rs b/generator/src/ql.rs
index f7b6a9b07f3..2ea1f753d7b 100644
--- a/generator/src/ql.rs
+++ b/generator/src/ql.rs
@@ -9,7 +9,7 @@ pub enum TopLevel<'a> {
 impl<'a> fmt::Display for TopLevel<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            TopLevel::Import(x) => write!(f, "import {}", x),
+            TopLevel::Import(x) => write!(f, "private import {}", x),
             TopLevel::Class(cls) => write!(f, "{}", cls),
         }
     }
diff --git a/ql/src/codeql_ruby/ast/internal/TreeSitter.qll b/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
index 3fdcf81de11..6f4bb45337d 100644
--- a/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
+++ b/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
@@ -4,8 +4,8 @@
  */
 
 module Generated {
-  import codeql.files.FileSystem
-  import codeql.Locations
+  private import codeql.files.FileSystem
+  private import codeql.Locations
 
   class AstNode extends @ast_node {
     string toString() { result = this.describeQlClass() }
diff --git a/ql/src/codeql_ruby/controlflow/BasicBlocks.qll b/ql/src/codeql_ruby/controlflow/BasicBlocks.qll
index 15b5934224f..f9ba58f9c59 100644
--- a/ql/src/codeql_ruby/controlflow/BasicBlocks.qll
+++ b/ql/src/codeql_ruby/controlflow/BasicBlocks.qll
@@ -1,5 +1,6 @@
 /** Provides classes representing basic blocks. */
 
+private import codeql.Locations
 private import codeql_ruby.ast.internal.TreeSitter::Generated
 private import codeql_ruby.controlflow.ControlFlowGraph
 private import internal.ControlFlowGraphImpl
diff --git a/ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll b/ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
index a15066674b7..98b5db552bc 100644
--- a/ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
+++ b/ql/src/codeql_ruby/controlflow/ControlFlowGraph.qll
@@ -1,5 +1,6 @@
 /** Provides classes representing the control flow graph. */
 
+private import codeql.Locations
 private import codeql_ruby.ast.internal.TreeSitter::Generated
 private import codeql_ruby.controlflow.BasicBlocks
 private import SuccessorTypes