Revert "generate overridden publicities when analyzing types"

This reverts commit 21b3222.
gleam-lang · Apr 22, 2024 · 9e59319 · 9e59319
1 parent 543a340
commit 9e59319
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/compiler-core/src/analyse.rs b/compiler-core/src/analyse.rs
@@ -33,7 +33,6 @@ use crate::{
 };
 use camino::Utf8PathBuf;
 use ecow::EcoString;
-use im::HashSet;
 use itertools::Itertools;
 use std::{
     collections::HashMap,
@@ -175,7 +174,6 @@ pub fn infer_module<A>(
     // We process imports first so that anything imported can be referenced
     // anywhere in the module.
     let mut env = imports::Importer::run(origin, env, &statements.imports)?;
-    let mut overridden_publicities = HashSet::new();
 
     // Register types so they can be used in constructors and functions
     // earlier in the module.
@@ -251,8 +249,7 @@ pub fn infer_module<A>(
                     working_group.push(statement);
                 }
                 CallGraphNode::ModuleConstant(c) => {
-                    let statement =
-                        infer_module_constant(c, &mut env, &mut overridden_publicities, &name)?;
+                    let statement = infer_module_constant(c, &mut env, &name)?;
                     working_group.push(statement);
                 }
             }
@@ -318,7 +315,6 @@ pub fn infer_module<A>(
         documentation,
         name: name.clone(),
         definitions: typed_statements,
-        overridden_publicities,
         type_info: ModuleInterface {
             name,
             types,
@@ -1076,7 +1072,6 @@ fn record_imported_items_for_use_detection<A>(
 fn infer_module_constant(
     c: ModuleConstant<(), ()>,
     environment: &mut Environment<'_>,
-    overridden_publicities: &mut HashSet<EcoString>,
     module_name: &EcoString,
 ) -> Result<TypedDefinition, Error> {
     let ModuleConstant {
@@ -1126,8 +1121,6 @@ fn infer_module_constant(
 
     if publicity.is_private() {
         environment.init_usage(name.clone(), EntityKind::PrivateConstant, location);
-    } else {
-        typed_expr.private_fn_deps(overridden_publicities);
     }
 
     Ok(Definition::ModuleConstant(ModuleConstant {

diff --git a/compiler-core/src/ast.rs b/compiler-core/src/ast.rs
@@ -19,7 +19,6 @@ use crate::type_::{
 use std::sync::Arc;
 
 use ecow::EcoString;
-use im::HashSet;
 #[cfg(test)]
 use pretty_assertions::assert_eq;
 use vec1::Vec1;
@@ -45,7 +44,6 @@ pub struct Module<Info, Statements> {
     pub documentation: Vec<EcoString>,
     pub type_info: Info,
     pub definitions: Vec<Statements>,
-    pub overridden_publicities: HashSet<EcoString>,
 }
 
 impl TypedModule {

diff --git a/compiler-core/src/erlang.rs b/compiler-core/src/erlang.rs
@@ -180,7 +180,7 @@ fn module_document<'a>(
             &mut type_exports,
             &mut type_defs,
             &module.name,
-            &module.overridden_publicities,
+            &overridden_publicity,
         );
     }
 

diff --git a/compiler-core/src/parse.rs b/compiler-core/src/parse.rs
@@ -71,7 +71,6 @@ use crate::type_::expression::Implementations;
 use crate::type_::Deprecation;
 use ecow::EcoString;
 use error::{LexicalError, ParseError, ParseErrorType};
-use im::HashSet;
 use lexer::{LexResult, Spanned};
 use std::cmp::Ordering;
 use std::collections::VecDeque;
@@ -206,7 +205,6 @@ where
             documentation: vec![],
             type_info: (),
             definitions,
-            overridden_publicities: HashSet::new(),
         };
         Ok(Parsed {
             module,

diff --git a/compiler-core/src/parse/snapshots/gleam_core__parse__tests__import_type.snap b/compiler-core/src/parse/snapshots/gleam_core__parse__tests__import_type.snap
@@ -1,5 +1,6 @@
 ---
 source: compiler-core/src/parse/tests.rs
+assertion_line: 646
 expression: "import wibble.{type Wobble, Wobble, type Wabble}"
 ---
 Parsed {
@@ -52,7 +53,6 @@ Parsed {
                 target: None,
             },
         ],
-        overridden_publicities: {},
     },
     extra: ModuleExtra {
         module_comments: [],

diff --git a/compiler-core/src/type_/tests.rs b/compiler-core/src/type_/tests.rs
@@ -10,7 +10,6 @@ use crate::{
     warning::{TypeWarningEmitter, VectorWarningEmitterIO, WarningEmitter, WarningEmitterIO},
 };
 use ecow::EcoString;
-use im::HashSet;
 use itertools::Itertools;
 use std::sync::Arc;
 use vec1::Vec1;
@@ -609,7 +608,6 @@ fn infer_module_type_retention_test() {
         name: "ok".into(),
         definitions: vec![],
         type_info: (),
-        overridden_publicities: HashSet::new(),
     };
     let direct_dependencies = std::collections::HashMap::from_iter(vec![]);
     let ids = UniqueIdGenerator::new();