From 72921234c88f071c88d1e6d643f0f49d86384800 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 26 May 2023 18:55:24 +0200 Subject: [PATCH 01/52] Add AmbiguousImportAnalysis --- .../main/scala/org/enso/compiler/Passes.scala | 1 + .../scala/org/enso/compiler/core/IR.scala | 32 ++- .../analyse/AmbiguousImportsAnalysis.scala | 255 ++++++++++++++++++ .../test/semantic/ImportExportTest.scala | 227 ++++++++++++++++ 4 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala diff --git a/engine/runtime/src/main/scala/org/enso/compiler/Passes.scala b/engine/runtime/src/main/scala/org/enso/compiler/Passes.scala index 54b4cf181a4e..4a0501212646 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/Passes.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/Passes.scala @@ -47,6 +47,7 @@ class Passes( OperatorToFunction, LambdaShorthandToLambda, ImportSymbolAnalysis, + AmbiguousImportsAnalysis, ShadowedPatternFields, UnreachableMatchBranches, NestedPatternMatch, diff --git a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala index 8a4cb1b1e797..90bec2891f60 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala @@ -9,9 +9,9 @@ import org.enso.compiler.exception.CompilerError import org.enso.compiler.pass.IRPass import org.enso.interpreter.epb.EpbParser import org.enso.syntax.text.{Debug, Location} +import com.oracle.truffle.api.source.Source import java.util.UUID - import scala.annotation.unused /** [[IR]] is a temporary and fairly unsophisticated internal representation @@ -8815,6 +8815,36 @@ object IR { override def message: String = s"No such constructor ${constructorName} in type $typeName" } + + case class AmbiguousImport( + originalImport: IR.Module.Scope.Import, + symbolName: String, + source: Source + ) extends Reason { + override def message: String = { + val originalImportRepr = + originalImport.location match { + case Some(location) => + s"'${originalImport.showCode()}' in ${fileLocationFromSection(location, source)}" + case None => originalImport.showCode() + } + s"Ambiguous imported symbol '${symbolName}' in import statement. The original import is ${originalImportRepr}" + } + + private def fileLocationFromSection( + loc: IR.IdentifiedLocation, + source: Source + ): String = { + val section = + source.createSection(loc.location.start, loc.location.length) + val locStr = + "" + section.getStartLine + ":" + + section.getStartColumn + "-" + + section.getEndLine + ":" + + section.getEndColumn + source.getName + "[" + locStr + "]" + } + } } /** An erroneous import or export statement. diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala new file mode 100644 index 000000000000..c040b8f8649d --- /dev/null +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -0,0 +1,255 @@ +package org.enso.compiler.pass.analyse + +import org.enso.interpreter.runtime.Module +import org.enso.compiler.context.{InlineContext, ModuleContext} +import org.enso.compiler.core.IR +import org.enso.compiler.core.IR.Module.Scope.Import +import org.enso.compiler.data.BindingsMap +import org.enso.compiler.pass.IRPass + +import scala.collection.mutable + +/** A pass that checks for ambiguous (duplicated) symbols from imports. For every encountered + * imported symbol that has already been imported before, the pass replaces the import with + * an [[IR.Error.ImportExport]]. Moreover, the original import is saved in the error so that + * the user can see from which location the symbol was originally imported. + * + * Also iterates polyglot imports. + * + * Thi pass does not alter any metadata. + */ +case object AmbiguousImportsAnalysis extends IRPass { + + override type Metadata = IRPass.Metadata.Empty + + override type Config = IRPass.Configuration.Default + + override val precursorPasses: Seq[IRPass] = + Seq(BindingAnalysis, ImportSymbolAnalysis) + + override val invalidatedPasses: Seq[IRPass] = + Seq() + + /** @inheritdoc + */ + override def runExpression( + ir: IR.Expression, + inlineContext: InlineContext + ): IR.Expression = ir + + /** @inheritdoc + */ + override def updateMetadataInDuplicate[T <: IR](sourceIr: T, copyOfIr: T): T = + copyOfIr + + /** @inheritdoc + */ + override def runModule( + ir: IR.Module, + moduleContext: ModuleContext + ): IR.Module = { + val bindingMap = ir.unsafeGetMetadata( + BindingAnalysis, + "BindingMap should already be present" + ) + val encounteredSymbols = new EncounteredSymbols() + ir.copy( + imports = ir.imports.flatMap( + analyseAmbiguousSymbols( + _, + moduleContext.module, + bindingMap, + encounteredSymbols + ) + ) + ) + } + + private def analyseAmbiguousSymbols( + imp: IR.Module.Scope.Import, + module: Module, + bindingMap: BindingsMap, + encounteredSymbols: EncounteredSymbols + ): List[IR.Module.Scope.Import] = { + imp match { + // Import multiple symbols + case moduleImport @ IR.Module.Scope.Import.Module( + _, + _, + _, + Some(onlyNames), + _, + _, + _, + _, + _ + ) => + onlyNames.flatMap(symbol => { + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + symbol.name + ) match { + case Some(irError) => List(irError) + case None => List(moduleImport) + } + }) + + // Import all symbols + case moduleImport @ IR.Module.Scope.Import.Module( + _, + _, + true, + _, + _, + _, + _, + _, + _ + ) => + bindingMap.resolvedImports.find(_.importDef == moduleImport) match { + case Some(resolvedImport) => + val symbolsFromImport = + resolvedImport.target.exportedSymbols.keySet + val encounteredErrors: List[IR.Error.ImportExport] = + symbolsFromImport.toList.flatMap(symbol => { + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + symbol + ) + }) + if (encounteredErrors.nonEmpty) { + encounteredErrors + } else { + List(moduleImport) + } + case None => + List(moduleImport) + } + + // Import a renamed symbol + case moduleImport @ IR.Module.Scope.Import.Module( + _, + Some(rename), + _, + _, + _, + _, + _, + _, + _ + ) => + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + rename.name + ) match { + case Some(irError) => List(irError) + case None => List(moduleImport) + } + + // Import one symbol + case moduleImport @ IR.Module.Scope.Import.Module( + symbolName, + _, + _, + _, + _, + _, + _, + _, + _ + ) => + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + symbolName.parts.last.name + ) match { + case Some(irError) => List(irError) + case None => List(moduleImport) + } + + case polyImport @ Import.Polyglot(_, rename, _, _, _) => + val symbolName = rename match { + case Some(rename) => rename + case None => polyImport.entity.getVisibleName + } + tryAddEncounteredSymbol( + module, + encounteredSymbols, + polyImport, + symbolName + ) match { + case Some(irError) => List(irError) + case None => List(polyImport) + } + + case _ => List(imp) + } + } + + private def tryAddEncounteredSymbol( + module: Module, + encounteredSymbols: EncounteredSymbols, + currentImport: IR.Module.Scope.Import, + symbol: String + ): Option[IR.Error.ImportExport] = { + encounteredSymbols.getOriginalImportForSymbol(symbol) match { + case Some(definingImport) => + Some( + createErrorForAmbiguousImport( + module, + definingImport, + currentImport, + symbol + ) + ) + case None => + encounteredSymbols.addSymbol(currentImport, symbol) + None + } + } + + private def createErrorForAmbiguousImport( + module: Module, + originalImport: IR.Module.Scope.Import, + duplicatingImport: IR.Module.Scope.Import, + ambiguousSymbol: String + ): IR.Error.ImportExport = { + IR.Error.ImportExport( + duplicatingImport, + IR.Error.ImportExport.AmbiguousImport( + originalImport, + ambiguousSymbol, + module.getSource + ) + ) + } + + private class EncounteredSymbols( + private val encounteredSymbols: mutable.Map[ + String, + IR.Module.Scope.Import + ] = mutable.HashMap.empty + ) { + def addSymbol( + imp: IR.Module.Scope.Import, + symbol: String + ): Unit = { + encounteredSymbols.put(symbol, imp) + } + + /** Returns the original import from which the symbol was imported, if any. + */ + def getOriginalImportForSymbol( + symbol: String + ): Option[IR.Module.Scope.Import] = { + encounteredSymbols.get(symbol) + } + } +} diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index 645092e17940..ca5b901f6ece 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -416,6 +416,233 @@ class ImportExportTest } } + "Ambiguous symbol error reporting" should { + "work when importing same type twice with different import statements" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |import $namespace.$packageName.A_Module.A_Type + |from $namespace.$packageName.A_Module import A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + "work when importing same type twice with one-symbol import and all-symbol import" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |import $namespace.$packageName.A_Module.A_Type + |from $namespace.$packageName.A_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + "work when importing same type twice with two all-symbol imports" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import all + |from $namespace.$packageName.A_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + "work when importing same type twice with two one-symbol import and renamed import" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + s""" + |type B_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("B_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import A_Type + |import $namespace.$packageName.B_Module.B_Type as A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + // TODO[pm]: will be addressed in https://github.com/enso-org/enso/issues/6729 + "work when importing same type twice with two one-symbol import and renamed re-export" ignore { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + s""" + |import $namespace.$packageName.B_Module.B_Type + |export $namespace.$packageName.B_Module.B_Type as A_Type + |type B_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("B_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import A_Type + |from $namespace.$packageName.B_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + "work when importing same type twice in one import statement" in { + s""" + |type A_Type + |static_method = 42 + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |# TODO: This import is both isAll and onlyNames?? + |from $namespace.$packageName.A_Module import A_Type, static_method, A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + val irErrors = mainIr.imports.collect { case err: IR.Error.ImportExport => + err + } + irErrors should have size 1 + val ambiguousImport = irErrors.head.reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + // TODO[pm]: Enable this test once we get rid of duplicate imports: There should be + // just one import, but it is currently duplicated for every symbol in from-import + // statement + // ambiguousImport.originalImport shouldEqual ambiguousImport + } + + "work when importing same type twice with two one-symbol import and renamed polyglot import" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import A_Type + |polyglot java import org.enso.example.TestClass as A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val ambiguousImport = mainIr + .imports(1) + .asInstanceOf[IR.Error.ImportExport] + .reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ambiguousImport.symbolName shouldEqual "A_Type" + ambiguousImport.originalImport shouldEqual origImport + } + + "work when importing same type multiple times with one-symbol import statements" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |import $namespace.$packageName.A_Module.A_Type + |import $namespace.$packageName.A_Module.A_Type + |import $namespace.$packageName.A_Module.A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 3 + val origImport = mainIr.imports(0) + val ambiguousImports = mainIr.imports + .drop(1) + .map( + _.asInstanceOf[IR.Error.ImportExport].reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ) + ambiguousImports.foreach(_.symbolName shouldEqual "A_Type") + ambiguousImports.foreach(_.originalImport shouldEqual origImport) + } + + "work when importing same type multiple times with import-all statements" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import all + |from $namespace.$packageName.A_Module import all + |from $namespace.$packageName.A_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 3 + val origImport = mainIr.imports(0) + val ambiguousImports = mainIr.imports + .drop(1) + .map( + _.asInstanceOf[IR.Error.ImportExport].reason + .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] + ) + ambiguousImports.foreach(_.symbolName shouldEqual "A_Type") + ambiguousImports.foreach(_.originalImport shouldEqual origImport) + } + } + "Import resolution for three modules" should { "not resolve symbol that is not explicitly exported" in { From 2738138f1abbd39cf93c23778d7f84fb67cea933 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 31 May 2023 16:12:00 +0200 Subject: [PATCH 02/52] AmbiguousImportsAnalysis distinguishes between duplicated and ambiguous imports --- .../scala/org/enso/compiler/core/IR.scala | 46 ++- .../analyse/AmbiguousImportsAnalysis.scala | 294 ++++++++++++++---- .../test/semantic/ImportExportTest.scala | 119 +++---- 3 files changed, 321 insertions(+), 138 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala index 90bec2891f60..30036f41cf4d 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala @@ -198,6 +198,20 @@ object IR { " " * n } + private def fileLocationFromSection( + loc: IR.IdentifiedLocation, + source: Source + ): String = { + val section = + source.createSection(loc.location.start, loc.location.length) + val locStr = + "" + section.getStartLine + ":" + + section.getStartColumn + "-" + + section.getEndLine + ":" + + section.getEndColumn + source.getName + "[" + locStr + "]" + } + /** The size of a single indentation level. */ val indentLevel: Int = 4 @@ -6999,6 +7013,25 @@ object IR { } } + case class DuplicatedImport( + override val location: Option[IdentifiedLocation], + originalImport: IR.Module.Scope.Import, + symbolName: String, + source: Source + ) extends Warning { + override def message: String = { + val originalImportRepr = + originalImport.location match { + case Some(location) => + s"'${originalImport.showCode()}' in ${fileLocationFromSection(location, source)}" + case None => originalImport.showCode() + } + s"Duplicated import of $symbolName. The original import is ${originalImportRepr}." + } + + override def diagnosticKeys(): Array[Any] = Array() + } + /** A warning about a `@Tail_Call` annotation placed in a non-tail * position. * @param location the location of the annotated application @@ -8831,19 +8864,6 @@ object IR { s"Ambiguous imported symbol '${symbolName}' in import statement. The original import is ${originalImportRepr}" } - private def fileLocationFromSection( - loc: IR.IdentifiedLocation, - source: Source - ): String = { - val section = - source.createSection(loc.location.start, loc.location.length) - val locStr = - "" + section.getStartLine + ":" + - section.getStartColumn + "-" + - section.getEndLine + ":" + - section.getEndColumn - source.getName + "[" + locStr + "]" - } } } diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index c040b8f8649d..9da342e6deb4 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -5,9 +5,11 @@ import org.enso.compiler.context.{InlineContext, ModuleContext} import org.enso.compiler.core.IR import org.enso.compiler.core.IR.Module.Scope.Import import org.enso.compiler.data.BindingsMap +import org.enso.compiler.exception.CompilerError import org.enso.compiler.pass.IRPass import scala.collection.mutable +import scala.collection.mutable.ListBuffer /** A pass that checks for ambiguous (duplicated) symbols from imports. For every encountered * imported symbol that has already been imported before, the pass replaces the import with @@ -71,6 +73,7 @@ case object AmbiguousImportsAnalysis extends IRPass { bindingMap: BindingsMap, encounteredSymbols: EncounteredSymbols ): List[IR.Module.Scope.Import] = { + println(s"Analyzing ambiguous symbols in '${imp.showCode()}'") imp match { // Import multiple symbols case moduleImport @ IR.Module.Scope.Import.Module( @@ -84,16 +87,14 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - onlyNames.flatMap(symbol => { + onlyNames.map(symbol => { tryAddEncounteredSymbol( module, + bindingMap, encounteredSymbols, moduleImport, symbol.name - ) match { - case Some(irError) => List(irError) - case None => List(moduleImport) - } + ) }) // Import all symbols @@ -108,24 +109,43 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - bindingMap.resolvedImports.find(_.importDef == moduleImport) match { - case Some(resolvedImport) => - val symbolsFromImport = - resolvedImport.target.exportedSymbols.keySet - val encounteredErrors: List[IR.Error.ImportExport] = - symbolsFromImport.toList.flatMap(symbol => { - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - symbol - ) - }) - if (encounteredErrors.nonEmpty) { - encounteredErrors - } else { - List(moduleImport) + getImportTarget(moduleImport, bindingMap) match { + case Some(importTarget) => + importTarget match { + case resolvedModule: BindingsMap.ResolvedModule => + val encounteredErrors: ListBuffer[IR.Error.ImportExport] = + ListBuffer() + resolvedModule.exportedSymbols.foreach { + case (symbolName, resolvedNames) => + if (resolvedNames.size > 1) { + // TODO: Report IR.Error.ImportExport ? + // Should be handled by other compiler passes + throw new CompilerError( + s"Ambiguous import of $symbolName" + ) + } else { + tryAddEncounteredSymbol( + module, + bindingMap, + encounteredSymbols, + moduleImport, + symbolName + ) match { + case irError: IR.Error.ImportExport => + encounteredErrors += irError + case _ => () + } + } + } + if (encounteredErrors.nonEmpty) { + encounteredErrors.toList + } else { + List(moduleImport) + } + case BindingsMap.ResolvedType(_, _) => + throw new CompilerError("ResolvedType not yet supported") } + case None => List(moduleImport) } @@ -142,15 +162,15 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - rename.name - ) match { - case Some(irError) => List(irError) - case None => List(moduleImport) - } + List( + tryAddEncounteredSymbol( + module, + bindingMap, + encounteredSymbols, + moduleImport, + rename.name + ) + ) // Import one symbol case moduleImport @ IR.Module.Scope.Import.Module( @@ -164,54 +184,127 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - symbolName.parts.last.name - ) match { - case Some(irError) => List(irError) - case None => List(moduleImport) - } + List( + tryAddEncounteredSymbol( + module, + bindingMap, + encounteredSymbols, + moduleImport, + symbolName.parts.last.name + ) + ) - case polyImport @ Import.Polyglot(_, rename, _, _, _) => + case polyImport @ Import.Polyglot(entity, rename, _, _, _) => val symbolName = rename match { case Some(rename) => rename - case None => polyImport.entity.getVisibleName + case None => entity.getVisibleName } - tryAddEncounteredSymbol( - module, - encounteredSymbols, - polyImport, - symbolName - ) match { - case Some(irError) => List(irError) - case None => List(polyImport) + encounteredSymbols.getOriginalImportForSymbol(symbolName) match { + case Some(originalImport) => + originalImport match { + case IR.Module.Scope.Import.Polyglot( + originalEntity, + _, + _, + _, + _ + ) => + if (entity.getVisibleName == originalEntity.getVisibleName) { + // Same symbol, same entity --> attach duplicated import warning + val warn = + createWarningForDuplicatedImport( + module, + originalImport, + polyImport, + symbolName + ) + List(polyImport.addDiagnostic(warn)) + } else { + // Same symbol, different entity --> generate error + List( + createErrorForAmbiguousImport( + module, + originalImport, + polyImport, + symbolName + ) + ) + } + case _ => + // originalImport is a different type than Import.Polyglot, which means that + // symbolName already points to a different object than a polyglot entity. + // This is an error. + List( + createErrorForAmbiguousImport( + module, + originalImport, + polyImport, + symbolName + ) + ) + } + case None => + encounteredSymbols.addSymbol(polyImport, symbolName, None) + List(polyImport) } case _ => List(imp) } } + private def getImportTarget( + imp: IR.Module.Scope.Import, + bindingMap: BindingsMap + ): Option[BindingsMap.ImportTarget] = { + bindingMap.resolvedImports.find(_.importDef == imp) match { + case Some(resolvedImport) => + Some(resolvedImport.target) + case None => + None + } + } + private def tryAddEncounteredSymbol( module: Module, + bindingMap: BindingsMap, encounteredSymbols: EncounteredSymbols, currentImport: IR.Module.Scope.Import, - symbol: String - ): Option[IR.Error.ImportExport] = { - encounteredSymbols.getOriginalImportForSymbol(symbol) match { - case Some(definingImport) => - Some( - createErrorForAmbiguousImport( - module, - definingImport, - currentImport, - symbol - ) - ) + symbolName: String + ): IR.Module.Scope.Import = { + getImportTarget(currentImport, bindingMap) match { + case Some(resolvedName) => + encounteredSymbols.getResolvedNameForSymbol(symbolName) match { + case Some(encounteredResolvedName) => + if (encounteredResolvedName == resolvedName) { + // It is a duplicate --> create a warning + val warn = + createWarningForDuplicatedImport( + module, + encounteredSymbols.getOriginalImportForSymbol(symbolName).get, + currentImport, + symbolName + ) + currentImport.addDiagnostic(warn) + } else { + createErrorForAmbiguousImport( + module, + encounteredSymbols.getOriginalImportForSymbol(symbolName).get, + currentImport, + symbolName + ) + } + case None => + encounteredSymbols.addSymbol( + currentImport, + symbolName, + Some(resolvedName) + ) + currentImport + } + case None => - encounteredSymbols.addSymbol(currentImport, symbol) - None + encounteredSymbols.addSymbol(currentImport, symbolName, None) + currentImport } } @@ -221,6 +314,7 @@ case object AmbiguousImportsAnalysis extends IRPass { duplicatingImport: IR.Module.Scope.Import, ambiguousSymbol: String ): IR.Error.ImportExport = { + println(s"Creating error for ambiguous import of $ambiguousSymbol") IR.Error.ImportExport( duplicatingImport, IR.Error.ImportExport.AmbiguousImport( @@ -231,17 +325,52 @@ case object AmbiguousImportsAnalysis extends IRPass { ) } + private def createWarningForDuplicatedImport( + module: Module, + originalImport: IR.Module.Scope.Import, + duplicatingImport: IR.Module.Scope.Import, + duplicatedSymbol: String + ): IR.Warning = { + println(s"Creating warning for duplicated import of $duplicatedSymbol") + IR.Warning.DuplicatedImport( + duplicatingImport.location, + originalImport, + duplicatedSymbol, + module.getSource + ) + } + private class EncounteredSymbols( private val encounteredSymbols: mutable.Map[ String, - IR.Module.Scope.Import + (IR.Module.Scope.Import, Option[BindingsMap.ResolvedName]) ] = mutable.HashMap.empty ) { + + /** @param imp Import where the symbol is located + */ def addSymbol( imp: IR.Module.Scope.Import, - symbol: String + symbol: String, + resolvedName: Option[BindingsMap.ResolvedName] ): Unit = { - encounteredSymbols.put(symbol, imp) + println(s"Adding symbol $symbol to encountered symbols") + encounteredSymbols.put(symbol, (imp, resolvedName)) + debugPrint() + } + + def getResolvedNameForSymbol( + symbol: String + ): Option[BindingsMap.ResolvedName] = { + print(s"Getting resolved name for symbol $symbol: ") + encounteredSymbols.get(symbol) match { + case Some((_, resolvedName)) => + println(s"Found resolved name $resolvedName") + resolvedName + case None => + println("No resolved name found") + None + } } /** Returns the original import from which the symbol was imported, if any. @@ -249,7 +378,36 @@ case object AmbiguousImportsAnalysis extends IRPass { def getOriginalImportForSymbol( symbol: String ): Option[IR.Module.Scope.Import] = { - encounteredSymbols.get(symbol) + encounteredSymbols.get(symbol) match { + case Some((originalImport, _)) => Some(originalImport) + case None => None + } + } + + def debugPrint(): Unit = { + println("Encountered symbols:") + encounteredSymbols.foreach { case (symbol, (imp, resolvedNameOpt)) => + val resolvedNameRepr = resolvedNameOpt match { + case Some(resolvedName) => + resolvedName match { + case BindingsMap.ResolvedType(_, tp) => + s"ResolvedType(${tp.name})" + case BindingsMap.ResolvedConstructor(_, cons) => + s"ResolvedConstructor(${cons.name})" + case BindingsMap.ResolvedModule(module) => + s"ResolvedModule(${module.getName})" + case BindingsMap.ResolvedMethod(_, method) => + s"ResolvedMethod(${method.name})" + case BindingsMap.ResolvedPolyglotSymbol(module, symbol) => + s"ResolvedPolyglotSymbol(${module.getName}, ${symbol})" + } + case None => "None" + } + val impRepr = "'" + imp.showCode() + "'" + println( + s" $symbol: importDef = $impRepr, resolvedName = $resolvedNameRepr" + ) + } } } } diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index ca5b901f6ece..ad2466c182c1 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -416,8 +416,8 @@ class ImportExportTest } } - "Ambiguous symbol error reporting" should { - "work when importing same type twice with different import statements" in { + "Ambiguous symbol resolution" should { + "generate warning when importing same type twice with different import statements" in { s""" |type A_Type |""".stripMargin @@ -440,7 +440,7 @@ class ImportExportTest ambiguousImport.originalImport shouldEqual origImport } - "work when importing same type twice with one-symbol import and all-symbol import" in { + "generate warning when importing same type twice with one-symbol import and all-symbol import" in { s""" |type A_Type |""".stripMargin @@ -463,7 +463,7 @@ class ImportExportTest ambiguousImport.originalImport shouldEqual origImport } - "work when importing same type twice with two all-symbol imports" in { + "generate warning when importing same type twice with two all-symbol imports" in { s""" |type A_Type |""".stripMargin @@ -477,16 +477,17 @@ class ImportExportTest .getIr mainIr.imports.size shouldEqual 2 val origImport = mainIr.imports(0) - val ambiguousImport = mainIr + val warn = mainIr .imports(1) - .asInstanceOf[IR.Error.ImportExport] - .reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ambiguousImport.symbolName shouldEqual "A_Type" - ambiguousImport.originalImport shouldEqual origImport + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warn.size shouldEqual 1 + warn.head.originalImport shouldEqual origImport + warn.head.symbolName shouldEqual "A_Type" + warn.head.originalImport shouldEqual origImport } - "work when importing same type twice with two one-symbol import and renamed import" in { + "result in error when importing same type twice with two one-symbol import and renamed import" in { s""" |type A_Type |""".stripMargin @@ -513,22 +514,35 @@ class ImportExportTest ambiguousImport.originalImport shouldEqual origImport } - // TODO[pm]: will be addressed in https://github.com/enso-org/enso/issues/6729 - "work when importing same type twice with two one-symbol import and renamed re-export" ignore { + "generate warning when importing same type twice in one import statement" in { s""" |type A_Type + |static_method = 42 |""".stripMargin .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import A_Type, static_method, A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + val warns = mainIr + .imports(0) + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warns.size shouldEqual 1 + warns.head.symbolName shouldEqual "A_Type" + } + + "generate error when importing different type twice with one-symbol import and renamed polyglot import" in { s""" - |import $namespace.$packageName.B_Module.B_Type - |export $namespace.$packageName.B_Module.B_Type as A_Type - |type B_Type + |type A_Type |""".stripMargin - .createModule(packageQualifiedName.createChild("B_Module")) + .createModule(packageQualifiedName.createChild("A_Module")) val mainIr = s""" |from $namespace.$packageName.A_Module import A_Type - |from $namespace.$packageName.B_Module import all + |polyglot java import org.enso.example.TestClass as A_Type |""".stripMargin .createModule(packageQualifiedName.createChild("Main_Module")) .getIr @@ -543,41 +557,34 @@ class ImportExportTest ambiguousImport.originalImport shouldEqual origImport } - "work when importing same type twice in one import statement" in { + "generate warning when importing same type twice with two renamed polyglot imports" in { s""" |type A_Type - |static_method = 42 |""".stripMargin .createModule(packageQualifiedName.createChild("A_Module")) val mainIr = s""" - |# TODO: This import is both isAll and onlyNames?? - |from $namespace.$packageName.A_Module import A_Type, static_method, A_Type + |polyglot java import org.enso.example.TestClass as A_Type + |polyglot java import org.enso.example.TestClass as A_Type |""".stripMargin .createModule(packageQualifiedName.createChild("Main_Module")) .getIr - val irErrors = mainIr.imports.collect { case err: IR.Error.ImportExport => - err - } - irErrors should have size 1 - val ambiguousImport = irErrors.head.reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ambiguousImport.symbolName shouldEqual "A_Type" - // TODO[pm]: Enable this test once we get rid of duplicate imports: There should be - // just one import, but it is currently duplicated for every symbol in from-import - // statement - // ambiguousImport.originalImport shouldEqual ambiguousImport + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val warns = mainIr + .imports(1) + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warns.size shouldEqual 1 + warns.head.symbolName shouldEqual "A_Type" + warns.head.originalImport shouldEqual origImport } - "work when importing same type twice with two one-symbol import and renamed polyglot import" in { - s""" - |type A_Type - |""".stripMargin - .createModule(packageQualifiedName.createChild("A_Module")) + "result in error when importing different polyglot types with two renamed polyglot imports" in { val mainIr = s""" - |from $namespace.$packageName.A_Module import A_Type |polyglot java import org.enso.example.TestClass as A_Type + |polyglot java import org.enso.example.TestClass.StaticInnerClass as A_Type |""".stripMargin .createModule(packageQualifiedName.createChild("Main_Module")) .getIr @@ -592,7 +599,7 @@ class ImportExportTest ambiguousImport.originalImport shouldEqual origImport } - "work when importing same type multiple times with one-symbol import statements" in { + "generate warnings when importing same type multiple times with one-symbol import statements" in { s""" |type A_Type |""".stripMargin @@ -607,17 +614,16 @@ class ImportExportTest .getIr mainIr.imports.size shouldEqual 3 val origImport = mainIr.imports(0) - val ambiguousImports = mainIr.imports - .drop(1) - .map( - _.asInstanceOf[IR.Error.ImportExport].reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ) - ambiguousImports.foreach(_.symbolName shouldEqual "A_Type") - ambiguousImports.foreach(_.originalImport shouldEqual origImport) + val allWarns = + mainIr.imports.flatMap(_.diagnostics.collect({ + case w: IR.Warning.DuplicatedImport => w + })) + allWarns.size shouldEqual 2 + allWarns.foreach(_.symbolName shouldEqual "A_Type") + allWarns.foreach(_.originalImport shouldEqual origImport) } - "work when importing same type multiple times with import-all statements" in { + "generate warnings when importing same type multiple times with import-all statements" in { s""" |type A_Type |""".stripMargin @@ -632,14 +638,13 @@ class ImportExportTest .getIr mainIr.imports.size shouldEqual 3 val origImport = mainIr.imports(0) - val ambiguousImports = mainIr.imports - .drop(1) - .map( - _.asInstanceOf[IR.Error.ImportExport].reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ) - ambiguousImports.foreach(_.symbolName shouldEqual "A_Type") - ambiguousImports.foreach(_.originalImport shouldEqual origImport) + val allWarns = + mainIr.imports.flatMap(_.diagnostics.collect({ + case w: IR.Warning.DuplicatedImport => w + })) + allWarns.size shouldEqual 2 + allWarns.foreach(_.symbolName shouldEqual "A_Type") + allWarns.foreach(_.originalImport shouldEqual origImport) } } From 74cd01649f7eda2cf08833ec7631357998acd2c0 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 31 May 2023 17:44:12 +0200 Subject: [PATCH 03/52] docs --- .../analyse/AmbiguousImportsAnalysis.scala | 170 +++++++++--------- 1 file changed, 82 insertions(+), 88 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 9da342e6deb4..1edd60993cb0 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -11,13 +11,22 @@ import org.enso.compiler.pass.IRPass import scala.collection.mutable import scala.collection.mutable.ListBuffer -/** A pass that checks for ambiguous (duplicated) symbols from imports. For every encountered - * imported symbol that has already been imported before, the pass replaces the import with - * an [[IR.Error.ImportExport]]. Moreover, the original import is saved in the error so that - * the user can see from which location the symbol was originally imported. +/** A pass that checks for ambiguous and duplicated symbols from imports. For every encountered + * A duplicated import is an import of a symbol that has already been imported and refers to the + * same object. On the other hand, an ambiguous import is an import of a symbol that has already + * been imported but refers to a different object. For every duplicated import, a warning is attached + * to the IR, and for every ambiguous import, the IR is replaced with an error. + * + * One import IR can be replaced with multiple error IRs. This is the case for `from ... import ...` + * import statements. + * + * The original import is saved in the error and warning so that the user can see from which location + * the symbol was originally imported. * * Also iterates polyglot imports. * + * All synthetic imports and synthetic modules are ignored by this pass. + * * Thi pass does not alter any metadata. */ case object AmbiguousImportsAnalysis extends IRPass { @@ -50,21 +59,26 @@ case object AmbiguousImportsAnalysis extends IRPass { ir: IR.Module, moduleContext: ModuleContext ): IR.Module = { - val bindingMap = ir.unsafeGetMetadata( - BindingAnalysis, - "BindingMap should already be present" - ) - val encounteredSymbols = new EncounteredSymbols() - ir.copy( - imports = ir.imports.flatMap( - analyseAmbiguousSymbols( - _, - moduleContext.module, - bindingMap, - encounteredSymbols + val module = moduleContext.module + if (module.isSynthetic) { + ir + } else { + val bindingMap = ir.unsafeGetMetadata( + BindingAnalysis, + "BindingMap should already be present" + ) + val encounteredSymbols = new EncounteredSymbols() + ir.copy( + imports = ir.imports.flatMap( + analyseAmbiguousSymbols( + _, + module, + bindingMap, + encounteredSymbols + ) ) ) - ) + } } private def analyseAmbiguousSymbols( @@ -73,7 +87,6 @@ case object AmbiguousImportsAnalysis extends IRPass { bindingMap: BindingsMap, encounteredSymbols: EncounteredSymbols ): List[IR.Module.Scope.Import] = { - println(s"Analyzing ambiguous symbols in '${imp.showCode()}'") imp match { // Import multiple symbols case moduleImport @ IR.Module.Scope.Import.Module( @@ -83,7 +96,7 @@ case object AmbiguousImportsAnalysis extends IRPass { Some(onlyNames), _, _, - _, + false, _, _ ) => @@ -105,45 +118,39 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _, _, - _, + false, _, _ ) => getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => - importTarget match { - case resolvedModule: BindingsMap.ResolvedModule => - val encounteredErrors: ListBuffer[IR.Error.ImportExport] = - ListBuffer() - resolvedModule.exportedSymbols.foreach { - case (symbolName, resolvedNames) => - if (resolvedNames.size > 1) { - // TODO: Report IR.Error.ImportExport ? - // Should be handled by other compiler passes - throw new CompilerError( - s"Ambiguous import of $symbolName" - ) - } else { - tryAddEncounteredSymbol( - module, - bindingMap, - encounteredSymbols, - moduleImport, - symbolName - ) match { - case irError: IR.Error.ImportExport => - encounteredErrors += irError - case _ => () - } - } - } - if (encounteredErrors.nonEmpty) { - encounteredErrors.toList + val encounteredErrors: ListBuffer[IR.Error.ImportExport] = + ListBuffer() + importTarget.exportedSymbols.foreach { + case (symbolName, resolvedNames) => + if (resolvedNames.size > 1) { + // Should be handled by other compiler passes + throw new CompilerError( + s"Unexpected: multiple resolved names for symbol '$symbolName' - should have been handled by previous compiler passes" + ) } else { - List(moduleImport) + tryAddEncounteredSymbol( + module, + bindingMap, + encounteredSymbols, + moduleImport, + symbolName + ) match { + case irError: IR.Error.ImportExport => + encounteredErrors += irError + case _ => () + } } - case BindingsMap.ResolvedType(_, _) => - throw new CompilerError("ResolvedType not yet supported") + } + if (encounteredErrors.nonEmpty) { + encounteredErrors.toList + } else { + List(moduleImport) } case None => @@ -158,7 +165,7 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _, _, - _, + false, _, _ ) => @@ -180,7 +187,7 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _, _, - _, + false, _, _ ) => @@ -194,11 +201,14 @@ case object AmbiguousImportsAnalysis extends IRPass { ) ) + // Polyglot import case polyImport @ Import.Polyglot(entity, rename, _, _, _) => val symbolName = rename match { case Some(rename) => rename case None => entity.getVisibleName } + // Polyglot imports do not have any resolved name associated, so we try to + // get the original import rather than the resolved name. encounteredSymbols.getOriginalImportForSymbol(symbolName) match { case Some(originalImport) => originalImport match { @@ -210,7 +220,7 @@ case object AmbiguousImportsAnalysis extends IRPass { _ ) => if (entity.getVisibleName == originalEntity.getVisibleName) { - // Same symbol, same entity --> attach duplicated import warning + // Same symbol, same entity --> duplicated import --> attach duplicated import warning val warn = createWarningForDuplicatedImport( module, @@ -220,7 +230,7 @@ case object AmbiguousImportsAnalysis extends IRPass { ) List(polyImport.addDiagnostic(warn)) } else { - // Same symbol, different entity --> generate error + // Same symbol, different entity --> ambiguous import --> generate error List( createErrorForAmbiguousImport( module, @@ -264,6 +274,19 @@ case object AmbiguousImportsAnalysis extends IRPass { } } + /** Tries to add the encountered symbol to the encountered symbols map. If it is already contained + * in the map, checks whether the underlying resolved name is the same as the original resolved name. + * Based on that, either attaches a warning for a duplicated import, or returns an IR. + * + * Does not handle polyglot imports. + * + * @param module Current module + * @param bindingMap Bindings map for the current module + * @param encounteredSymbols Encountered symbols in the current module + * @param currentImport Currently iterated import + * @param symbolName Name of the symbol that is about to be processed + * @return + */ private def tryAddEncounteredSymbol( module: Module, bindingMap: BindingsMap, @@ -314,7 +337,6 @@ case object AmbiguousImportsAnalysis extends IRPass { duplicatingImport: IR.Module.Scope.Import, ambiguousSymbol: String ): IR.Error.ImportExport = { - println(s"Creating error for ambiguous import of $ambiguousSymbol") IR.Error.ImportExport( duplicatingImport, IR.Error.ImportExport.AmbiguousImport( @@ -331,7 +353,6 @@ case object AmbiguousImportsAnalysis extends IRPass { duplicatingImport: IR.Module.Scope.Import, duplicatedSymbol: String ): IR.Warning = { - println(s"Creating warning for duplicated import of $duplicatedSymbol") IR.Warning.DuplicatedImport( duplicatingImport.location, originalImport, @@ -340,6 +361,10 @@ case object AmbiguousImportsAnalysis extends IRPass { ) } + /** For every encountered symbol name, we keep track of the original import from which it was imported, + * along with the resolved name (if any). For example, for symbols imported via `polyglot java import`, + * there is no resolved name. + */ private class EncounteredSymbols( private val encounteredSymbols: mutable.Map[ String, @@ -354,21 +379,16 @@ case object AmbiguousImportsAnalysis extends IRPass { symbol: String, resolvedName: Option[BindingsMap.ResolvedName] ): Unit = { - println(s"Adding symbol $symbol to encountered symbols") encounteredSymbols.put(symbol, (imp, resolvedName)) - debugPrint() } def getResolvedNameForSymbol( symbol: String ): Option[BindingsMap.ResolvedName] = { - print(s"Getting resolved name for symbol $symbol: ") encounteredSymbols.get(symbol) match { case Some((_, resolvedName)) => - println(s"Found resolved name $resolvedName") resolvedName case None => - println("No resolved name found") None } } @@ -383,31 +403,5 @@ case object AmbiguousImportsAnalysis extends IRPass { case None => None } } - - def debugPrint(): Unit = { - println("Encountered symbols:") - encounteredSymbols.foreach { case (symbol, (imp, resolvedNameOpt)) => - val resolvedNameRepr = resolvedNameOpt match { - case Some(resolvedName) => - resolvedName match { - case BindingsMap.ResolvedType(_, tp) => - s"ResolvedType(${tp.name})" - case BindingsMap.ResolvedConstructor(_, cons) => - s"ResolvedConstructor(${cons.name})" - case BindingsMap.ResolvedModule(module) => - s"ResolvedModule(${module.getName})" - case BindingsMap.ResolvedMethod(_, method) => - s"ResolvedMethod(${method.name})" - case BindingsMap.ResolvedPolyglotSymbol(module, symbol) => - s"ResolvedPolyglotSymbol(${module.getName}, ${symbol})" - } - case None => "None" - } - val impRepr = "'" + imp.showCode() + "'" - println( - s" $symbol: importDef = $impRepr, resolvedName = $resolvedNameRepr" - ) - } - } } } From 9f2851d845357d58deff95e0376c83848e4097ff Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 31 May 2023 17:47:43 +0200 Subject: [PATCH 04/52] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c6bbe6dc01b..999f8f6dcfa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -796,6 +796,7 @@ - [Add project creation time to project metadata][6780] - [Upgrade GraalVM to 22.3.1 JDK17][6750] - [Ascribed types are checked during runtime][6790] +- [Add compiler pass that discovers ambiguous and duplicated symbols][6868] [3227]: https://github.com/enso-org/enso/pull/3227 [3248]: https://github.com/enso-org/enso/pull/3248 @@ -910,6 +911,7 @@ [6755]: https://github.com/enso-org/enso/pull/6755 [6780]: https://github.com/enso-org/enso/pull/6780 [6790]: https://github.com/enso-org/enso/pull/6790 +[6868]: https://github.com/enso-org/enso/pull/6868 # Enso 2.0.0-alpha.18 (2021-10-12) From 06bdbb1260a03974d7a3cac82ca5a7062803c322 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 2 Jun 2023 18:30:13 +0200 Subject: [PATCH 05/52] AmbiguousImportAnalysis uses symbol full paths to determine ambiguity --- .../scala/org/enso/compiler/core/IR.scala | 3 +- .../analyse/AmbiguousImportsAnalysis.scala | 245 +++++++++--------- 2 files changed, 127 insertions(+), 121 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala index 30036f41cf4d..f1696fceb37c 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala @@ -8851,6 +8851,7 @@ object IR { case class AmbiguousImport( originalImport: IR.Module.Scope.Import, + originalSymbolPath: String, symbolName: String, source: Source ) extends Reason { @@ -8861,7 +8862,7 @@ object IR { s"'${originalImport.showCode()}' in ${fileLocationFromSection(location, source)}" case None => originalImport.showCode() } - s"Ambiguous imported symbol '${symbolName}' in import statement. The original import is ${originalImportRepr}" + s"Ambiguous imported symbol '${symbolName}' in import statement. The original import `${originalImportRepr}` points to ${originalSymbolPath}" } } diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 1edd60993cb0..41f90ddda097 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -4,8 +4,8 @@ import org.enso.interpreter.runtime.Module import org.enso.compiler.context.{InlineContext, ModuleContext} import org.enso.compiler.core.IR import org.enso.compiler.core.IR.Module.Scope.Import +import org.enso.compiler.core.IR.Module.Scope.Import.Polyglot import org.enso.compiler.data.BindingsMap -import org.enso.compiler.exception.CompilerError import org.enso.compiler.pass.IRPass import scala.collection.mutable @@ -68,7 +68,7 @@ case object AmbiguousImportsAnalysis extends IRPass { "BindingMap should already be present" ) val encounteredSymbols = new EncounteredSymbols() - ir.copy( + val ret = ir.copy( imports = ir.imports.flatMap( analyseAmbiguousSymbols( _, @@ -78,6 +78,10 @@ case object AmbiguousImportsAnalysis extends IRPass { ) ) ) + if (encounteredSymbols.encounteredSymbols.nonEmpty) { + encounteredSymbols.debugPrint("after") + } + ret } } @@ -90,7 +94,7 @@ case object AmbiguousImportsAnalysis extends IRPass { imp match { // Import multiple symbols case moduleImport @ IR.Module.Scope.Import.Module( - _, + importPath, _, _, Some(onlyNames), @@ -100,13 +104,17 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - onlyNames.map(symbol => { + println(s"Importing multiple symbols from `${imp.showCode()}`") + encounteredSymbols.debugPrint("before") + onlyNames.map(symbolName => { + val symbolPath = + importPath.name + "." + symbolName.name tryAddEncounteredSymbol( module, - bindingMap, encounteredSymbols, moduleImport, - symbol.name + symbolName.name, + symbolPath ) }) @@ -122,31 +130,48 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => + println(s"Importing all symbols from `${imp.showCode()}`") + encounteredSymbols.debugPrint("before") getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => + // Names of the symbols that are exported by a module or a type refered to via importTarget + val exportedSymbolNames: List[String] = + importTarget.exportedSymbols.keySet.toList + val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() - importTarget.exportedSymbols.foreach { - case (symbolName, resolvedNames) => - if (resolvedNames.size > 1) { - // Should be handled by other compiler passes - throw new CompilerError( - s"Unexpected: multiple resolved names for symbol '$symbolName' - should have been handled by previous compiler passes" + exportedSymbolNames.foreach(symbolName => { + importTarget.resolveExportedSymbol(symbolName) match { + case Left(_) => + assert(importTarget.exportedSymbols(symbolName).size > 1) + val oneOfOriginalPaths = + importTarget + .exportedSymbols(symbolName) + .head + .qualifiedName + .toString + // importTarget tries to export ambiguous symbols + encounteredErrors += createErrorForAmbiguousImport( + module, + moduleImport, + oneOfOriginalPaths, + moduleImport, + symbolName ) - } else { + case Right(resolvedName) => tryAddEncounteredSymbol( module, - bindingMap, encounteredSymbols, moduleImport, - symbolName + symbolName, + resolvedName.qualifiedName.toString ) match { - case irError: IR.Error.ImportExport => - encounteredErrors += irError + case error: IR.Error.ImportExport => + encounteredErrors += error case _ => () } - } - } + } + }) if (encounteredErrors.nonEmpty) { encounteredErrors.toList } else { @@ -159,7 +184,7 @@ case object AmbiguousImportsAnalysis extends IRPass { // Import a renamed symbol case moduleImport @ IR.Module.Scope.Import.Module( - _, + importPath, Some(rename), _, _, @@ -169,19 +194,22 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => + println(s"Importing renamed symbol from `${imp.showCode()}`") + encounteredSymbols.debugPrint("before") + val symbolPath = importPath.name List( tryAddEncounteredSymbol( module, - bindingMap, encounteredSymbols, moduleImport, - rename.name + rename.name, + symbolPath ) ) // Import one symbol case moduleImport @ IR.Module.Scope.Import.Module( - symbolName, + importPath, _, _, _, @@ -191,72 +219,40 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => + println(s"Importing one symbol from `${imp.showCode()}`") + encounteredSymbols.debugPrint("before") List( tryAddEncounteredSymbol( module, - bindingMap, encounteredSymbols, moduleImport, - symbolName.parts.last.name + importPath.parts.last.name, + importPath.name ) ) // Polyglot import case polyImport @ Import.Polyglot(entity, rename, _, _, _) => + println(s"Importing polyglot symbol from `${imp.showCode()}`") + encounteredSymbols.debugPrint("before") + val symbolName = rename match { case Some(rename) => rename case None => entity.getVisibleName } - // Polyglot imports do not have any resolved name associated, so we try to - // get the original import rather than the resolved name. - encounteredSymbols.getOriginalImportForSymbol(symbolName) match { - case Some(originalImport) => - originalImport match { - case IR.Module.Scope.Import.Polyglot( - originalEntity, - _, - _, - _, - _ - ) => - if (entity.getVisibleName == originalEntity.getVisibleName) { - // Same symbol, same entity --> duplicated import --> attach duplicated import warning - val warn = - createWarningForDuplicatedImport( - module, - originalImport, - polyImport, - symbolName - ) - List(polyImport.addDiagnostic(warn)) - } else { - // Same symbol, different entity --> ambiguous import --> generate error - List( - createErrorForAmbiguousImport( - module, - originalImport, - polyImport, - symbolName - ) - ) - } - case _ => - // originalImport is a different type than Import.Polyglot, which means that - // symbolName already points to a different object than a polyglot entity. - // This is an error. - List( - createErrorForAmbiguousImport( - module, - originalImport, - polyImport, - symbolName - ) - ) - } - case None => - encounteredSymbols.addSymbol(polyImport, symbolName, None) - List(polyImport) + val symbolPath = entity match { + case Polyglot.Java(packageName, className) => + packageName + "." + className } + List( + tryAddEncounteredSymbol( + module, + encounteredSymbols, + polyImport, + symbolName, + symbolPath + ) + ) case _ => List(imp) } @@ -281,7 +277,6 @@ case object AmbiguousImportsAnalysis extends IRPass { * Does not handle polyglot imports. * * @param module Current module - * @param bindingMap Bindings map for the current module * @param encounteredSymbols Encountered symbols in the current module * @param currentImport Currently iterated import * @param symbolName Name of the symbol that is about to be processed @@ -289,51 +284,46 @@ case object AmbiguousImportsAnalysis extends IRPass { */ private def tryAddEncounteredSymbol( module: Module, - bindingMap: BindingsMap, encounteredSymbols: EncounteredSymbols, currentImport: IR.Module.Scope.Import, - symbolName: String + symbolName: String, + symbolPath: String ): IR.Module.Scope.Import = { - getImportTarget(currentImport, bindingMap) match { - case Some(resolvedName) => - encounteredSymbols.getResolvedNameForSymbol(symbolName) match { - case Some(encounteredResolvedName) => - if (encounteredResolvedName == resolvedName) { - // It is a duplicate --> create a warning - val warn = - createWarningForDuplicatedImport( - module, - encounteredSymbols.getOriginalImportForSymbol(symbolName).get, - currentImport, - symbolName - ) - currentImport.addDiagnostic(warn) - } else { - createErrorForAmbiguousImport( - module, - encounteredSymbols.getOriginalImportForSymbol(symbolName).get, - currentImport, - symbolName - ) - } - case None => - encounteredSymbols.addSymbol( - currentImport, - symbolName, - Some(resolvedName) - ) - currentImport - } - - case None => - encounteredSymbols.addSymbol(currentImport, symbolName, None) - currentImport + if (encounteredSymbols.containsSymbol(symbolName)) { + val encounteredFullName = + encounteredSymbols.getFullNameForSymbol(symbolName) + val originalImport = + encounteredSymbols.getOriginalImportForSymbol(symbolName).get + if (symbolPath == encounteredFullName) { + // Duplicate + val warn = + createWarningForDuplicatedImport( + module, + originalImport, + currentImport, + symbolName + ) + currentImport.addDiagnostic(warn) + } else { + // Ambiguous + createErrorForAmbiguousImport( + module, + originalImport, + encounteredFullName, + currentImport, + symbolName + ) + } + } else { + encounteredSymbols.addSymbol(currentImport, symbolName, symbolPath) + currentImport } } private def createErrorForAmbiguousImport( module: Module, originalImport: IR.Module.Scope.Import, + originalSymbolPath: String, duplicatingImport: IR.Module.Scope.Import, ambiguousSymbol: String ): IR.Error.ImportExport = { @@ -341,6 +331,7 @@ case object AmbiguousImportsAnalysis extends IRPass { duplicatingImport, IR.Error.ImportExport.AmbiguousImport( originalImport, + originalSymbolPath, ambiguousSymbol, module.getSource ) @@ -366,30 +357,37 @@ case object AmbiguousImportsAnalysis extends IRPass { * there is no resolved name. */ private class EncounteredSymbols( - private val encounteredSymbols: mutable.Map[ + val encounteredSymbols: mutable.Map[ String, - (IR.Module.Scope.Import, Option[BindingsMap.ResolvedName]) + (IR.Module.Scope.Import, String) ] = mutable.HashMap.empty ) { + def containsSymbol(symbolName: String): Boolean = { + encounteredSymbols.contains(symbolName) + } + /** @param imp Import where the symbol is located */ def addSymbol( imp: IR.Module.Scope.Import, symbol: String, - resolvedName: Option[BindingsMap.ResolvedName] + fullName: String ): Unit = { - encounteredSymbols.put(symbol, (imp, resolvedName)) + println( + s"Adding symbol $symbol -> (import=`${imp.showCode()}`, path=$fullName)" + ) + encounteredSymbols.put(symbol, (imp, fullName)) } - def getResolvedNameForSymbol( + def getFullNameForSymbol( symbol: String - ): Option[BindingsMap.ResolvedName] = { + ): String = { encounteredSymbols.get(symbol) match { - case Some((_, resolvedName)) => - resolvedName + case Some((_, fullName)) => + fullName case None => - None + throw new IllegalStateException("unreachable") } } @@ -403,5 +401,12 @@ case object AmbiguousImportsAnalysis extends IRPass { case None => None } } + + def debugPrint(title: String): Unit = { + println(s"Encountered symbols ($title):") + encounteredSymbols.foreach { case (symbol, (imp, fullName)) => + println(s" $symbol -> (import=`${imp.showCode()}`, path='$fullName')") + } + } } } From 1325b6096f88a49fbf902361faabe44ddd32efc1 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 2 Jun 2023 18:30:37 +0200 Subject: [PATCH 06/52] Fix some tests - duplicated import is a warn, not error --- .../test/semantic/ImportExportTest.scala | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index cdb8ed79802b..f60f2ea476b4 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -472,13 +472,14 @@ class ImportExportTest .getIr mainIr.imports.size shouldEqual 2 val origImport = mainIr.imports(0) - val ambiguousImport = mainIr + val warn = mainIr .imports(1) - .asInstanceOf[IR.Error.ImportExport] - .reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ambiguousImport.symbolName shouldEqual "A_Type" - ambiguousImport.originalImport shouldEqual origImport + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warn.size shouldEqual 1 + warn.head.originalImport shouldEqual origImport + warn.head.symbolName shouldEqual "A_Type" + warn.head.originalImport shouldEqual origImport } "generate warning when importing same type twice with one-symbol import and all-symbol import" in { @@ -495,13 +496,14 @@ class ImportExportTest .getIr mainIr.imports.size shouldEqual 2 val origImport = mainIr.imports(0) - val ambiguousImport = mainIr + val warn = mainIr .imports(1) - .asInstanceOf[IR.Error.ImportExport] - .reason - .asInstanceOf[IR.Error.ImportExport.AmbiguousImport] - ambiguousImport.symbolName shouldEqual "A_Type" - ambiguousImport.originalImport shouldEqual origImport + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warn.size shouldEqual 1 + warn.head.originalImport shouldEqual origImport + warn.head.symbolName shouldEqual "A_Type" + warn.head.originalImport shouldEqual origImport } "generate warning when importing same type twice with two all-symbol imports" in { From d8693b5edb726a582b755bdda5ff2a1b2cd55c8b Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 2 Jun 2023 12:37:48 +0200 Subject: [PATCH 07/52] Improve compiler's diagnostic messages --- .../scala/org/enso/compiler/Compiler.scala | 90 +++++++++++++------ 1 file changed, 65 insertions(+), 25 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala b/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala index a951ca805b6b..67f1df6ef633 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala @@ -1,7 +1,7 @@ package org.enso.compiler import com.oracle.truffle.api.TruffleLogger -import com.oracle.truffle.api.source.Source +import com.oracle.truffle.api.source.{Source} import org.enso.compiler.codegen.{IrToTruffle, RuntimeStubsGenerator} import org.enso.compiler.context.{FreshNameSupply, InlineContext, ModuleContext} import org.enso.compiler.core.IR @@ -34,7 +34,6 @@ import java.util.concurrent.{ TimeUnit } import java.util.logging.Level - import scala.jdk.OptionConverters._ import java.util.concurrent.Future @@ -985,25 +984,8 @@ class Compiler( diagnostics: List[IR.Diagnostic], source: Source ): Boolean = { - val errors = diagnostics.collect { case e: IR.Error => e } - val warnings = diagnostics.collect { case w: IR.Warning => w } - - if (warnings.nonEmpty) { - output.println("Compiler encountered warnings:") - warnings.foreach { warning => - output.println(formatDiagnostic(warning, source)) - } - } - - if (errors.nonEmpty) { - output.println("Compiler encountered errors:") - errors.foreach { error => - output.println(formatDiagnostic(error, source)) - } - true - } else { - false - } + diagnostics.foreach(diag => output.println(formatDiagnostic(diag, source))) + diagnostics.exists(_.isInstanceOf[IR.Error]) } /** Pretty prints compiler diagnostics. @@ -1016,10 +998,68 @@ class Compiler( diagnostic: IR.Diagnostic, source: Source ): String = { - fileLocationFromSection( - diagnostic.location, - source - ) + ": " + diagnostic.formattedMessage + val outSupportsAnsiColors = System.console() != null + val ansiReset = "\u001B[0m" + val ansiRed = "\u001B[31m" + val ansiYellow = "\u001B[33m" + val ansiBold = "\u001B[1m" + + def yellowBold(text: String) = + if (outSupportsAnsiColors) ansiYellow + ansiBold + text + ansiReset + else text + def redBold(text: String) = + if (outSupportsAnsiColors) ansiRed + ansiBold + text + ansiReset else text + def bold(text: String) = + if (outSupportsAnsiColors) ansiBold + text + ansiReset else text + + val (coloredFunc, subject) = diagnostic match { + case _: IR.Error => (redBold _, "error: ") + case _: IR.Warning => (yellowBold _, "warning: ") + case _ => throw new IllegalStateException("Unexpected diagnostic type") + } + + diagnostic.location match { + case Some(location) => + val section = source.createSection(location.start, location.length) + val isOneLine = section.getStartLine == section.getEndLine + if (isOneLine) { + val lineNumber = section.getStartLine + val startColumn = section.getStartColumn + val endColumn = section.getEndColumn + val sectionLen = endColumn - startColumn + val line = source.createSection(lineNumber).getCharacters.toString + val sb = new StringBuilder() + sb + .append( + bold( + source.getName + ":" + lineNumber + ":" + startColumn + "-" + endColumn + ": " + ) + ) + .append(coloredFunc(subject)) + .append(diagnostic.formattedMessage) + .append("\n") + sb + .append(line.substring(0, startColumn - 1)) + .append(coloredFunc(line.substring(startColumn - 1, endColumn))) + .append(line.substring(endColumn)) + .append("\n") + sb + .append(" " * (startColumn - 1)) + .append(coloredFunc("^" + "~" * sectionLen)) + sb.toString + } else { + bold(fileLocationFromSection(diagnostic.location, source)) + + ": " + + coloredFunc(subject) + + diagnostic.formattedMessage + } + case None => + // We dont have location information, so we just print the message + bold(fileLocationFromSection(diagnostic.location, source)) + + ": " + + coloredFunc(subject) + diagnostic.formattedMessage + } } private def fileLocationFromSection( From 08efa41d993f17c40a343af18eae105d40a94ae8 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 2 Jun 2023 18:56:31 +0200 Subject: [PATCH 08/52] Rename Extension.enso files --- .../lib/Standard/Base/0.0.0-dev/src/Any.enso | 2 +- .../Base/0.0.0-dev/src/Data/Array.enso | 2 +- .../0.0.0-dev/src/Data/Filter_Condition.enso | 2 +- .../0.0.0-dev/src/Data/Index_Sub_Range.enso | 2 +- .../Base/0.0.0-dev/src/Data/Json.enso | 6 +-- .../{Extensions.enso => Json_Extensions.enso} | 4 +- .../Base/0.0.0-dev/src/Data/Locale.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Data/Map.enso | 2 +- .../Base/0.0.0-dev/src/Data/Pair.enso | 2 +- ...{Extensions.enso => Range_Extensions.enso} | 0 .../Base/0.0.0-dev/src/Data/Statistics.enso | 2 +- .../0.0.0-dev/src/Data/Text/Regex/Match.enso | 2 +- .../src/Data/Text/Regex/Pattern.enso | 2 +- .../src/Data/Text/Regex/Replacer.enso | 2 +- .../Base/0.0.0-dev/src/Data/Text/Span.enso | 2 +- .../{Extensions.enso => Text_Extensions.enso} | 42 +++++++++---------- .../src/Data/Text/Text_Sub_Range.enso | 2 +- .../0.0.0-dev/src/Data/Time/Date_Range.enso | 2 +- .../0.0.0-dev/src/Data/Time/Duration.enso | 2 +- .../Base/0.0.0-dev/src/Data/Time/Period.enso | 2 +- .../Base/0.0.0-dev/src/Data/Vector.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Main.enso | 16 +++---- .../0.0.0-dev/src/Network/HTTP/Request.enso | 2 +- .../src/Network/HTTP/Response_Body.enso | 2 +- ...xtensions.enso => Network_Extensions.enso} | 2 +- .../Standard/Base/0.0.0-dev/src/Runtime.enso | 2 +- .../Base/0.0.0-dev/src/System/File.enso | 2 +- .../src/System/File/Write_Extensions.enso | 2 +- .../0.0.0-dev/src/System/File_Format.enso | 2 +- 29 files changed, 58 insertions(+), 58 deletions(-) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/{Extensions.enso => Json_Extensions.enso} (98%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/{Extensions.enso => Range_Extensions.enso} (100%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/{Extensions.enso => Text_Extensions.enso} (98%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Network/{Extensions.enso => Network_Extensions.enso} (86%) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso index 96d826ef9cf1..9590975d8bb5 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso @@ -1,5 +1,5 @@ import project.Data.Pair.Pair -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso index 726f68e4137d..0ff524d17dec 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso @@ -5,7 +5,7 @@ import project.Data.List.List import project.Data.Ordering.Ordering import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso index 75a0b7d48ce7..894875977e6e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Boolean.Boolean import project.Data.Text.Case_Sensitivity.Case_Sensitivity -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Regex import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso index 0f0c4ef4a78b..a75de5e76997 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Range.Range -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso index 6e618f35fed5..5774ac2c9f95 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso @@ -1,13 +1,13 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Array_Proxy.Array_Proxy -import project.Data.Json.Extensions +import project.Data.Json.Json_Extensions import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Pair.Pair -import project.Data.Range.Extensions -import project.Data.Text.Extensions +import project.Data.Range.Range_Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Type_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso similarity index 98% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso index f175cb8e94c4..f46fd771b0fc 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso @@ -8,8 +8,8 @@ import project.Data.Map.Map import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Numbers.Number -import project.Data.Range.Extensions -import project.Data.Text.Extensions +import project.Data.Range.Range_Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Text.Text_Sub_Range.Text_Sub_Range import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso index be1d739a8726..436eeb58fa48 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Text.Case.Case -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Metadata.Display diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso index 03af74175e92..618027a99343 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Vector.Vector import project.Data.Pair.Pair -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Error.Error import project.Errors.Illegal_Argument.Illegal_Argument diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso index bb0bc630d22d..9d95d82d4cb1 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Boolean.Boolean import project.Data.Numbers.Integer import project.Data.Text.Text -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds import project.Errors.Common.Not_Found diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Range_Extensions.enso similarity index 100% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Range_Extensions.enso diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso index 58f1fc1fbd83..b1bdcbc65c0a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso @@ -5,7 +5,7 @@ import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Ordering.Ordering import project.Data.Ordering.Comparable -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Vector.Vector import project.Errors.Common.Incomparable_Values import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso index a58622fbda81..3ab7d36d3798 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Regex.No_Such_Group import project.Data.Text.Regex.Pattern.Pattern diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso index b4d95df7ea49..55dbf437b378 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Helpers import project.Data.Text.Span.Span diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso index 52ec26d15f59..1e2406910a9a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso @@ -1,5 +1,5 @@ import project.Data.Numbers.Integer -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Regex import project.Data.Text.Regex.Match.Match import project.Data.Text.Regex.No_Such_Group diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso index 99b0059a0da3..5b26a7892d0e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso @@ -11,7 +11,7 @@ import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso similarity index 98% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso index 47ea5a4a6d50..a4fbc6ab4b04 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso @@ -4,7 +4,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Locale.Locale -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity @@ -1456,14 +1456,14 @@ Text.parse_json self = Json.parse self > Example Parse the date of 23rd December 2020. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-12-23".parse_date > Example Recover from an error due to a wrong format. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = "my birthday".parse_date . catch Time_Error _-> @@ -1472,14 +1472,14 @@ Text.parse_json self = Json.parse self > Example Parse "1999-1-1" as Date using a custom format. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "1999-1-1".parse_date "yyyy-M-d" > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = @@ -1524,49 +1524,49 @@ Text.parse_date self format=Nothing = Date.parse self format > Example Parse UTC time. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-10-01T04:11:12Z".parse_date_time > Example Parse UTC-04:00 time. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-10-01T04:11:12-04:00".parse_date_time > Example Parse UTC-04:00 time specifying New York timezone. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-10-01T04:11:12-04:00[America/New_York]".parse_date_time > Example Parse UTC-04:00 time with nanoseconds. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-10-01T04:11:12.177528-04:00".parse_date_time > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-10-01".parse_date_time . catch Time_Error (_->Date_Time.now) > Example Parse "2020-05-06 04:30:20" as Date_Time - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "2020-05-06 04:30:20".parse_date_time "yyyy-MM-dd HH:mm:ss" > Example Parse "06 of May 2020 at 04:30AM" as Date_Tme - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "06 of May 2020 at 04:30AM".parse_date_time "dd 'of' MMMM yyyy 'at' hh:mma" @@ -1612,14 +1612,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Get the time 15:05:30. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "15:05:30".parse_time_of_day > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions from Standard.Base.Errors.Common import Time_Error example_parse = "half twelve".parse_time_of_day . catch Time_Error _-> @@ -1628,14 +1628,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Parse "04:30:20" as Time_Of_Day. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "04:30:20".parse_time_of_day "HH:mm:ss" > Example Parse "4:30AM" as Time_Of_Day - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "4:30AM".parse_time_of_day "h:mma" Text.parse_time_of_day : Text | Nothing -> Locale -> Time_Of_Day ! Time_Error @@ -1648,28 +1648,28 @@ Text.parse_time_of_day self format=Nothing locale=Locale.default = Time_Of_Day.p > Example Get Central European Time. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "CET".parse_time_zone > Example Get Moscow time. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "Europe/Moscow".parse_time_zone > Example Get time zone -06:00. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "-06:00".parse_time_zone > Example Get custom offset +03:02:01 of 3 hours 2 minutes an 1 second. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "+03:02:01".parse_time_zone Text.parse_time_zone : Time_Zone ! Time_Error @@ -1684,7 +1684,7 @@ Text.parse_time_zone self = Time_Zone.parse self > Example Parse URI text. - import Standard.Base.Data.Text.Extensions + import Standard.Base.Data.Text.Text_Extensions example_parse = "http://example.com".parse_uri Text.parse_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso index 3b326c5a107f..44b8e6c580dc 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso index c548855796d7..703708f22a16 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso @@ -3,7 +3,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Range.Empty_Error -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Date_Period.Date_Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso index b71cf1d4bc68..72a6a92153a7 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso @@ -4,7 +4,7 @@ import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Ordering.Comparable import project.Data.Pair.Pair -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Time.Date_Time.Date_Time import project.Data.Time.Period.Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso index 6e2c81dc4f98..ba1b4a636cfb 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Ordering.Comparable -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Duration.Duration diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso index 46f95679045e..e16403b768f7 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso @@ -7,7 +7,7 @@ import project.Data.Numbers.Integer import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Text.Text import project.Errors.Common.Incomparable_Values import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index dd0822e2858d..25de6aacef6e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -72,7 +72,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Interval.Bound import project.Data.Interval.Interval -import project.Data.Json.Extensions +import project.Data.Json.Json_Extensions import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Locale.Locale @@ -85,13 +85,13 @@ import project.Data.Ordering.Default_Comparator import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Extensions +import project.Data.Range.Range_Extensions import project.Data.Regression import project.Data.Statistics import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Line_Ending_Style.Line_Ending_Style import project.Data.Text.Location.Location import project.Data.Text.Matching_Mode.Matching_Mode @@ -110,7 +110,7 @@ import project.Data.Time.Time_Of_Day.Time_Of_Day import project.Data.Time.Time_Period.Time_Period import project.Data.Time.Time_Zone.Time_Zone import project.Errors.Problem_Behavior.Problem_Behavior -import project.Network.Extensions +import project.Network.Network_Extensions import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP import project.Network.HTTP.HTTP_Method.HTTP_Method @@ -124,7 +124,7 @@ export project.Data.Filter_Condition.Filter_Condition export project.Data.Index_Sub_Range.Index_Sub_Range export project.Data.Interval.Bound export project.Data.Interval.Interval -export project.Data.Json.Extensions +export project.Data.Json.Json_Extensions export project.Data.Json.Json export project.Data.Json.JS_Object export project.Data.Locale.Locale @@ -136,12 +136,12 @@ export project.Data.Ordering.Default_Comparator export project.Data.Ordering.Sort_Direction.Sort_Direction export project.Data.Pair.Pair export project.Data.Range.Range -export project.Data.Range.Extensions +export project.Data.Range.Range_Extensions export project.Data.Regression export project.Data.Text.Case.Case export project.Data.Text.Case_Sensitivity.Case_Sensitivity export project.Data.Text.Encoding.Encoding -export project.Data.Text.Extensions +export project.Data.Text.Text_Extensions export project.Data.Text.Line_Ending_Style.Line_Ending_Style export project.Data.Text.Location.Location export project.Data.Text.Matching_Mode.Matching_Mode @@ -160,7 +160,7 @@ export project.Data.Time.Time_Of_Day.Time_Of_Day export project.Data.Time.Time_Period.Time_Period export project.Data.Time.Time_Zone.Time_Zone export project.Errors.Problem_Behavior.Problem_Behavior -export project.Network.Extensions +export project.Network.Network_Extensions export project.Network.HTTP.Header.Header export project.Network.HTTP.HTTP export project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso index 553132d0b4fe..d2ae712902c4 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Pair.Pair import project.Data.Text.Text import project.Data.Vector.Vector -import project.Network.Extensions +import project.Network.Network_Extensions import project.Network.HTTP.Form.Form import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso index fa0b9281f164..925c2ba4dbe7 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso @@ -2,7 +2,7 @@ import project.Data.Boolean.Boolean import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Numbers.Number -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Nothing.Nothing diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso similarity index 86% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso index d6313e24907a..a0794dfb7f22 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso @@ -9,7 +9,7 @@ import project.Errors.Common.Syntax_Error > Example Parse URI text. - import Standard.Base.Network.URI.Extensions + import Standard.Base.Network.Network_Extensions example_parse = "http://example.com".to_uri Text.to_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso index 28af61468c6e..d2a9cfeb4698 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Boolean.Boolean import project.Data.Text.Case.Case -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Forbidden_Operation diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index 31372b8f74ba..f48606ea911d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -5,7 +5,7 @@ import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Matching_Mode.Matching_Mode import project.Data.Text.Text import project.Data.Time.Time_Of_Day.Time_Of_Day diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso index f44213fd67a1..57408c7967b3 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso @@ -1,6 +1,6 @@ import project.Data.Text.Text import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Vector.Vector import project.Error.Error import project.Errors.Common.Dry_Run_Operation diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso index 79f4f656eed0..8d72cc01bcdd 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Json.Json import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error From c466b359d19fd6bf07f6fda51582f1b35067e56f Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 11:42:39 +0200 Subject: [PATCH 09/52] Add some docs --- .../src/main/java/org/enso/interpreter/runtime/Module.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java index 18667b30a151..bc01537fe55a 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java @@ -101,6 +101,13 @@ public boolean isBefore(CompilationStage stage) { private boolean wasLoadedFromCache; private boolean hasCrossModuleLinks; private final boolean synthetic; + /** + * This list is filled in case there is a directory with the same name as this module. + * The directory then contains submodules of this module that should be directly + * accessible from this module - achieved by both filling in this list, and inserting + * synthetic imports and exports into this module - See + * {@link org.enso.compiler.Compiler#injectSyntheticModuleExports(IR.Module, List)}. + */ private List directModulesRefs; /** From cc4a672924f8e2ab24d9e75fab040666c11b0879 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 13:02:38 +0200 Subject: [PATCH 10/52] Revert "Improve compiler's diagnostic messages" This reverts commit d8693b5edb726a582b755bdda5ff2a1b2cd55c8b. --- .../scala/org/enso/compiler/Compiler.scala | 90 ++++++------------- 1 file changed, 25 insertions(+), 65 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala b/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala index 67f1df6ef633..a951ca805b6b 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/Compiler.scala @@ -1,7 +1,7 @@ package org.enso.compiler import com.oracle.truffle.api.TruffleLogger -import com.oracle.truffle.api.source.{Source} +import com.oracle.truffle.api.source.Source import org.enso.compiler.codegen.{IrToTruffle, RuntimeStubsGenerator} import org.enso.compiler.context.{FreshNameSupply, InlineContext, ModuleContext} import org.enso.compiler.core.IR @@ -34,6 +34,7 @@ import java.util.concurrent.{ TimeUnit } import java.util.logging.Level + import scala.jdk.OptionConverters._ import java.util.concurrent.Future @@ -984,8 +985,25 @@ class Compiler( diagnostics: List[IR.Diagnostic], source: Source ): Boolean = { - diagnostics.foreach(diag => output.println(formatDiagnostic(diag, source))) - diagnostics.exists(_.isInstanceOf[IR.Error]) + val errors = diagnostics.collect { case e: IR.Error => e } + val warnings = diagnostics.collect { case w: IR.Warning => w } + + if (warnings.nonEmpty) { + output.println("Compiler encountered warnings:") + warnings.foreach { warning => + output.println(formatDiagnostic(warning, source)) + } + } + + if (errors.nonEmpty) { + output.println("Compiler encountered errors:") + errors.foreach { error => + output.println(formatDiagnostic(error, source)) + } + true + } else { + false + } } /** Pretty prints compiler diagnostics. @@ -998,68 +1016,10 @@ class Compiler( diagnostic: IR.Diagnostic, source: Source ): String = { - val outSupportsAnsiColors = System.console() != null - val ansiReset = "\u001B[0m" - val ansiRed = "\u001B[31m" - val ansiYellow = "\u001B[33m" - val ansiBold = "\u001B[1m" - - def yellowBold(text: String) = - if (outSupportsAnsiColors) ansiYellow + ansiBold + text + ansiReset - else text - def redBold(text: String) = - if (outSupportsAnsiColors) ansiRed + ansiBold + text + ansiReset else text - def bold(text: String) = - if (outSupportsAnsiColors) ansiBold + text + ansiReset else text - - val (coloredFunc, subject) = diagnostic match { - case _: IR.Error => (redBold _, "error: ") - case _: IR.Warning => (yellowBold _, "warning: ") - case _ => throw new IllegalStateException("Unexpected diagnostic type") - } - - diagnostic.location match { - case Some(location) => - val section = source.createSection(location.start, location.length) - val isOneLine = section.getStartLine == section.getEndLine - if (isOneLine) { - val lineNumber = section.getStartLine - val startColumn = section.getStartColumn - val endColumn = section.getEndColumn - val sectionLen = endColumn - startColumn - val line = source.createSection(lineNumber).getCharacters.toString - val sb = new StringBuilder() - sb - .append( - bold( - source.getName + ":" + lineNumber + ":" + startColumn + "-" + endColumn + ": " - ) - ) - .append(coloredFunc(subject)) - .append(diagnostic.formattedMessage) - .append("\n") - sb - .append(line.substring(0, startColumn - 1)) - .append(coloredFunc(line.substring(startColumn - 1, endColumn))) - .append(line.substring(endColumn)) - .append("\n") - sb - .append(" " * (startColumn - 1)) - .append(coloredFunc("^" + "~" * sectionLen)) - sb.toString - } else { - bold(fileLocationFromSection(diagnostic.location, source)) + - ": " + - coloredFunc(subject) + - diagnostic.formattedMessage - } - case None => - // We dont have location information, so we just print the message - bold(fileLocationFromSection(diagnostic.location, source)) + - ": " + - coloredFunc(subject) - diagnostic.formattedMessage - } + fileLocationFromSection( + diagnostic.location, + source + ) + ": " + diagnostic.formattedMessage } private def fileLocationFromSection( From 25f3d487705d565b30344532d69af67b661223b2 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 13:12:04 +0200 Subject: [PATCH 11/52] Remove Sort_Direction ambiguity from Vector.enso --- .../lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso index e16403b768f7..8ceea056b51a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso @@ -4,7 +4,6 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.List.List import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range import project.Data.Range.Range_Extensions @@ -938,8 +937,8 @@ type Vector a because it has the default comparator. [My_Type.Value 'hello', 1].sort == [1, My_Type.Value 'hello'] - sort : Sort_Direction -> (Any -> Any)|Nothing -> (Any -> Any -> (Ordering|Nothing))|Nothing -> Problem_Behavior -> Vector Any ! Incomparable_Values - sort self (order = Sort_Direction.Ascending) on=Nothing by=Nothing on_incomparable=Problem_Behavior.Ignore = + sort : Sort_Direction.Sort_Direction -> (Any -> Any)|Nothing -> (Any -> Any -> (Ordering|Nothing))|Nothing -> Problem_Behavior -> Vector Any ! Incomparable_Values + sort self (order = Sort_Direction.Sort_Direction.Ascending) on=Nothing by=Nothing on_incomparable=Problem_Behavior.Ignore = comps = case on == Nothing of True -> self.map it-> Comparable.from it False -> self.map it-> Comparable.from (on it) From c952d4e90ae3f038c16aa06d04b067508b3eae74 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 13:33:23 +0200 Subject: [PATCH 12/52] Remove temp debug logging --- .../analyse/AmbiguousImportsAnalysis.scala | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 41f90ddda097..7a7d4dbd1c05 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -8,6 +8,7 @@ import org.enso.compiler.core.IR.Module.Scope.Import.Polyglot import org.enso.compiler.data.BindingsMap import org.enso.compiler.pass.IRPass +import scala.annotation.unused import scala.collection.mutable import scala.collection.mutable.ListBuffer @@ -68,7 +69,7 @@ case object AmbiguousImportsAnalysis extends IRPass { "BindingMap should already be present" ) val encounteredSymbols = new EncounteredSymbols() - val ret = ir.copy( + ir.copy( imports = ir.imports.flatMap( analyseAmbiguousSymbols( _, @@ -78,10 +79,6 @@ case object AmbiguousImportsAnalysis extends IRPass { ) ) ) - if (encounteredSymbols.encounteredSymbols.nonEmpty) { - encounteredSymbols.debugPrint("after") - } - ret } } @@ -130,8 +127,6 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - println(s"Importing all symbols from `${imp.showCode()}`") - encounteredSymbols.debugPrint("before") getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => // Names of the symbols that are exported by a module or a type refered to via importTarget @@ -194,8 +189,6 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - println(s"Importing renamed symbol from `${imp.showCode()}`") - encounteredSymbols.debugPrint("before") val symbolPath = importPath.name List( tryAddEncounteredSymbol( @@ -219,8 +212,6 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - println(s"Importing one symbol from `${imp.showCode()}`") - encounteredSymbols.debugPrint("before") List( tryAddEncounteredSymbol( module, @@ -233,9 +224,6 @@ case object AmbiguousImportsAnalysis extends IRPass { // Polyglot import case polyImport @ Import.Polyglot(entity, rename, _, _, _) => - println(s"Importing polyglot symbol from `${imp.showCode()}`") - encounteredSymbols.debugPrint("before") - val symbolName = rename match { case Some(rename) => rename case None => entity.getVisibleName @@ -374,9 +362,6 @@ case object AmbiguousImportsAnalysis extends IRPass { symbol: String, fullName: String ): Unit = { - println( - s"Adding symbol $symbol -> (import=`${imp.showCode()}`, path=$fullName)" - ) encounteredSymbols.put(symbol, (imp, fullName)) } @@ -402,6 +387,7 @@ case object AmbiguousImportsAnalysis extends IRPass { } } + @unused def debugPrint(title: String): Unit = { println(s"Encountered symbols ($title):") encounteredSymbols.foreach { case (symbol, (imp, fullName)) => From 41a006826da5b92a7c6be5bc8b61d9ba3dfee5c5 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 13:35:00 +0200 Subject: [PATCH 13/52] Fix multiple symbol importing. --- .../analyse/AmbiguousImportsAnalysis.scala | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 7a7d4dbd1c05..75f9b7b3d4b0 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -91,7 +91,7 @@ case object AmbiguousImportsAnalysis extends IRPass { imp match { // Import multiple symbols case moduleImport @ IR.Module.Scope.Import.Module( - importPath, + _, _, _, Some(onlyNames), @@ -101,19 +101,33 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - println(s"Importing multiple symbols from `${imp.showCode()}`") - encounteredSymbols.debugPrint("before") - onlyNames.map(symbolName => { - val symbolPath = - importPath.name + "." + symbolName.name - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - symbolName.name, - symbolPath - ) - }) + getImportTarget(moduleImport, bindingMap) match { + case Some(importTarget) => + onlyNames.map(symbolName => { + importTarget.resolveExportedSymbol(symbolName.name) match { + case Right(resolvedName) => + val symbolPath = resolvedName.qualifiedName.toString + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + symbolName.name, + symbolPath + ) + case Left(_) => + // TODO: Better error + createErrorForAmbiguousImport( + module, + moduleImport, + symbolName.name, + moduleImport, + symbolName.name + ) + } + }) + case None => + List(moduleImport) + } // Import all symbols case moduleImport @ IR.Module.Scope.Import.Module( From be394ea5d636d23018522220486b3df1f29ef059 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 21:01:26 +0200 Subject: [PATCH 14/52] Improve errors collection - Also make sure that all the warnings are collected. --- .../scala/org/enso/compiler/core/IR.scala | 15 +- .../analyse/AmbiguousImportsAnalysis.scala | 196 ++++++++++-------- .../test/semantic/ImportExportTest.scala | 25 +++ 3 files changed, 143 insertions(+), 93 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala index f1696fceb37c..5cc7401a03da 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala @@ -8849,20 +8849,31 @@ object IR { s"No such constructor ${constructorName} in type $typeName" } + /** + * Represents an ambiguous import resolution error, where the same symbol is imported more than once refereing + * to different objects. The objects are represented by their physical path in the project. + * @param originalImport the original import statement. + * @param originalSymbolPath the original symbol path. + * @param symbolName the symbol name that is ambiguous. + * @param symbolPath the symbol path that is different than [[originalSymbolPath]]. + * @param source Location of the original import. + */ case class AmbiguousImport( originalImport: IR.Module.Scope.Import, originalSymbolPath: String, symbolName: String, + symbolPath: String, source: Source ) extends Reason { override def message: String = { val originalImportRepr = originalImport.location match { case Some(location) => - s"'${originalImport.showCode()}' in ${fileLocationFromSection(location, source)}" + fileLocationFromSection(location, source) case None => originalImport.showCode() } - s"Ambiguous imported symbol '${symbolName}' in import statement. The original import `${originalImportRepr}` points to ${originalSymbolPath}" + s"Symbol '$symbolName' resolved ambiguously to '$symbolPath' in the import Statement. " + + s"The symbol was first resolved to '$originalSymbolPath' in the import statement '$originalImportRepr'." } } diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 75f9b7b3d4b0..322bfa0ed03f 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -6,6 +6,7 @@ import org.enso.compiler.core.IR import org.enso.compiler.core.IR.Module.Scope.Import import org.enso.compiler.core.IR.Module.Scope.Import.Polyglot import org.enso.compiler.data.BindingsMap +import org.enso.compiler.exception.CompilerError import org.enso.compiler.pass.IRPass import scala.annotation.unused @@ -70,24 +71,33 @@ case object AmbiguousImportsAnalysis extends IRPass { ) val encounteredSymbols = new EncounteredSymbols() ir.copy( - imports = ir.imports.flatMap( + imports = ir.imports.flatMap( imp => { analyseAmbiguousSymbols( - _, - module, - bindingMap, - encounteredSymbols - ) - ) + imp, module, bindingMap, encounteredSymbols + ) match { + case Left(errors) => + errors + case Right(imp) => List(imp) + } + }) ) } } + /** + * Analyses ambiguous symbols in the given import. + * @param imp current import + * @param module current module + * @param bindingMap binding map of the current module + * @return A list of errors, if any encountered, or an import IR, potentially with some + * warnings attached. + */ private def analyseAmbiguousSymbols( imp: IR.Module.Scope.Import, module: Module, bindingMap: BindingsMap, encounteredSymbols: EncounteredSymbols - ): List[IR.Module.Scope.Import] = { + ): Either[List[IR.Error.ImportExport], IR.Module.Scope.Import] = { imp match { // Import multiple symbols case moduleImport @ IR.Module.Scope.Import.Module( @@ -103,30 +113,39 @@ case object AmbiguousImportsAnalysis extends IRPass { ) => getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => - onlyNames.map(symbolName => { - importTarget.resolveExportedSymbol(symbolName.name) match { - case Right(resolvedName) => - val symbolPath = resolvedName.qualifiedName.toString - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - symbolName.name, - symbolPath - ) - case Left(_) => - // TODO: Better error - createErrorForAmbiguousImport( - module, - moduleImport, - symbolName.name, - moduleImport, - symbolName.name - ) + val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() + val imp = + onlyNames.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbol) => + val symbolName = symbol.name + importTarget.resolveExportedSymbol(symbolName) match { + case Right(resolvedName) => + val symbolPath = resolvedName.qualifiedName.toString + tryAddEncounteredSymbol( + module, + encounteredSymbols, + imp, + symbolName, + symbolPath + ) match { + case Left(error) => + encounteredErrors += error + imp + case Right(imp) => imp + } + case Left(resolutionError) => + throw new CompilerError( + s"Unreachable: (should have been resolved in previous passes) $resolutionError" + ) + } } - }) + if (encounteredErrors.nonEmpty) { + Left(encounteredErrors.toList) + } else { + Right(imp) + } + case None => - List(moduleImport) + Right(moduleImport) } // Import all symbols @@ -143,52 +162,41 @@ case object AmbiguousImportsAnalysis extends IRPass { ) => getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => - // Names of the symbols that are exported by a module or a type refered to via importTarget + // Names of the symbols that are exported by a module or a type referred to via importTarget val exportedSymbolNames: List[String] = importTarget.exportedSymbols.keySet.toList val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() - exportedSymbolNames.foreach(symbolName => { + val imp = exportedSymbolNames.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbolName) => importTarget.resolveExportedSymbol(symbolName) match { - case Left(_) => - assert(importTarget.exportedSymbols(symbolName).size > 1) - val oneOfOriginalPaths = - importTarget - .exportedSymbols(symbolName) - .head - .qualifiedName - .toString - // importTarget tries to export ambiguous symbols - encounteredErrors += createErrorForAmbiguousImport( - module, - moduleImport, - oneOfOriginalPaths, - moduleImport, - symbolName + case Left(resolutionError) => + throw new CompilerError( + s"Unreachable: (should have been resolved in previous passes) $resolutionError" ) case Right(resolvedName) => tryAddEncounteredSymbol( module, encounteredSymbols, - moduleImport, + imp, symbolName, resolvedName.qualifiedName.toString ) match { - case error: IR.Error.ImportExport => + case Left(error) => encounteredErrors += error - case _ => () + imp + case Right(imp) => imp } } - }) + } if (encounteredErrors.nonEmpty) { - encounteredErrors.toList + Left(encounteredErrors.toList) } else { - List(moduleImport) + Right(imp) } case None => - List(moduleImport) + Right(moduleImport) } // Import a renamed symbol @@ -204,15 +212,16 @@ case object AmbiguousImportsAnalysis extends IRPass { _ ) => val symbolPath = importPath.name - List( - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - rename.name, - symbolPath - ) - ) + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + rename.name, + symbolPath + ) match { + case Left(error) => Left(List(error)) + case Right(imp) => Right(imp) + } // Import one symbol case moduleImport @ IR.Module.Scope.Import.Module( @@ -226,15 +235,16 @@ case object AmbiguousImportsAnalysis extends IRPass { _, _ ) => - List( - tryAddEncounteredSymbol( - module, - encounteredSymbols, - moduleImport, - importPath.parts.last.name, - importPath.name - ) - ) + tryAddEncounteredSymbol( + module, + encounteredSymbols, + moduleImport, + importPath.parts.last.name, + importPath.name + ) match { + case Left(err) => Left(List(err)) + case Right(imp) => Right(imp) + } // Polyglot import case polyImport @ Import.Polyglot(entity, rename, _, _, _) => @@ -246,17 +256,18 @@ case object AmbiguousImportsAnalysis extends IRPass { case Polyglot.Java(packageName, className) => packageName + "." + className } - List( - tryAddEncounteredSymbol( - module, - encounteredSymbols, - polyImport, - symbolName, - symbolPath - ) - ) + tryAddEncounteredSymbol( + module, + encounteredSymbols, + polyImport, + symbolName, + symbolPath + ) match { + case Left(err) => Left(List(err)) + case Right(imp) => Right(imp) + } - case _ => List(imp) + case _ => Right(imp) } } @@ -290,14 +301,14 @@ case object AmbiguousImportsAnalysis extends IRPass { currentImport: IR.Module.Scope.Import, symbolName: String, symbolPath: String - ): IR.Module.Scope.Import = { + ): Either[IR.Error.ImportExport, IR.Module.Scope.Import] = { if (encounteredSymbols.containsSymbol(symbolName)) { val encounteredFullName = encounteredSymbols.getFullNameForSymbol(symbolName) val originalImport = encounteredSymbols.getOriginalImportForSymbol(symbolName).get if (symbolPath == encounteredFullName) { - // Duplicate + // Duplicate warning val warn = createWarningForDuplicatedImport( module, @@ -305,20 +316,21 @@ case object AmbiguousImportsAnalysis extends IRPass { currentImport, symbolName ) - currentImport.addDiagnostic(warn) + Right(currentImport.addDiagnostic(warn)) } else { - // Ambiguous - createErrorForAmbiguousImport( + // Ambiguous error + Left(createErrorForAmbiguousImport( module, originalImport, encounteredFullName, currentImport, - symbolName - ) + symbolName, + symbolPath + )) } } else { encounteredSymbols.addSymbol(currentImport, symbolName, symbolPath) - currentImport + Right(currentImport) } } @@ -327,7 +339,8 @@ case object AmbiguousImportsAnalysis extends IRPass { originalImport: IR.Module.Scope.Import, originalSymbolPath: String, duplicatingImport: IR.Module.Scope.Import, - ambiguousSymbol: String + ambiguousSymbol: String, + ambiguousSymbolPath: String ): IR.Error.ImportExport = { IR.Error.ImportExport( duplicatingImport, @@ -335,6 +348,7 @@ case object AmbiguousImportsAnalysis extends IRPass { originalImport, originalSymbolPath, ambiguousSymbol, + ambiguousSymbolPath, module.getSource ) ) diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index f60f2ea476b4..d59fd5e0e999 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -530,6 +530,31 @@ class ImportExportTest warn.head.originalImport shouldEqual origImport } + "generate two warnings when importing same type twice with two all-symbol imports" in { + s""" + |type A_Type + |type AA_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import all + |from $namespace.$packageName.A_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + val origImport = mainIr.imports(0) + val warn = mainIr + .imports(1) + .diagnostics + .collect({ case w: IR.Warning.DuplicatedImport => w }) + warn.size shouldEqual 2 + warn.foreach(_.originalImport shouldEqual origImport) + warn.exists(_.symbolName == "A_Type") shouldEqual true + warn.exists(_.symbolName == "AA_Type") shouldEqual true + } + "result in error when importing same type twice with two one-symbol import and renamed import" in { s""" |type A_Type From 6cdc63efe9eea3d995a5c22e9a11c9edbbc294e9 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 5 Jun 2023 21:02:00 +0200 Subject: [PATCH 15/52] Remove URI ambiguity in HTTP.enso --- distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso | 2 -- 1 file changed, 2 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso index 63921feb9f4e..9c3fd4df9647 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso @@ -27,8 +27,6 @@ polyglot java import java.net.http.HttpRequest polyglot java import java.net.http.HttpResponse polyglot java import java.net.InetSocketAddress polyglot java import java.net.ProxySelector -polyglot java import java.net.URI -polyglot java import java.time.Duration as Java_Duration polyglot java import org.enso.base.Http_Utils type HTTP From c46a4ba8988725f8563f5eb891d13eadc6c0aaff Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 16:59:19 +0200 Subject: [PATCH 16/52] Remove duplicate imports --- .../0.0.0-dev/src/Data/Filter_Condition.enso | 1 - .../src/Data/Text/Text_Extensions.enso | 1 - .../src/Errors/Problem_Behavior.enso | 1 - .../Standard/Base/0.0.0-dev/src/Random.enso | 1 - .../Base/0.0.0-dev/src/System/File.enso | 21 ------------------- 5 files changed, 25 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso index 894875977e6e..4ed27b04c10e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso @@ -1,5 +1,4 @@ import project.Any.Any -import project.Data.Boolean.Boolean import project.Data.Text.Case_Sensitivity.Case_Sensitivity import project.Data.Text.Text_Extensions import project.Data.Text.Regex diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso index a4fbc6ab4b04..b6965a4aa79b 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso @@ -38,7 +38,6 @@ import project.Nothing.Nothing from project.Data.Boolean import Boolean, True, False from project.Data.Json import Json, Invalid_JSON, JS_Object from project.Data.Numbers import Decimal, Integer, Number, Number_Parse_Error -from project.Data.Text.Text_Sub_Range import Codepoint_Ranges, Text_Sub_Range from project.Widget_Helpers import make_delimiter_selector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Problem_Behavior.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Problem_Behavior.enso index 62722f44b861..663e5277150a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Problem_Behavior.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Problem_Behavior.enso @@ -2,7 +2,6 @@ import project.Any.Any import project.Data.Vector.Vector import project.Error.Error import project.Warning.Warning -from project import all from project.Errors.Problem_Behavior.Problem_Behavior import all diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Random.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Random.enso index 865f389a6f11..d7321a92a41d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Random.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Random.enso @@ -5,7 +5,6 @@ import project.Data.Numbers.Decimal import project.Data.Text.Text import project.Data.Vector.Vector import project.Data.Json.JS_Object -import project.Data.Text.Text import project.Error.Error import project.Errors.Illegal_Argument.Illegal_Argument import project.System diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index f48606ea911d..14ddc75119eb 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -1,31 +1,10 @@ from Standard.Base import all -import project.Any.Any -import project.Data.Array.Array -import project.Data.Index_Sub_Range.Index_Sub_Range -import project.Data.Json.JS_Object -import project.Data.Numbers.Integer -import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions -import project.Data.Text.Matching_Mode.Matching_Mode -import project.Data.Text.Text -import project.Data.Time.Time_Of_Day.Time_Of_Day -import project.Data.Vector.Vector -import project.Error.Error import project.Errors.Common.Forbidden_Operation import project.Errors.Encoding_Error.Encoding_Error import project.Errors.File_Error.File_Error import project.Errors.Illegal_Argument.Illegal_Argument -import project.Errors.Problem_Behavior.Problem_Behavior -import project.Meta -import project.Nothing.Nothing -import project.Panic.Panic import project.Runtime.Context import project.Runtime.Managed_Resource.Managed_Resource -import project.System.File.File_Access.File_Access -import project.System.File.File_Permissions.File_Permissions - -from project.Data.Boolean import Boolean, True, False -from project.System.File_Format import Auto_Detect, File_Format import project.Metadata.Widget from project.Metadata.Choice import Option From e7cbf0d766c1ae8fcd164b68b8e2861599557701 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 17:06:34 +0200 Subject: [PATCH 17/52] Fix PassesTest --- .../src/test/scala/org/enso/compiler/test/PassesTest.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala index 694ed02e3e0d..a128cd29a40f 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala @@ -4,11 +4,7 @@ import org.enso.compiler.Passes import org.enso.compiler.context.{InlineContext, ModuleContext} import org.enso.compiler.core.IR import org.enso.compiler.pass.IRPass -import org.enso.compiler.pass.analyse.{ - AliasAnalysis, - BindingAnalysis, - ImportSymbolAnalysis -} +import org.enso.compiler.pass.analyse.{AliasAnalysis, AmbiguousImportsAnalysis, BindingAnalysis, ImportSymbolAnalysis} import org.enso.compiler.pass.desugar._ import org.enso.compiler.pass.lint.{ModuleNameConflicts, ShadowedPatternFields} import org.enso.compiler.pass.optimise.UnreachableMatchBranches @@ -62,6 +58,7 @@ class PassesTest extends CompilerTest { OperatorToFunction, LambdaShorthandToLambda, ImportSymbolAnalysis, + AmbiguousImportsAnalysis, ShadowedPatternFields, UnreachableMatchBranches, NestedPatternMatch, From c35f8e67a430b416dd0a3f486c3a0c9bf97223a8 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 17:17:07 +0200 Subject: [PATCH 18/52] Fix hidden names case --- .../analyse/AmbiguousImportsAnalysis.scala | 11 +++++++--- .../test/semantic/ImportExportTest.scala | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 322bfa0ed03f..206b162b09b7 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -154,7 +154,7 @@ case object AmbiguousImportsAnalysis extends IRPass { _, true, _, - _, + hiddenNames, _, false, _, @@ -165,10 +165,15 @@ case object AmbiguousImportsAnalysis extends IRPass { // Names of the symbols that are exported by a module or a type referred to via importTarget val exportedSymbolNames: List[String] = importTarget.exportedSymbols.keySet.toList - + val symbolsToIterate = hiddenNames match { + case None => exportedSymbolNames + case Some(hiddenNamesLiterals) => + val hiddenNames = hiddenNamesLiterals.map(_.name) + exportedSymbolNames.filterNot(hiddenNames.contains) + } val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() - val imp = exportedSymbolNames.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbolName) => + val imp = symbolsToIterate.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbolName) => importTarget.resolveExportedSymbol(symbolName) match { case Left(resolutionError) => throw new CompilerError( diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index d59fd5e0e999..b40bf25e41f2 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -555,6 +555,26 @@ class ImportExportTest warn.exists(_.symbolName == "AA_Type") shouldEqual true } + "work when importing two different types with hiding" in { + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("A_Module")) + s""" + |type A_Type + |""".stripMargin + .createModule(packageQualifiedName.createChild("B_Module")) + val mainIr = + s""" + |from $namespace.$packageName.A_Module import all hiding A_Type + |from $namespace.$packageName.B_Module import all + |""".stripMargin + .createModule(packageQualifiedName.createChild("Main_Module")) + .getIr + mainIr.imports.size shouldEqual 2 + mainIr.imports.foreach(_.isInstanceOf[IR.Error.ImportExport] shouldEqual false) + } + "result in error when importing same type twice with two one-symbol import and renamed import" in { s""" |type A_Type From 9b00b9bf61ad6a9ce11e05831af6d0acc2b79dd1 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 17:20:55 +0200 Subject: [PATCH 19/52] Remove duplicate imports from Standard.Table --- .../lib/Standard/Table/0.0.0-dev/src/Data/Column.enso | 1 - .../Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso | 4 ---- .../Standard/Table/0.0.0-dev/src/Internal/Split_Tokenize.enso | 2 -- .../Standard/Table/0.0.0-dev/src/Internal/Vector_Builder.enso | 1 - 4 files changed, 8 deletions(-) diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso index d526de4d2aec..74eceb4404cc 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso @@ -17,7 +17,6 @@ import project.Internal.Java_Problems import project.Internal.Naming_Helpers.Naming_Helpers import project.Internal.Parse_Values_Helper import project.Internal.Widget_Helpers -import project.Data.Type.Value_Type_Helpers from project.Internal.Column_Format import all from project.Data.Table import print_table diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso index a0a93522ee35..adf7d649ce1f 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso @@ -4,18 +4,14 @@ import project.Data.Column.Column import project.Data.Data_Formatter.Data_Formatter import project.Data.Table.Table import project.Internal.Unique_Name_Strategy.Unique_Name_Strategy -import Standard.Base.Data.Text.Regex import Standard.Base.Data.Text.Regex.Pattern import Standard.Base.Data.Text.Regex.Match.Match import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument -import Standard.Base.Errors.Problem_Behavior.Problem_Behavior -import Standard.Base.Function.Function from project import Value_Type from project.Errors import Duplicate_Output_Column_Names -from Standard.Base.Errors.Problem_Behavior.Problem_Behavior import all ## PRIVATE diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Split_Tokenize.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Split_Tokenize.enso index 2a65ee6f0670..8de2630c7937 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Split_Tokenize.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Split_Tokenize.enso @@ -6,10 +6,8 @@ import project.Data.Type.Value_Type.Value_Type import project.Internal.Java_Exports import project.Internal.Problem_Builder.Problem_Builder import project.Internal.Unique_Name_Strategy.Unique_Name_Strategy -import Standard.Base.Data.Text.Regex import Standard.Base.Data.Text.Regex.Pattern.Pattern -from project import Value_Type from project.Errors import Column_Count_Exceeded, Column_Count_Mismatch, Duplicate_Output_Column_Names, Invalid_Value_Type, Missing_Input_Columns from project.Internal.Java_Exports import make_string_builder diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Vector_Builder.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Vector_Builder.enso index ab73d81b51e1..1b04a5c3a196 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Vector_Builder.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Vector_Builder.enso @@ -1,5 +1,4 @@ from Standard.Base import all -import Standard.Base.Data.Array.Array from project.Internal.Vector_Builder.Vector_Builder import Leaf, Append From 6e817f6cc593b1eda7ca43edf12ee74b079ca027 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 18:01:11 +0200 Subject: [PATCH 20/52] Rename Standard.Test/Extensions to Test_Extensions --- distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso | 2 +- .../lib/Standard/Test/0.0.0-dev/src/Problems.enso | 2 +- distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso | 2 +- .../src/{Extensions.enso => Test_Extensions.enso} | 0 .../lib/Standard/Visualization/0.0.0-dev/src/Table.enso | 2 +- .../lib/Standard/Visualization/0.0.0-dev/src/Text.enso | 2 +- test/Examples_Tests/src/Examples_Spec.enso | 2 +- test/Geo_Tests/src/Geo_Spec.enso | 2 +- test/Image_Tests/src/Data/Image_Spec.enso | 2 +- test/Image_Tests/src/Data/Matrix_Spec.enso | 2 +- test/Image_Tests/src/Image_Read_Write_Spec.enso | 2 +- test/Meta_Test_Suite_Tests/data/fail_report/Main.enso | 2 +- test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso | 2 +- test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso | 2 +- test/Meta_Test_Suite_Tests/src/Main.enso | 2 +- .../src/Common_Table_Operations/Aggregate_Spec.enso | 2 +- .../Common_Table_Operations/Column_Operations_Spec.enso | 2 +- .../src/Common_Table_Operations/Conversion_Spec.enso | 2 +- .../src/Common_Table_Operations/Core_Spec.enso | 2 +- .../src/Common_Table_Operations/Cross_Tab_Spec.enso | 2 +- .../src/Common_Table_Operations/Date_Time_Spec.enso | 2 +- .../src/Common_Table_Operations/Distinct_Spec.enso | 2 +- .../src/Common_Table_Operations/Expression_Spec.enso | 2 +- .../src/Common_Table_Operations/Filter_Spec.enso | 2 +- .../src/Common_Table_Operations/Integration_Tests.enso | 2 +- .../src/Common_Table_Operations/Join/Cross_Join_Spec.enso | 2 +- .../src/Common_Table_Operations/Join/Join_Spec.enso | 2 +- .../src/Common_Table_Operations/Join/Union_Spec.enso | 2 +- .../src/Common_Table_Operations/Join/Zip_Spec.enso | 2 +- .../src/Common_Table_Operations/Missing_Values_Spec.enso | 2 +- .../src/Common_Table_Operations/Order_By_Spec.enso | 2 +- .../src/Common_Table_Operations/Select_Columns_Spec.enso | 2 +- .../src/Common_Table_Operations/Take_Drop_Spec.enso | 2 +- .../src/Common_Table_Operations/Transpose_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Util.enso | 2 +- test/Table_Tests/src/Database/Codegen_Spec.enso | 2 +- test/Table_Tests/src/Database/Common_Spec.enso | 2 +- test/Table_Tests/src/Database/Postgres_Spec.enso | 2 +- test/Table_Tests/src/Database/Redshift_Spec.enso | 2 +- test/Table_Tests/src/Database/SQLite_Spec.enso | 2 +- .../src/Database/Types/Postgres_Type_Mapping_Spec.enso | 2 +- .../src/Database/Types/SQLite_Type_Mapping_Spec.enso | 2 +- test/Table_Tests/src/Database/Upload_Spec.enso | 2 +- test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso | 2 +- test/Table_Tests/src/Formatting/Parse_Values_Spec.enso | 2 +- .../src/Helpers/Unique_Naming_Strategy_Spec.enso | 2 +- test/Table_Tests/src/Helpers/Value_Type_Spec.enso | 2 +- test/Table_Tests/src/IO/Csv_Spec.enso | 2 +- test/Table_Tests/src/IO/Delimited_Read_Spec.enso | 2 +- test/Table_Tests/src/IO/Delimited_Write_Spec.enso | 2 +- test/Table_Tests/src/IO/Excel_Spec.enso | 2 +- test/Table_Tests/src/IO/Formats_Spec.enso | 2 +- test/Table_Tests/src/IO/Json_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Builders_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Column_Format_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Column_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso | 3 +-- test/Table_Tests/src/In_Memory/Table_Date_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Spec.enso | 2 +- .../Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso | 2 +- test/Table_Tests/src/Util.enso | 2 +- test/Tests/src/Data/Array_Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Array_Proxy_Spec.enso | 2 +- test/Tests/src/Data/Array_Spec.enso | 2 +- test/Tests/src/Data/Bool_Spec.enso | 2 +- test/Tests/src/Data/Function_Spec.enso | 2 +- test/Tests/src/Data/Interval_Spec.enso | 2 +- test/Tests/src/Data/Json_Spec.enso | 2 +- test/Tests/src/Data/List_Spec.enso | 2 +- test/Tests/src/Data/Locale_Spec.enso | 2 +- test/Tests/src/Data/Map_Spec.enso | 2 +- test/Tests/src/Data/Maybe_Spec.enso | 2 +- test/Tests/src/Data/Noise/Generator_Spec.enso | 2 +- test/Tests/src/Data/Noise_Spec.enso | 2 +- test/Tests/src/Data/Numbers_Spec.enso | 2 +- test/Tests/src/Data/Ordering/Comparator_Spec.enso | 2 +- test/Tests/src/Data/Ordering/Natural_Order_Spec.enso | 2 +- .../Data/Ordering/Vector_Lexicographic_Order_Spec.enso | 2 +- test/Tests/src/Data/Ordering_Spec.enso | 2 +- test/Tests/src/Data/Pair_Spec.enso | 2 +- test/Tests/src/Data/Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Problems_Spec.enso | 2 +- test/Tests/src/Data/Range_Spec.enso | 2 +- test/Tests/src/Data/Regression_Spec.enso | 2 +- test/Tests/src/Data/Statistics_Spec.enso | 2 +- test/Tests/src/Data/Text/Encoding_Spec.enso | 2 +- test/Tests/src/Data/Text/Parse_Spec.enso | 8 ++------ test/Tests/src/Data/Text/Regex_Spec.enso | 2 +- test/Tests/src/Data/Text/Span_Spec.enso | 2 +- test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso | 2 +- test/Tests/src/Data/Text/Utils_Spec.enso | 2 +- test/Tests/src/Data/Text_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Part_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Range_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Time_Spec.enso | 2 +- test/Tests/src/Data/Time/Day_Of_Week_Spec.enso | 2 +- test/Tests/src/Data/Time/Duration_Spec.enso | 2 +- test/Tests/src/Data/Time/Period_Spec.enso | 2 +- test/Tests/src/Data/Time/Spec.enso | 2 +- test/Tests/src/Data/Time/Time_Of_Day_Spec.enso | 2 +- test/Tests/src/Data/Time/Time_Zone_Spec.enso | 2 +- test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso | 2 +- test/Tests/src/Data/Vector_Spec.enso | 2 +- test/Tests/src/Main.enso | 2 +- test/Tests/src/Network/Http/Header_Spec.enso | 2 +- test/Tests/src/Network/Http/Request_Spec.enso | 2 +- test/Tests/src/Network/Http_Spec.enso | 2 +- test/Tests/src/Network/URI_Spec.enso | 2 +- test/Tests/src/Random_Spec.enso | 2 +- test/Tests/src/Runtime/Lazy_Generator_Spec.enso | 2 +- test/Tests/src/Runtime/Lazy_Spec.enso | 2 +- test/Tests/src/Runtime/Managed_Resource_Spec.enso | 2 +- test/Tests/src/Runtime/Ref_Spec.enso | 2 +- test/Tests/src/Runtime/Stack_Traces_Spec.enso | 2 +- test/Tests/src/Semantic/Any_Spec.enso | 2 +- test/Tests/src/Semantic/Case_Spec.enso | 2 +- test/Tests/src/Semantic/Conversion_Spec.enso | 2 +- test/Tests/src/Semantic/Deep_Export/Spec.enso | 2 +- test/Tests/src/Semantic/Default_Args_Spec.enso | 2 +- test/Tests/src/Semantic/Equals_Spec.enso | 2 +- test/Tests/src/Semantic/Error_Spec.enso | 2 +- test/Tests/src/Semantic/Import_Loop/Spec.enso | 2 +- test/Tests/src/Semantic/Java_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Js_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Location_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Spec.enso | 2 +- test/Tests/src/Semantic/Names_Spec.enso | 2 +- test/Tests/src/Semantic/Python_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/R_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Runtime_Spec.enso | 2 +- test/Tests/src/Semantic/Self_Type_Spec.enso | 2 +- test/Tests/src/Semantic/Warnings_Spec.enso | 2 +- test/Tests/src/System/Environment_Spec.enso | 2 +- test/Tests/src/System/File_Read_Spec.enso | 2 +- test/Tests/src/System/File_Spec.enso | 2 +- test/Tests/src/System/Process_Spec.enso | 2 +- test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso | 2 +- test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso | 2 +- test/Tests/src/System/System_Spec.enso | 2 +- .../src/Default_Visualizations_Spec.enso | 2 +- test/Visualization_Tests/src/Geo_Map_Spec.enso | 2 +- test/Visualization_Tests/src/Helpers.enso | 2 +- test/Visualization_Tests/src/Helpers_Spec.enso | 2 +- test/Visualization_Tests/src/Histogram_Spec.enso | 2 +- test/Visualization_Tests/src/Id_Spec.enso | 2 +- test/Visualization_Tests/src/Lazy_Table_Spec.enso | 2 +- test/Visualization_Tests/src/Lazy_Text_Spec.enso | 2 +- test/Visualization_Tests/src/SQL_Spec.enso | 2 +- test/Visualization_Tests/src/Scatter_Plot_Spec.enso | 2 +- test/Visualization_Tests/src/Table_Spec.enso | 2 +- test/Visualization_Tests/src/Visualization_Spec.enso | 2 +- .../src/Widgets/Database_Widgets_Spec.enso | 2 +- .../src/Widgets/Table_Widgets_Spec.enso | 2 +- .../src/Widgets/Text_Widgets_Spec.enso | 2 +- 159 files changed, 159 insertions(+), 164 deletions(-) rename distribution/lib/Standard/Test/0.0.0-dev/src/{Extensions.enso => Test_Extensions.enso} (100%) diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso index 63bd39c495d1..1962f49cd6b4 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso @@ -5,7 +5,7 @@ import project.Faker.Faker import project.Problems import project.Test_Suite.Test_Suite import project.Test.Test -import project.Extensions +import project.Test_Extensions export project.Bench.Bench export project.Faker.Faker diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso index 6d45e96f4b04..ac7844e449b7 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso @@ -1,7 +1,7 @@ from Standard.Base import all from project import Test -import project.Extensions +import project.Test_Extensions ## Returns values of warnings attached to the value. get_attached_warnings v = diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso index 2064ec40bda3..5fe68e6f856d 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso @@ -162,7 +162,7 @@ type Test > Example Add a clue to a test from Standard.Test import Test, Test_Suite - import Standard.Test.Extensions + import Standard.Test.Test_Extensions main = Test_Suite.run_main <| Test.group "Tests" <| Test.specify "some property" <| diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Test_Extensions.enso similarity index 100% rename from distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso rename to distribution/lib/Standard/Test/0.0.0-dev/src/Test_Extensions.enso diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso index 978b65c00609..a22440980f99 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso @@ -1,6 +1,6 @@ from Standard.Base import all -from Standard.Base.Data.Text.Extensions import slice_text +from Standard.Base.Data.Text.Text_Extensions import slice_text from Standard.Visualization.Text import get_chunk_from_line import Standard.Base.Errors.Common.Not_Found import Standard.Table as Table_Module diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso index c92203244f88..2a39ab05b137 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso @@ -1,6 +1,6 @@ from Standard.Base import all -from Standard.Base.Data.Text.Extensions import slice_text +from Standard.Base.Data.Text.Text_Extensions import slice_text ## PRIVATE Message to be sent to the IDE. diff --git a/test/Examples_Tests/src/Examples_Spec.enso b/test/Examples_Tests/src/Examples_Spec.enso index 0662ddc7590a..b36ba85fe97c 100644 --- a/test/Examples_Tests/src/Examples_Spec.enso +++ b/test/Examples_Tests/src/Examples_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Examples from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions # While we're lacking the ability to run the documentation examples # automatically (#1706), these tests at least check that each of the examples diff --git a/test/Geo_Tests/src/Geo_Spec.enso b/test/Geo_Tests/src/Geo_Spec.enso index 9c589658a41a..2849d0370cf5 100644 --- a/test/Geo_Tests/src/Geo_Spec.enso +++ b/test/Geo_Tests/src/Geo_Spec.enso @@ -4,7 +4,7 @@ import Standard.Table.Data.Table.Table import Standard.Geo from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Geo Points" <| diff --git a/test/Image_Tests/src/Data/Image_Spec.enso b/test/Image_Tests/src/Data/Image_Spec.enso index 176e207520e6..d29d7508cf00 100644 --- a/test/Image_Tests/src/Data/Image_Spec.enso +++ b/test/Image_Tests/src/Data/Image_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Image, Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Image with 1 channel" <| diff --git a/test/Image_Tests/src/Data/Matrix_Spec.enso b/test/Image_Tests/src/Data/Matrix_Spec.enso index b544981242bf..ad73ae66c8e6 100644 --- a/test/Image_Tests/src/Data/Matrix_Spec.enso +++ b/test/Image_Tests/src/Data/Matrix_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Matrix_Error" <| diff --git a/test/Image_Tests/src/Image_Read_Write_Spec.enso b/test/Image_Tests/src/Image_Read_Write_Spec.enso index b69eb09695c5..1ffe2bc4f83b 100644 --- a/test/Image_Tests/src/Image_Read_Write_Spec.enso +++ b/test/Image_Tests/src/Image_Read_Write_Spec.enso @@ -7,7 +7,7 @@ from Standard.Image import Image, Read_Flag, Write_Flag import Standard.Image.Image_File_Format.Image_File_Format from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.System as Java_System diff --git a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso index d041c839e3b4..1c38957c6699 100644 --- a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso index 353484a832a5..4e1b28fddbaa 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso index 4161a43303b4..823206ba6c46 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/src/Main.enso b/test/Meta_Test_Suite_Tests/src/Main.enso index 5d50802dbe51..c0b304fdcedf 100644 --- a/test/Meta_Test_Suite_Tests/src/Main.enso +++ b/test/Meta_Test_Suite_Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type Setup Config command args diff --git a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso index 8f691bdeefdb..eeee14dcf793 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso index 98975fc93a04..eddd34de3106 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso index 34405405b934..563f2a0f30ea 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import Missing_Input_Columns, Conversion_Failure from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso index ae7842786fb0..2b536f6a2c09 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all import Standard.Table.Data.Expression.Expression_Error from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso index bfe835b49b98..15a673700f49 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso index c0ca07099ce1..53fc0a1613bd 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion, Invalid_Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso index 4063525ce389..93b038d59e64 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso index f2b0d71a6298..957835ba856a 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso @@ -10,7 +10,7 @@ import Standard.Table.Data.Expression.Expression_Error from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso index 08ad71d44657..8b2aa34e71f1 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso @@ -11,7 +11,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso index 8ae48df0538e..582a32e6fbf6 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso @@ -5,7 +5,7 @@ from Standard.Table import all hiding Table from Standard.Table.Data.Aggregate_Column.Aggregate_Column import Group_By, Count, Sum from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend from project.Common_Table_Operations.Core_Spec import weird_names diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso index 3f60df4ca93a..3719686a1e06 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso index 910080636bea..6a7815df35ad 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso @@ -8,7 +8,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso index b9c3b5afd964..abaef6b8b952 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso @@ -7,7 +7,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table import project.Util diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso index e8fb5c328fee..3b374f17e8c8 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso @@ -8,7 +8,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso index bd00c3e25322..0e4972df4c81 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso index 377fb4bb312c..bcc48f9a56ca 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso index b79d762f1b8c..da1e6afe0bca 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table.Data.Column_Selector.Column_Selector import By_Name from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso index 711d1a11f147..6b6bb9d0b5f9 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table.Errors import all from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso index 1fa3b63e4f0e..5e5b404957a4 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Util.enso b/test/Table_Tests/src/Common_Table_Operations/Util.enso index 3ea6969fff2e..a0ac5f3506f7 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Util.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Util.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.In_Memory.Common_Spec as In_Memory_Table_Spec diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index 16d6cdc5ca7d..bebe198a6344 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database.Data.Table import fresh_names from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Database.Helpers.Fake_Test_Connection diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index 1876e71823dd..679b8b969b30 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import all from Standard.Database.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Util import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index b9f959e7b3c3..0573d2aab84b 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Environment import project.Database.Common_Spec diff --git a/test/Table_Tests/src/Database/Redshift_Spec.enso b/test/Table_Tests/src/Database/Redshift_Spec.enso index f60d549eec90..8c452548a060 100644 --- a/test/Table_Tests/src/Database/Redshift_Spec.enso +++ b/test/Table_Tests/src/Database/Redshift_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import Database, SQL_Query from Standard.AWS import Redshift, AWS_Credential from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Database.Common_Spec import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso index 615f9f4deac0..e6cf5c6c230f 100644 --- a/test/Table_Tests/src/Database/SQLite_Spec.enso +++ b/test/Table_Tests/src/Database/SQLite_Spec.enso @@ -11,7 +11,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Database.Common_Spec import project.Database.Upload_Spec diff --git a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso index ab7ab6962491..9ec474f535c3 100644 --- a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion from Standard.Database import SQL_Query from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Database.Helpers.Name_Generator from project.Database.Postgres_Spec import create_connection_builder diff --git a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso index 477877c1630f..e0157418b908 100644 --- a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso @@ -11,7 +11,7 @@ from Standard.Database import Database, SQLite, In_Memory, SQL_Query from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Table_Tests/src/Database/Upload_Spec.enso b/test/Table_Tests/src/Database/Upload_Spec.enso index e3985e1f2d54..b2a638cb3abb 100644 --- a/test/Table_Tests/src/Database/Upload_Spec.enso +++ b/test/Table_Tests/src/Database/Upload_Spec.enso @@ -8,7 +8,7 @@ from Standard.Database.Errors import all from Standard.Database.Internal.Result_Set import result_set_to_table from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso index 3fa504df6a2a..c251482e8f24 100644 --- a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso +++ b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type Custom_Type Value field diff --git a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso index cd9881e87c35..7e4b9ab323cb 100644 --- a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso +++ b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table.Data.Type.Value_Type import Value_Type, Auto from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Util diff --git a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso index c9d3ef258fd1..9bcebf87b28c 100644 --- a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso +++ b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Table.Internal.Unique_Name_Strategy.Unique_Name_Strategy from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group 'Unique_Name_Strategy Helper' <| diff --git a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso index 876018133e95..39bc25e9d3db 100644 --- a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso +++ b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Data.Type.Value_Type_Helpers from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Value_Type" <| diff --git a/test/Table_Tests/src/IO/Csv_Spec.enso b/test/Table_Tests/src/IO/Csv_Spec.enso index 56b8f0377d14..d0f3e1f4ac11 100644 --- a/test/Table_Tests/src/IO/Csv_Spec.enso +++ b/test/Table_Tests/src/IO/Csv_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column, Delimited import Standard.Table.Main as Table_Module from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all diff --git a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso index 6237f164c444..82e73beb2e22 100644 --- a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso @@ -10,7 +10,7 @@ import Standard.Table.Main as Table_Module from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Util diff --git a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso index 3f57f964d4ba..9e50578b9384 100644 --- a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style, Match_Col from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all diff --git a/test/Table_Tests/src/IO/Excel_Spec.enso b/test/Table_Tests/src/IO/Excel_Spec.enso index 239b449363c6..17e80ddb51c9 100644 --- a/test/Table_Tests/src/IO/Excel_Spec.enso +++ b/test/Table_Tests/src/IO/Excel_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table import Table, Match_Columns, Excel, Excel_Range, Data_Format from Standard.Table.Errors import Invalid_Output_Column_Names, Duplicate_Output_Column_Names, Invalid_Location, Range_Exceeded, Existing_Data, Column_Count_Mismatch, Column_Name_Mismatch, Empty_Sheet_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Examples diff --git a/test/Table_Tests/src/IO/Formats_Spec.enso b/test/Table_Tests/src/IO/Formats_Spec.enso index 8164031e31de..87b3615787ef 100644 --- a/test/Table_Tests/src/IO/Formats_Spec.enso +++ b/test/Table_Tests/src/IO/Formats_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import all import Standard.Table.Errors.Invalid_JSON_Format from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Util diff --git a/test/Table_Tests/src/IO/Json_Spec.enso b/test/Table_Tests/src/IO/Json_Spec.enso index 673db873b0d2..a566f7e31b1e 100644 --- a/test/Table_Tests/src/IO/Json_Spec.enso +++ b/test/Table_Tests/src/IO/Json_Spec.enso @@ -3,7 +3,7 @@ from Standard.Table import Table import Standard.Table.Data.Table_Conversions from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Util diff --git a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso index 1c5c9b596ef8..ac592d75e977 100644 --- a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso @@ -8,7 +8,7 @@ import Standard.Table.Internal.Aggregate_Column_Helper import Standard.Table.Internal.Problem_Builder.Problem_Builder from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Aggregate Columns" <| simple_table = Table.new [["count", [1, 2, Nothing, 3, Nothing]], ["is_valid", [Nothing, False, True, False, Nothing]], ["float", [3.4, 1, 5.6, 2.1, Nothing]], ["text", ["A", "", Nothing, "B,C", Nothing]]] diff --git a/test/Table_Tests/src/In_Memory/Builders_Spec.enso b/test/Table_Tests/src/In_Memory/Builders_Spec.enso index 8725cf140652..6206e205c072 100644 --- a/test/Table_Tests/src/In_Memory/Builders_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Builders_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Table.Internal.Java_Exports from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My Data x y diff --git a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso index 7c7cf9c7b78e..b4de26b505c0 100644 --- a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Column, Value_Type from Standard.Table.Errors import Invalid_Value_Type from Standard.Table.Internal.Column_Format import all -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from Standard.Test import Test, Test_Suite from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Column_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Spec.enso index 6318ad66d212..cc02e28b50e4 100644 --- a/test/Table_Tests/src/In_Memory/Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Column, Value_Type import Standard.Examples from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions main = Test_Suite.run_main spec diff --git a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso index 5014a25555f1..473cd7197bf1 100644 --- a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso index 47510dfa02bb..ac5fa1ef8482 100644 --- a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Data.Text.Case_Sensitivity.Case_Sensitivity import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Table.Data.Table_Conversions -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from Standard.Table import Table from Standard.Table.Data.Type.Value_Type import Bits, Value_Type diff --git a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso index 47ebbf009280..a17a4609b4b4 100644 --- a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso @@ -1,7 +1,6 @@ from Standard.Base import all -import Standard.Base.Data.Text.Case_Sensitivity.Case_Sensitivity -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from Standard.Table import Table from Standard.Table.Errors import Invalid_Value_Type, Column_Count_Exceeded, Duplicate_Output_Column_Names, No_Such_Column diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso index c5509d2b1281..61ab75fa7180 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso index a723f22c01b9..2f6999036064 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Spec.enso index 43384190d364..428cb3ff00b9 100644 --- a/test/Table_Tests/src/In_Memory/Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Spec.enso @@ -16,7 +16,7 @@ import Standard.Database.Extensions.Upload_Table from Standard.Database import Database, SQLite, In_Memory from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso index 815f933d7285..df2b053a1ba9 100644 --- a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Util import all diff --git a/test/Table_Tests/src/Util.enso b/test/Table_Tests/src/Util.enso index 3d586781b417..3476ab55868d 100644 --- a/test/Table_Tests/src/Util.enso +++ b/test/Table_Tests/src/Util.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Table, Column from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Result.Test_Result polyglot java import org.enso.base_test_helpers.FileSystemHelper diff --git a/test/Tests/src/Data/Array_Polyglot_Spec.enso b/test/Tests/src/Data/Array_Polyglot_Spec.enso index ca4d036bf359..558a12368e7d 100644 --- a/test/Tests/src/Data/Array_Polyglot_Spec.enso +++ b/test/Tests/src/Data/Array_Polyglot_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "JavaScript Objects, Arrays & Functions" <| diff --git a/test/Tests/src/Data/Array_Proxy_Spec.enso b/test/Tests/src/Data/Array_Proxy_Spec.enso index e083c7b9f3d9..b062d8fd2877 100644 --- a/test/Tests/src/Data/Array_Proxy_Spec.enso +++ b/test/Tests/src/Data/Array_Proxy_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type Proxy_Object Value length diff --git a/test/Tests/src/Data/Array_Spec.enso b/test/Tests/src/Data/Array_Spec.enso index 86581f37d9f0..705a50c652c7 100644 --- a/test/Tests/src/Data/Array_Spec.enso +++ b/test/Tests/src/Data/Array_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions Array.method self = 0 diff --git a/test/Tests/src/Data/Bool_Spec.enso b/test/Tests/src/Data/Bool_Spec.enso index 0d866167618c..c6fb950f4b88 100644 --- a/test/Tests/src/Data/Bool_Spec.enso +++ b/test/Tests/src/Data/Bool_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions Boolean.method self = self diff --git a/test/Tests/src/Data/Function_Spec.enso b/test/Tests/src/Data/Function_Spec.enso index 05290ea3a1ec..66c5c894c3e6 100644 --- a/test/Tests/src/Data/Function_Spec.enso +++ b/test/Tests/src/Data/Function_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "identity" <| diff --git a/test/Tests/src/Data/Interval_Spec.enso b/test/Tests/src/Data/Interval_Spec.enso index 5c0978268d80..743830cb032f 100644 --- a/test/Tests/src/Data/Interval_Spec.enso +++ b/test/Tests/src/Data/Interval_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Bound" <| diff --git a/test/Tests/src/Data/Json_Spec.enso b/test/Tests/src/Data/Json_Spec.enso index fe93655766ea..071665ee2b61 100644 --- a/test/Tests/src/Data/Json_Spec.enso +++ b/test/Tests/src/Data/Json_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.No_Such_Key.No_Such_Key from Standard.Base.Data.Json import Invalid_JSON from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Result.Test_Result type Author diff --git a/test/Tests/src/Data/List_Spec.enso b/test/Tests/src/Data/List_Spec.enso index a0d0d3d0d820..15c509090846 100644 --- a/test/Tests/src/Data/List_Spec.enso +++ b/test/Tests/src/Data/List_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Common.Unsupported_Argument_Types import Standard.Base.Runtime.State from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "List" <| l = List.Cons 1 <| List.Cons 2 <| List.Cons 3 <| List.Nil diff --git a/test/Tests/src/Data/Locale_Spec.enso b/test/Tests/src/Data/Locale_Spec.enso index 2338116a68fd..f70dbe8c3dd2 100644 --- a/test/Tests/src/Data/Locale_Spec.enso +++ b/test/Tests/src/Data/Locale_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Metadata.Choice import Option from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.util.Locale as JavaLocale diff --git a/test/Tests/src/Data/Map_Spec.enso b/test/Tests/src/Data/Map_Spec.enso index e544a77d7474..5d788b76203c 100644 --- a/test/Tests/src/Data/Map_Spec.enso +++ b/test/Tests/src/Data/Map_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Data.Time.Date_Time.Date_Time from Standard.Base.Data.Map import Map from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Map as JavaMap diff --git a/test/Tests/src/Data/Maybe_Spec.enso b/test/Tests/src/Data/Maybe_Spec.enso index 467148bdbd90..42ae685cedcf 100644 --- a/test/Tests/src/Data/Maybe_Spec.enso +++ b/test/Tests/src/Data/Maybe_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Maybe" <| Test.specify "should have a None variant" <| diff --git a/test/Tests/src/Data/Noise/Generator_Spec.enso b/test/Tests/src/Data/Noise/Generator_Spec.enso index 708d1c4cc056..9b8149a16d36 100644 --- a/test/Tests/src/Data/Noise/Generator_Spec.enso +++ b/test/Tests/src/Data/Noise/Generator_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Unimplemented.Unimplemented import Standard.Base.Data.Noise.Deterministic_Random from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Deterministic Random Noise Generator" <| diff --git a/test/Tests/src/Data/Noise_Spec.enso b/test/Tests/src/Data/Noise_Spec.enso index 65664cd4e4be..b5960ee813d2 100644 --- a/test/Tests/src/Data/Noise_Spec.enso +++ b/test/Tests/src/Data/Noise_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Generator My_Generator.step self _ _ = 1 diff --git a/test/Tests/src/Data/Numbers_Spec.enso b/test/Tests/src/Data/Numbers_Spec.enso index c03cd64f83bd..26462fdc4757 100644 --- a/test/Tests/src/Data/Numbers_Spec.enso +++ b/test/Tests/src/Data/Numbers_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Numbers import Number_Parse_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions Integer.is_even self = self % 2 == 0 diff --git a/test/Tests/src/Data/Ordering/Comparator_Spec.enso b/test/Tests/src/Data/Ordering/Comparator_Spec.enso index d9e6a0df7cfe..b0d554015096 100644 --- a/test/Tests/src/Data/Ordering/Comparator_Spec.enso +++ b/test/Tests/src/Data/Ordering/Comparator_Spec.enso @@ -6,7 +6,7 @@ polyglot java import org.enso.base.ObjectComparator polyglot java import org.enso.base.CompareException from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso index 0ff14dbefcff..3d5318c69543 100644 --- a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Natural Order" <| case_insensitive_compare a b = Natural_Order.compare a b Case_Sensitivity.Insensitive diff --git a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso index f96403578b26..071ac6220662 100644 --- a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Data.Ordering.Vector_Lexicographic_Order from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type Value a b diff --git a/test/Tests/src/Data/Ordering_Spec.enso b/test/Tests/src/Data/Ordering_Spec.enso index 098e44f34cc3..87c66e6a1c45 100644 --- a/test/Tests/src/Data/Ordering_Spec.enso +++ b/test/Tests/src/Data/Ordering_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Common.Type_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Pair_Spec.enso b/test/Tests/src/Data/Pair_Spec.enso index 7c1846e5279e..8cd0e782c26c 100644 --- a/test/Tests/src/Data/Pair_Spec.enso +++ b/test/Tests/src/Data/Pair_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Common.Not_Found from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type_spec name ctor = Test.group name <| Test.specify "should allow mapping" <| diff --git a/test/Tests/src/Data/Polyglot_Spec.enso b/test/Tests/src/Data/Polyglot_Spec.enso index 4db1cdd426a7..2000092d23dc 100644 --- a/test/Tests/src/Data/Polyglot_Spec.enso +++ b/test/Tests/src/Data/Polyglot_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.Double polyglot java import java.lang.Integer diff --git a/test/Tests/src/Data/Problems_Spec.enso b/test/Tests/src/Data/Problems_Spec.enso index 92bfabe2e7c1..acf92f4a2a1f 100644 --- a/test/Tests/src/Data/Problems_Spec.enso +++ b/test/Tests/src/Data/Problems_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Range_Spec.enso b/test/Tests/src/Data/Range_Spec.enso index 64766a5052f3..e4f946d7a4e6 100644 --- a/test/Tests/src/Data/Range_Spec.enso +++ b/test/Tests/src/Data/Range_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Range" <| Test.specify "should be created with a start, an end and a step" <| diff --git a/test/Tests/src/Data/Regression_Spec.enso b/test/Tests/src/Data/Regression_Spec.enso index 15862d51e56e..3fc73263ee55 100644 --- a/test/Tests/src/Data/Regression_Spec.enso +++ b/test/Tests/src/Data/Regression_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import Nothing, Vector, Number, Decimal, True, False, Regress import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = ## Regression test data produced using an Excel spreadsheet. diff --git a/test/Tests/src/Data/Statistics_Spec.enso b/test/Tests/src/Data/Statistics_Spec.enso index e06ef22d700e..9e8c3d72f392 100644 --- a/test/Tests/src/Data/Statistics_Spec.enso +++ b/test/Tests/src/Data/Statistics_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Text/Encoding_Spec.enso b/test/Tests/src/Data/Text/Encoding_Spec.enso index bb8bc6a99fba..c11e85e1df0f 100644 --- a/test/Tests/src/Data/Text/Encoding_Spec.enso +++ b/test/Tests/src/Data/Text/Encoding_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.String as Java_String diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index 15173ae02eeb..0755934f72de 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -1,14 +1,10 @@ from Standard.Base import all -import Standard.Base.Data.Text.Extensions -import Standard.Base.Data.Time.Date.Date -import Standard.Base.Data.Time.Time_Zone.Time_Zone +import Standard.Base.Data.Text.Text_Extensions import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error -import Standard.Base.Network.URI.URI -import Standard.Test.Extensions +import Standard.Test.Test_Extensions -from Standard.Base.Data.Json import Json, Invalid_JSON, JS_Object from Standard.Base.Data.Numbers import Decimal, Integer, Number_Parse_Error from Standard.Test import Test, Test_Suite diff --git a/test/Tests/src/Data/Text/Regex_Spec.enso b/test/Tests/src/Data/Text/Regex_Spec.enso index 8cf282610e38..a55222c747af 100644 --- a/test/Tests/src/Data/Text/Regex_Spec.enso +++ b/test/Tests/src/Data/Text/Regex_Spec.enso @@ -13,7 +13,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Text.Regex.Replacer import get_lru_size, replacer_cache_lookup from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import org.enso.base.Replacer_Cache diff --git a/test/Tests/src/Data/Text/Span_Spec.enso b/test/Tests/src/Data/Text/Span_Spec.enso index 28fbde8d30f5..8f85db4ca829 100644 --- a/test/Tests/src/Data/Text/Span_Spec.enso +++ b/test/Tests/src/Data/Text/Span_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Data.Text.Span.Span import Standard.Base.Data.Text.Span.Utf_16_Span from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Text.Span" <| diff --git a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso index dba8c9b918a7..6b50cccc3f35 100644 --- a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso +++ b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Base.Data.Text.Text_Sub_Range import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Text_Sub_Range_Data" <| Test.specify "should correctly split a text into grapheme cluster ranges expressed in codepoint indices" <| diff --git a/test/Tests/src/Data/Text/Utils_Spec.enso b/test/Tests/src/Data/Text/Utils_Spec.enso index 97d08dcd987c..85e4762c4375 100644 --- a/test/Tests/src/Data/Text/Utils_Spec.enso +++ b/test/Tests/src/Data/Text/Utils_Spec.enso @@ -5,7 +5,7 @@ polyglot java import org.enso.base.text.CaseFoldedString polyglot java import com.ibm.icu.text.BreakIterator from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.Exception as JException diff --git a/test/Tests/src/Data/Text_Spec.enso b/test/Tests/src/Data/Text_Spec.enso index f07b7c751c6b..6fa238f44ed3 100644 --- a/test/Tests/src/Data/Text_Spec.enso +++ b/test/Tests/src/Data/Text_Spec.enso @@ -13,7 +13,7 @@ from Standard.Base.Data.Text.Text_Sub_Range.Text_Sub_Range import all from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Base.Data.Text.Extensions type Auto diff --git a/test/Tests/src/Data/Time/Date_Part_Spec.enso b/test/Tests/src/Data/Time/Date_Part_Spec.enso index 61178f8be9e1..3f46cf89283e 100644 --- a/test/Tests/src/Data/Time/Date_Part_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Part_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec name create_new_date = Test.group (name + "date part tests") <| diff --git a/test/Tests/src/Data/Time/Date_Range_Spec.enso b/test/Tests/src/Data/Time/Date_Range_Spec.enso index 20fe0933ef22..8010f2ffc8d3 100644 --- a/test/Tests/src/Data/Time/Date_Range_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Range_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Time/Date_Spec.enso b/test/Tests/src/Data/Time/Date_Spec.enso index 908a1a90339d..b74ff9462067 100644 --- a/test/Tests/src/Data/Time/Date_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Date_Time_Spec.enso b/test/Tests/src/Data/Time/Date_Time_Spec.enso index 872409e77eb1..37f73004753b 100644 --- a/test/Tests/src/Data/Time/Date_Time_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Time_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso index b7c8d8ae231a..2a778c510629 100644 --- a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso +++ b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Day_Of_Week conversions" <| diff --git a/test/Tests/src/Data/Time/Duration_Spec.enso b/test/Tests/src/Data/Time/Duration_Spec.enso index 0d0d45a136bb..1b03bcd78be1 100644 --- a/test/Tests/src/Data/Time/Duration_Spec.enso +++ b/test/Tests/src/Data/Time/Duration_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.time.Duration as Java_Duration polyglot java import java.time.LocalDate diff --git a/test/Tests/src/Data/Time/Period_Spec.enso b/test/Tests/src/Data/Time/Period_Spec.enso index 9895ae126861..77eea4134bcd 100644 --- a/test/Tests/src/Data/Time/Period_Spec.enso +++ b/test/Tests/src/Data/Time/Period_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Incomparable_Values from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Period" <| diff --git a/test/Tests/src/Data/Time/Spec.enso b/test/Tests/src/Data/Time/Spec.enso index 1322d2dd627c..340e0ea63870 100644 --- a/test/Tests/src/Data/Time/Spec.enso +++ b/test/Tests/src/Data/Time/Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Data.Time.Duration_Spec import project.Data.Time.Period_Spec diff --git a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso index 26b6829e683f..dd276caaa87d 100644 --- a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.time.LocalTime polyglot java import java.time.format.DateTimeFormatter diff --git a/test/Tests/src/Data/Time/Time_Zone_Spec.enso b/test/Tests/src/Data/Time/Time_Zone_Spec.enso index 9190ed5313dd..2fbe14eae480 100644 --- a/test/Tests/src/Data/Time/Time_Zone_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Zone_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.time.ZoneId polyglot java import java.time.ZoneOffset diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index fdcd7711a992..017b6257ab5f 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Data.Index_Sub_Range from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Vector Slicing Helpers" <| Test.specify "should be able to sort correctly merge neighboring sequences" <| diff --git a/test/Tests/src/Data/Vector_Spec.enso b/test/Tests/src/Data/Vector_Spec.enso index 9ed592143ad4..150b10ae60cc 100644 --- a/test/Tests/src/Data/Vector_Spec.enso +++ b/test/Tests/src/Data/Vector_Spec.enso @@ -12,7 +12,7 @@ import Standard.Base.Runtime.Ref.Ref from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import While, By_Index, Sample, Every from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.util.ArrayList diff --git a/test/Tests/src/Main.enso b/test/Tests/src/Main.enso index 1c5db730d991..1c3d2580cfac 100644 --- a/test/Tests/src/Main.enso +++ b/test/Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Semantic.Any_Spec import project.Semantic.Case_Spec diff --git a/test/Tests/src/Network/Http/Header_Spec.enso b/test/Tests/src/Network/Http/Header_Spec.enso index 4907810341b3..396b66e87c97 100644 --- a/test/Tests/src/Network/Http/Header_Spec.enso +++ b/test/Tests/src/Network/Http/Header_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Network.HTTP.Header.Header from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Header" <| diff --git a/test/Tests/src/Network/Http/Request_Spec.enso b/test/Tests/src/Network/Http/Request_Spec.enso index ed9ba556be13..954b4d1cf75d 100644 --- a/test/Tests/src/Network/Http/Request_Spec.enso +++ b/test/Tests/src/Network/Http/Request_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Network.HTTP.Request.Request import Standard.Base.Network.HTTP.Request_Body.Request_Body from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = test_uri = URI.parse "https://httpbin.org/post" diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index 9ecd745275a1..180047779351 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -9,7 +9,7 @@ import Standard.Base.Network.HTTP.Request_Error import Standard.Base.Network.Proxy.Proxy from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.System diff --git a/test/Tests/src/Network/URI_Spec.enso b/test/Tests/src/Network/URI_Spec.enso index b73853a5c0b4..4f9352567f2c 100644 --- a/test/Tests/src/Network/URI_Spec.enso +++ b/test/Tests/src/Network/URI_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "URI" <| diff --git a/test/Tests/src/Random_Spec.enso b/test/Tests/src/Random_Spec.enso index 1220e1f8fd96..593f023f3e36 100644 --- a/test/Tests/src/Random_Spec.enso +++ b/test/Tests/src/Random_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Random from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Random" <| ## Random number generator seeded to make the test deterministic diff --git a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso index 0c1650258198..5bbf7d7dd1af 100644 --- a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso @@ -1,5 +1,5 @@ from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type Generator Value h t diff --git a/test/Tests/src/Runtime/Lazy_Spec.enso b/test/Tests/src/Runtime/Lazy_Spec.enso index e024ed534e37..da62ae7294b5 100644 --- a/test/Tests/src/Runtime/Lazy_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Runtime.Ref.Ref import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type Lazy Value ~get diff --git a/test/Tests/src/Runtime/Managed_Resource_Spec.enso b/test/Tests/src/Runtime/Managed_Resource_Spec.enso index faeb79acde7e..5d05e6e58ab0 100644 --- a/test/Tests/src/Runtime/Managed_Resource_Spec.enso +++ b/test/Tests/src/Runtime/Managed_Resource_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Managed_Resource.Managed_Resource from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Managed_Resource" <| Test.specify "should call the destructor even if the action fails" <| diff --git a/test/Tests/src/Runtime/Ref_Spec.enso b/test/Tests/src/Runtime/Ref_Spec.enso index 64dd1a3a583c..3147e9e65e04 100644 --- a/test/Tests/src/Runtime/Ref_Spec.enso +++ b/test/Tests/src/Runtime/Ref_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Refs" <| Test.specify "should be able to store and retrieve value in references" <| diff --git a/test/Tests/src/Runtime/Stack_Traces_Spec.enso b/test/Tests/src/Runtime/Stack_Traces_Spec.enso index 713414667774..b09520ffd9bb 100644 --- a/test/Tests/src/Runtime/Stack_Traces_Spec.enso +++ b/test/Tests/src/Runtime/Stack_Traces_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type diff --git a/test/Tests/src/Semantic/Any_Spec.enso b/test/Tests/src/Semantic/Any_Spec.enso index 46a2b06cc95c..412d3a7bdf97 100644 --- a/test/Tests/src/Semantic/Any_Spec.enso +++ b/test/Tests/src/Semantic/Any_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Semantic.Definitions.Any_Types import all spec = diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index 73a14553bbd3..c5daaed39e40 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -11,7 +11,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.List as JList from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Pattern Matches" <| Test.specify "should be able to match on the Boolean type" <| diff --git a/test/Tests/src/Semantic/Conversion_Spec.enso b/test/Tests/src/Semantic/Conversion_Spec.enso index dda980a3ad40..e30c6258dbb0 100644 --- a/test/Tests/src/Semantic/Conversion_Spec.enso +++ b/test/Tests/src/Semantic/Conversion_Spec.enso @@ -4,7 +4,7 @@ import project.Semantic.Conversion.Methods import project.Semantic.Conversion.Types from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.Object diff --git a/test/Tests/src/Semantic/Deep_Export/Spec.enso b/test/Tests/src/Semantic/Deep_Export/Spec.enso index 1ddb32bf3bb0..a128ddb6587c 100644 --- a/test/Tests/src/Semantic/Deep_Export/Spec.enso +++ b/test/Tests/src/Semantic/Deep_Export/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Deep_Export.Internal from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Deep Exports" <| diff --git a/test/Tests/src/Semantic/Default_Args_Spec.enso b/test/Tests/src/Semantic/Default_Args_Spec.enso index e486820eea8c..e0596958a0fb 100644 --- a/test/Tests/src/Semantic/Default_Args_Spec.enso +++ b/test/Tests/src/Semantic/Default_Args_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from project.Semantic.Default_Args_Spec.Box import all diff --git a/test/Tests/src/Semantic/Equals_Spec.enso b/test/Tests/src/Semantic/Equals_Spec.enso index ced1df6a608f..1f8721d67acc 100644 --- a/test/Tests/src/Semantic/Equals_Spec.enso +++ b/test/Tests/src/Semantic/Equals_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Random as Java_Random diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso index f9cee8c31546..2458080ee27d 100644 --- a/test/Tests/src/Semantic/Error_Spec.enso +++ b/test/Tests/src/Semantic/Error_Spec.enso @@ -12,7 +12,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.Random from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type Value foo diff --git a/test/Tests/src/Semantic/Import_Loop/Spec.enso b/test/Tests/src/Semantic/Import_Loop/Spec.enso index 3649b1f76660..1666a91e4bdb 100644 --- a/test/Tests/src/Semantic/Import_Loop/Spec.enso +++ b/test/Tests/src/Semantic/Import_Loop/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Import_Loop.B from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Looping Imports" <| Test.specify "should behave correctly and not loop the compiler" <| diff --git a/test/Tests/src/Semantic/Java_Interop_Spec.enso b/test/Tests/src/Semantic/Java_Interop_Spec.enso index a1ac2a913187..938b7aa8756a 100644 --- a/test/Tests/src/Semantic/Java_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Java_Interop_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions polyglot java import java.lang.Float polyglot java import java.lang.Integer diff --git a/test/Tests/src/Semantic/Js_Interop_Spec.enso b/test/Tests/src/Semantic/Js_Interop_Spec.enso index 798e05b28f89..b8a720ec3997 100644 --- a/test/Tests/src/Semantic/Js_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Js_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Meta_Location_Spec.enso b/test/Tests/src/Semantic/Meta_Location_Spec.enso index 40dfe9d69a63..3cd441bbe83a 100644 --- a/test/Tests/src/Semantic/Meta_Location_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Location_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type Value foo bar baz diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index c4f6eb612118..f4d928e2ae8d 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -13,7 +13,7 @@ polyglot java import java.util.Random polyglot java import java.util.Locale as JavaLocale from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Result.Test_Result type My_Type diff --git a/test/Tests/src/Semantic/Names_Spec.enso b/test/Tests/src/Semantic/Names_Spec.enso index 765e26de685d..89d13a22c364 100644 --- a/test/Tests/src/Semantic/Names_Spec.enso +++ b/test/Tests/src/Semantic/Names_Spec.enso @@ -4,7 +4,7 @@ from project.Semantic.Definitions.Names import another_method, another_constant, import project.Semantic.Definitions.Names from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions Names.Foo.my_method self = case self of Names.Foo.Value x y z -> x * y * z diff --git a/test/Tests/src/Semantic/Python_Interop_Spec.enso b/test/Tests/src/Semantic/Python_Interop_Spec.enso index d3ad1b1570c5..557338159378 100644 --- a/test/Tests/src/Semantic/Python_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Python_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions foreign python my_method a b = """ return a + b diff --git a/test/Tests/src/Semantic/R_Interop_Spec.enso b/test/Tests/src/Semantic/R_Interop_Spec.enso index 28d721d2214c..96cb154a2467 100644 --- a/test/Tests/src/Semantic/R_Interop_Spec.enso +++ b/test/Tests/src/Semantic/R_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Runtime_Spec.enso b/test/Tests/src/Semantic/Runtime_Spec.enso index 55a3d22d5f18..4b729fcdb502 100644 --- a/test/Tests/src/Semantic/Runtime_Spec.enso +++ b/test/Tests/src/Semantic/Runtime_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Panic.Panic from Standard.Base.Runtime.Context import Input, Output from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions in_fn : Integer -> Integer in_fn a = Input.if_enabled (a * 2) diff --git a/test/Tests/src/Semantic/Self_Type_Spec.enso b/test/Tests/src/Semantic/Self_Type_Spec.enso index 7b620f70900c..6a6d03c97731 100644 --- a/test/Tests/src/Semantic/Self_Type_Spec.enso +++ b/test/Tests/src/Semantic/Self_Type_Spec.enso @@ -1,6 +1,6 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type Cons_A x diff --git a/test/Tests/src/Semantic/Warnings_Spec.enso b/test/Tests/src/Semantic/Warnings_Spec.enso index fd52d72289da..c46ef3d27868 100644 --- a/test/Tests/src/Semantic/Warnings_Spec.enso +++ b/test/Tests/src/Semantic/Warnings_Spec.enso @@ -7,7 +7,7 @@ polyglot java import java.util.function.Function as Java_Function polyglot java import org.enso.base_test_helpers.CallbackHelper from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Warning Value reason diff --git a/test/Tests/src/System/Environment_Spec.enso b/test/Tests/src/System/Environment_Spec.enso index 3152bbd57717..2f35bbf850c5 100644 --- a/test/Tests/src/System/Environment_Spec.enso +++ b/test/Tests/src/System/Environment_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Environment spec = Test.group "Environment" <| diff --git a/test/Tests/src/System/File_Read_Spec.enso b/test/Tests/src/System/File_Read_Spec.enso index c294d5df3274..d68320009a67 100644 --- a/test/Tests/src/System/File_Read_Spec.enso +++ b/test/Tests/src/System/File_Read_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.File_Error.File_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = sample_xxx = enso_project.data / "sample.xxx" diff --git a/test/Tests/src/System/File_Spec.enso b/test/Tests/src/System/File_Spec.enso index 7634fd73ad0b..987ba4be9172 100644 --- a/test/Tests/src/System/File_Spec.enso +++ b/test/Tests/src/System/File_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Runtime.Context polyglot java import org.enso.base_test_helpers.FileSystemHelper from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions set_writable file writable = path = file.absolute.path diff --git a/test/Tests/src/System/Process_Spec.enso b/test/Tests/src/System/Process_Spec.enso index 600a67f89864..2f157f868332 100644 --- a/test/Tests/src/System/Process_Spec.enso +++ b/test/Tests/src/System/Process_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Process" <| Test.specify "should call simple command" <| diff --git a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso index a9a0e832ff41..41dae87db101 100644 --- a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Runtime.Context polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = windows_file = enso_project.data / "windows.txt" diff --git a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso index 948e4e6607d2..b28e25ab73b0 100644 --- a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso @@ -7,7 +7,7 @@ polyglot java import org.enso.base.Encoding_Utils polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "ReportingStreamEncoder" <| diff --git a/test/Tests/src/System/System_Spec.enso b/test/Tests/src/System/System_Spec.enso index 3b5165ce41fa..67cc84a9cac8 100644 --- a/test/Tests/src/System/System_Spec.enso +++ b/test/Tests/src/System/System_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "System" <| Test.specify "should provide nanosecond timer" <| diff --git a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso index 322ebd35b9df..4fc003868cf3 100644 --- a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso +++ b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions from Standard.Table import Table sample_table = Table.new [["A", [1, 2, 3]]] diff --git a/test/Visualization_Tests/src/Geo_Map_Spec.enso b/test/Visualization_Tests/src/Geo_Map_Spec.enso index b50305875c04..6ad1df9d4f5d 100644 --- a/test/Visualization_Tests/src/Geo_Map_Spec.enso +++ b/test/Visualization_Tests/src/Geo_Map_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Table import Standard.Visualization.Geo_Map from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Helpers diff --git a/test/Visualization_Tests/src/Helpers.enso b/test/Visualization_Tests/src/Helpers.enso index c9c5e5aca7b6..6de781357dbb 100644 --- a/test/Visualization_Tests/src/Helpers.enso +++ b/test/Visualization_Tests/src/Helpers.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Column from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Test.Test_Result.Test_Result Column.expect : Text -> Vector -> Test_Result diff --git a/test/Visualization_Tests/src/Helpers_Spec.enso b/test/Visualization_Tests/src/Helpers_Spec.enso index e04f4c4b5a5c..ce5b59fc2cc6 100644 --- a/test/Visualization_Tests/src/Helpers_Spec.enso +++ b/test/Visualization_Tests/src/Helpers_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table import Standard.Visualization.Helpers from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project.Helpers diff --git a/test/Visualization_Tests/src/Histogram_Spec.enso b/test/Visualization_Tests/src/Histogram_Spec.enso index 69f7b6ca74a1..fa6d5c8b8c8f 100644 --- a/test/Visualization_Tests/src/Histogram_Spec.enso +++ b/test/Visualization_Tests/src/Histogram_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Histogram from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project diff --git a/test/Visualization_Tests/src/Id_Spec.enso b/test/Visualization_Tests/src/Id_Spec.enso index 2e6855ccfe8f..446fcffe59c5 100644 --- a/test/Visualization_Tests/src/Id_Spec.enso +++ b/test/Visualization_Tests/src/Id_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table import Standard.Visualization from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions type My_Type Value my_field diff --git a/test/Visualization_Tests/src/Lazy_Table_Spec.enso b/test/Visualization_Tests/src/Lazy_Table_Spec.enso index e61e92266a2d..d0fd0cbc5093 100644 --- a/test/Visualization_Tests/src/Lazy_Table_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Table_Spec.enso @@ -7,7 +7,7 @@ import Standard.Visualization.Table as Table_Visualisation import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions t1 = """ 12 23 diff --git a/test/Visualization_Tests/src/Lazy_Text_Spec.enso b/test/Visualization_Tests/src/Lazy_Text_Spec.enso index 12da49cf4d3c..e1fc147386d4 100644 --- a/test/Visualization_Tests/src/Lazy_Text_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Text_Spec.enso @@ -6,7 +6,7 @@ import Standard.Visualization.Text as TextVis import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions sample_text_single_line = "ABCDEFGHIJKLMNOPQRS" sample_text_multi_line = """ diff --git a/test/Visualization_Tests/src/SQL_Spec.enso b/test/Visualization_Tests/src/SQL_Spec.enso index 0a2076716aed..59b17c0daeb1 100644 --- a/test/Visualization_Tests/src/SQL_Spec.enso +++ b/test/Visualization_Tests/src/SQL_Spec.enso @@ -5,7 +5,7 @@ from Standard.Database import Database, SQLite, SQL_Query import Standard.Visualization.SQL.Visualization from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions visualization_spec connection = connection.execute_update 'CREATE TABLE "T" ("A" VARCHAR, "B" INTEGER, "C" INTEGER)' diff --git a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso index 376fbf79329f..424226f475ce 100644 --- a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso +++ b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Scatter_Plot from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import project diff --git a/test/Visualization_Tests/src/Table_Spec.enso b/test/Visualization_Tests/src/Table_Spec.enso index eb74669c2a84..a337f6172fbd 100644 --- a/test/Visualization_Tests/src/Table_Spec.enso +++ b/test/Visualization_Tests/src/Table_Spec.enso @@ -12,7 +12,7 @@ import Standard.Visualization.Helpers import Standard.Visualization.Id.Id from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Base.Errors.Common.Type_Error polyglot java import java.util.UUID diff --git a/test/Visualization_Tests/src/Visualization_Spec.enso b/test/Visualization_Tests/src/Visualization_Spec.enso index 16b5554972d6..34904a5dd672 100644 --- a/test/Visualization_Tests/src/Visualization_Spec.enso +++ b/test/Visualization_Tests/src/Visualization_Spec.enso @@ -5,7 +5,7 @@ import Standard.Examples import Standard.Visualization from Standard.Test import Test -import Standard.Test.Extensions +import Standard.Test.Test_Extensions import Standard.Visualization.File_Upload.File_Being_Uploaded diff --git a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso index c14a5c57d9aa..4bfa5fa08927 100644 --- a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso @@ -11,7 +11,7 @@ from Standard.AWS import all import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso index bd49093326f6..ebc38885e54f 100644 --- a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso @@ -9,7 +9,7 @@ from Standard.Table import Table import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Widgets for In-Memory with column name sets" <| diff --git a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso index 071068fe931d..8cf9eeaaaeb6 100644 --- a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso @@ -8,7 +8,7 @@ import Standard.Base.Metadata.Display import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Extensions +import Standard.Test.Test_Extensions spec = Test.group "Widgets for the Text type" <| From b1e5809af6a15a1971ea2dfe48f0415f00104ffd Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 18:02:25 +0200 Subject: [PATCH 21/52] Remove some ambiguous imports --- .../lib/Standard/Image/0.0.0-dev/src/Data/Image.enso | 2 +- .../lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso | 2 +- distribution/lib/Standard/Test/0.0.0-dev/src/Faker.enso | 4 ++-- test/Table_Tests/src/Database/Codegen_Spec.enso | 2 +- test/Table_Tests/src/Database/Common_Spec.enso | 2 +- test/Table_Tests/src/Database/Postgres_Spec.enso | 2 +- test/Table_Tests/src/Main.enso | 2 +- test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso | 2 +- test/Tests/src/Network/Http_Spec.enso | 4 ++-- test/Tests/src/Semantic/Case_Spec.enso | 4 ++-- test/Tests/src/Semantic/Error_Spec.enso | 4 ++-- test/Tests/src/Semantic/Java_Interop_Spec.enso | 6 +++--- test/Tests/src/Semantic/Meta_Spec.enso | 8 ++++---- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso index 94824825b355..a33b9f2ca484 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding Sort_Direction import Standard.Base.Runtime.Context import Standard.Base.Errors.Common.Forbidden_Operation import Standard.Base.Errors.File_Error.File_Error diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso index ec137273c55f..7587286f186e 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding Sort_Direction from Standard.Base.Data.Ordering import all diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Faker.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Faker.enso index 6b97c6897c70..8eb16ae79827 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Faker.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Faker.enso @@ -1,6 +1,6 @@ from Standard.Base import all -polyglot java import java.util.Random +polyglot java import java.util.Random as Java_Random polyglot java import org.enso.base.Text_Utils ## Object to generate (deterministic) random value for testing @@ -17,7 +17,7 @@ type Faker - seed: Optional seed value to make the sequence deterministic new : Integer -> Faker new (seed = 0) = - generator = if seed == 0 then Random.new else Random.new seed + generator = if seed == 0 then Java_Random.new else Java_Random.new seed Faker.Value generator Value generator diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index bebe198a6344..732567539ed4 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last from Standard.Table.Errors import No_Input_Columns_Selected, Missing_Input_Columns, No_Such_Column from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index 679b8b969b30..dadc81575271 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Table, Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last from Standard.Table.Errors import all from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index 0573d2aab84b..7a8d5fba87cf 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Runtime.Ref.Ref import Standard.Table.Data.Type.Value_Type.Bits from Standard.Table import Table, Value_Type -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last import Standard.Database.Data.SQL_Type.SQL_Type import Standard.Database.Internal.Postgres.Pgpass diff --git a/test/Table_Tests/src/Main.enso b/test/Table_Tests/src/Main.enso index acbf55a42e73..b67eef28c59e 100644 --- a/test/Table_Tests/src/Main.enso +++ b/test/Table_Tests/src/Main.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding IO from Standard.Test import Test_Suite diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index 017b6257ab5f..128d0b89721e 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding Index_Sub_Range import Standard.Base.Data.Index_Sub_Range from Standard.Test import Test, Test_Suite diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index 180047779351..3d29e951d7ec 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -11,10 +11,10 @@ import Standard.Base.Network.Proxy.Proxy from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions -polyglot java import java.lang.System +polyglot java import java.lang.Java_System spec = - base_url = System.getenv "ENSO_HTTP_TEST_HTTPBIN_URL" + base_url = Java_System.getenv "ENSO_HTTP_TEST_HTTPBIN_URL" pending = if base_url != Nothing then Nothing else "The HTTP tests only run when the `ENSO_HTTP_TEST_HTTPBIN_URL` environment variable is set to URL of the httpbin server" diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index c5daaed39e40..ce79d82cf8a3 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Data.Vector as Vector_Module polyglot java import java.lang.Class polyglot java import java.lang.Object as JObject -polyglot java import java.util.Random +polyglot java import java.util.Java_Random polyglot java import java.util.AbstractList polyglot java import java.util.ArrayList polyglot java import java.util.List as JList @@ -108,7 +108,7 @@ spec = Test.group "Pattern Matches" <| Array_Module -> Nothing _ -> Test.fail "Expected the Array module to match." Test.specify "should be able to match on the Polyglot type" <| - random_gen = Random.new + random_gen = Java_Random.new case random_gen of Polyglot -> Nothing _ -> Test.fail "Expected a polyglot object to match." diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso index 2458080ee27d..8185668f012d 100644 --- a/test/Tests/src/Semantic/Error_Spec.enso +++ b/test/Tests/src/Semantic/Error_Spec.enso @@ -9,7 +9,7 @@ polyglot java import java.lang.Long polyglot java import java.lang.NumberFormatException polyglot java import java.lang.Exception as JException polyglot java import java.util.ArrayList -polyglot java import java.util.Random +polyglot java import java.util.Java_Random from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions @@ -87,7 +87,7 @@ spec = Test.specify "should short-circuit polyglot evaluation" <| error = Error.throw 42 - Random.new error . should_fail_with Integer + Java_Random.new error . should_fail_with Integer Test.specify "should allow to inspect their stacktrace" <| error = throw_a_bar diff --git a/test/Tests/src/Semantic/Java_Interop_Spec.enso b/test/Tests/src/Semantic/Java_Interop_Spec.enso index 938b7aa8756a..0b8100aa52db 100644 --- a/test/Tests/src/Semantic/Java_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Java_Interop_Spec.enso @@ -5,7 +5,7 @@ from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions polyglot java import java.lang.Float -polyglot java import java.lang.Integer +polyglot java import java.lang.Java_Integer polyglot java import java.lang.Long polyglot java import java.lang.String polyglot java import java.lang.StringBuilder as Java_String_Builder @@ -31,7 +31,7 @@ spec = Test.expect_panic_with (list.asList) No_Such_Method Test.specify "should auto-convert numeric types across the polyglot boundary" <| (Float.valueOf "123.3" + 5).should_equal 128.3 epsilon=0.0001 - (Integer.sum 1 2 + 3) . should_equal 6 + (Java_Integer.sum 1 2 + 3) . should_equal 6 Test.specify "should auto-convert strings across the polyglot boundary" <| (String.format "%s bar %s" "baz" "quux" + " foo").should_equal "baz bar quux foo" Test.specify "should support Java import renaming" <| @@ -41,7 +41,7 @@ spec = str = builder.toString str.should_equal "foobar" Test.specify "should invoke static methods" <| - x = Integer.valueOf 1 + x = Java_Integer.valueOf 1 x.test_me x . should_equal False Test.group "Numeric values" <| diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index f4d928e2ae8d..656da339d2bd 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -9,7 +9,7 @@ polyglot java import java.lang.Long as JLong polyglot java import java.lang.Exception as JException polyglot java import java.io.IOException polyglot java import java.util.ArrayList -polyglot java import java.util.Random +polyglot java import java.util.Java_Random polyglot java import java.util.Locale as JavaLocale from Standard.Test import Test, Test_Suite @@ -109,8 +109,8 @@ spec = 1.0.is_a Integer . should_be_false 1.0.is_a Text . should_be_false - random_gen = Random.new - Meta.is_a random_gen Random . should_be_true + random_gen = Java_Random.new + Meta.is_a random_gen Java_Random . should_be_true Meta.is_a random_gen Integer . should_be_false (My_Type.Value 1 "foo" Nothing).is_a My_Type . should_be_true @@ -251,7 +251,7 @@ spec = Meta.meta Integer . methods . sort . should_equal ['round', 'truncate'] Test.specify "should correctly handle Java values" <| - java_meta = Meta.meta Random.new + java_meta = Meta.meta Java_Random.new java_meta . should_be_a Meta.Polyglot java_meta . get_language . should_equal Meta.Language.Java From fdc9247485c2844d029e817b0040a58d583004aa Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 18:02:56 +0200 Subject: [PATCH 22/52] Remove some duplicate imports --- .../Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso | 2 -- .../Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso | 1 - .../src/Common_Table_Operations/Join/Union_Spec.enso | 1 - test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso | 1 - test/Table_Tests/src/Database/SQLite_Spec.enso | 1 - test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso | 1 - test/Tests/src/Data/Map_Spec.enso | 2 -- test/Tests/src/Data/Text/Regex_Spec.enso | 1 - test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso | 2 -- test/Tests/src/Network/Http/Header_Spec.enso | 2 -- test/Tests/src/Network/Http/Request_Spec.enso | 1 - test/Tests/src/Network/Http_Spec.enso | 1 - test/Tests/src/Semantic/Meta_Spec.enso | 1 - 13 files changed, 17 deletions(-) diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso index adf7d649ce1f..784a20e7da6c 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Parse_To_Table.enso @@ -4,8 +4,6 @@ import project.Data.Column.Column import project.Data.Data_Formatter.Data_Formatter import project.Data.Table.Table import project.Internal.Unique_Name_Strategy.Unique_Name_Strategy -import Standard.Base.Data.Text.Regex.Pattern -import Standard.Base.Data.Text.Regex.Match.Match import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso index 6a7815df35ad..0093bbf1d37e 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso @@ -3,7 +3,6 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import all hiding Table from Standard.Table.Errors import all -import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso index abaef6b8b952..e0e33e9b77ba 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso @@ -2,7 +2,6 @@ from Standard.Base import all from Standard.Table import all from Standard.Table.Errors import all -import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso index 3b374f17e8c8..b60cdb3c71e6 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso @@ -3,7 +3,6 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import all hiding Table from Standard.Table.Errors import all -import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso index e6cf5c6c230f..6e25563c269a 100644 --- a/test/Table_Tests/src/Database/SQLite_Spec.enso +++ b/test/Table_Tests/src/Database/SQLite_Spec.enso @@ -6,7 +6,6 @@ import Standard.Base.Errors.File_Error.File_Error import Standard.Table.Data.Type.Value_Type.Bits from Standard.Table import Table, Value_Type -import Standard.Database.Connection.SQLite_Format.SQLite_Format from Standard.Database import all from Standard.Database.Errors import SQL_Error diff --git a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso index ac5fa1ef8482..c552054f43c2 100644 --- a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso @@ -1,6 +1,5 @@ from Standard.Base import all -import Standard.Base.Data.Text.Case_Sensitivity.Case_Sensitivity import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Table.Data.Table_Conversions diff --git a/test/Tests/src/Data/Map_Spec.enso b/test/Tests/src/Data/Map_Spec.enso index 5d788b76203c..de5e175f22fe 100644 --- a/test/Tests/src/Data/Map_Spec.enso +++ b/test/Tests/src/Data/Map_Spec.enso @@ -1,8 +1,6 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Errors.No_Such_Key.No_Such_Key -import Standard.Base.Data.Time.Date_Time.Date_Time -from Standard.Base.Data.Map import Map from Standard.Test import Test, Test_Suite, Problems import Standard.Test.Test_Extensions diff --git a/test/Tests/src/Data/Text/Regex_Spec.enso b/test/Tests/src/Data/Text/Regex_Spec.enso index a55222c747af..9e91045c76c7 100644 --- a/test/Tests/src/Data/Text/Regex_Spec.enso +++ b/test/Tests/src/Data/Text/Regex_Spec.enso @@ -1,7 +1,6 @@ from Standard.Base import all import Standard.Base.Data.Text.Span.Span import Standard.Base.Data.Text.Span.Utf_16_Span -import Standard.Base.Data.Text.Regex import Standard.Base.Data.Text.Regex.Match.Match import Standard.Base.Data.Text.Regex.No_Such_Group import Standard.Base.Data.Text.Regex.Pattern.Pattern diff --git a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso index 6b50cccc3f35..6fdc48539d0d 100644 --- a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso +++ b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso @@ -1,7 +1,5 @@ from Standard.Base import all -from Standard.Base.Data.Text.Text_Sub_Range import all - from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions diff --git a/test/Tests/src/Network/Http/Header_Spec.enso b/test/Tests/src/Network/Http/Header_Spec.enso index 396b66e87c97..4f749910deab 100644 --- a/test/Tests/src/Network/Http/Header_Spec.enso +++ b/test/Tests/src/Network/Http/Header_Spec.enso @@ -1,7 +1,5 @@ from Standard.Base import all -import Standard.Base.Network.HTTP.Header.Header - from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions diff --git a/test/Tests/src/Network/Http/Request_Spec.enso b/test/Tests/src/Network/Http/Request_Spec.enso index 954b4d1cf75d..c2d9c08bdd33 100644 --- a/test/Tests/src/Network/Http/Request_Spec.enso +++ b/test/Tests/src/Network/Http/Request_Spec.enso @@ -2,7 +2,6 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Network.HTTP.Form.Form -import Standard.Base.Network.HTTP.Header.Header import Standard.Base.Network.HTTP.Request.Request import Standard.Base.Network.HTTP.Request_Body.Request_Body diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index 3d29e951d7ec..cb513e0e73b7 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -2,7 +2,6 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Network.HTTP.Form.Form -import Standard.Base.Network.HTTP.Header.Header import Standard.Base.Network.HTTP.Request.Request import Standard.Base.Network.HTTP.Request_Body.Request_Body import Standard.Base.Network.HTTP.Request_Error diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index 656da339d2bd..47d8ac2ddf6b 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -1,5 +1,4 @@ from Standard.Base import all -from Standard.Base.Function import Function import Standard.Base.Errors.File_Error.File_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Errors.Common import Uninitialized_State From ca7e22a3b6341caf3fced1f868108eac8623416d Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 6 Jun 2023 18:15:43 +0200 Subject: [PATCH 23/52] Fix some imports after removals --- test/Tests/src/Data/Text/Parse_Spec.enso | 1 + test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso | 1 + test/Tests/src/Data/Text_Spec.enso | 2 +- test/Tests/src/Network/Http_Spec.enso | 2 +- test/Tests/src/Semantic/Case_Spec.enso | 4 ++-- test/Tests/src/Semantic/Error_Spec.enso | 2 +- test/Tests/src/Semantic/Java_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Spec.enso | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index 0755934f72de..dbd8abac0f2c 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -4,6 +4,7 @@ import Standard.Base.Data.Text.Text_Extensions import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error import Standard.Test.Test_Extensions +from Standard.Base.Data.Json import Invalid_JSON from Standard.Base.Data.Numbers import Decimal, Integer, Number_Parse_Error from Standard.Test import Test, Test_Suite diff --git a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso index 6fdc48539d0d..923d0d2a86a0 100644 --- a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso +++ b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso @@ -1,4 +1,5 @@ from Standard.Base import all +from Standard.Base.Data.Text.Text_Sub_Range import character_ranges from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions diff --git a/test/Tests/src/Data/Text_Spec.enso b/test/Tests/src/Data/Text_Spec.enso index 6fa238f44ed3..83209ff79de6 100644 --- a/test/Tests/src/Data/Text_Spec.enso +++ b/test/Tests/src/Data/Text_Spec.enso @@ -14,7 +14,7 @@ from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import all from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions -import Standard.Base.Data.Text.Extensions +import Standard.Base.Data.Text.Text_Extensions type Auto Value a diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index cb513e0e73b7..06d2012d7539 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Network.Proxy.Proxy from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions -polyglot java import java.lang.Java_System +polyglot java import java.lang.System as Java_System spec = base_url = Java_System.getenv "ENSO_HTTP_TEST_HTTPBIN_URL" diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index ce79d82cf8a3..5363278edf3e 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Data.Vector as Vector_Module polyglot java import java.lang.Class polyglot java import java.lang.Object as JObject -polyglot java import java.util.Java_Random +polyglot java import java.util.Random as JRandom polyglot java import java.util.AbstractList polyglot java import java.util.ArrayList polyglot java import java.util.List as JList @@ -108,7 +108,7 @@ spec = Test.group "Pattern Matches" <| Array_Module -> Nothing _ -> Test.fail "Expected the Array module to match." Test.specify "should be able to match on the Polyglot type" <| - random_gen = Java_Random.new + random_gen = JRandom.new case random_gen of Polyglot -> Nothing _ -> Test.fail "Expected a polyglot object to match." diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso index 8185668f012d..90711bd9dc30 100644 --- a/test/Tests/src/Semantic/Error_Spec.enso +++ b/test/Tests/src/Semantic/Error_Spec.enso @@ -9,7 +9,7 @@ polyglot java import java.lang.Long polyglot java import java.lang.NumberFormatException polyglot java import java.lang.Exception as JException polyglot java import java.util.ArrayList -polyglot java import java.util.Java_Random +polyglot java import java.util.Random as Java_Random from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions diff --git a/test/Tests/src/Semantic/Java_Interop_Spec.enso b/test/Tests/src/Semantic/Java_Interop_Spec.enso index 0b8100aa52db..c3d232b6d8d3 100644 --- a/test/Tests/src/Semantic/Java_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Java_Interop_Spec.enso @@ -5,7 +5,7 @@ from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions polyglot java import java.lang.Float -polyglot java import java.lang.Java_Integer +polyglot java import java.lang.Integer as Java_Integer polyglot java import java.lang.Long polyglot java import java.lang.String polyglot java import java.lang.StringBuilder as Java_String_Builder diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index 47d8ac2ddf6b..718e99d46cf7 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -8,7 +8,7 @@ polyglot java import java.lang.Long as JLong polyglot java import java.lang.Exception as JException polyglot java import java.io.IOException polyglot java import java.util.ArrayList -polyglot java import java.util.Java_Random +polyglot java import java.util.Random as Java_Random polyglot java import java.util.Locale as JavaLocale from Standard.Test import Test, Test_Suite From c0611ac6e23219b808bf4eee8403dab405d2326a Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 7 Jun 2023 16:57:32 +0200 Subject: [PATCH 24/52] Remove some duplicate imports --- test/Tests/src/Data/Text/Parse_Spec.enso | 3 +-- test/Tests/src/Data/Text_Spec.enso | 2 -- test/Tests/src/Random_Spec.enso | 2 -- test/Visualization_Tests/src/Helpers_Spec.enso | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index dbd8abac0f2c..98ed0285f527 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -1,12 +1,11 @@ from Standard.Base import all -import Standard.Base.Data.Text.Text_Extensions import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error import Standard.Test.Test_Extensions from Standard.Base.Data.Json import Invalid_JSON -from Standard.Base.Data.Numbers import Decimal, Integer, Number_Parse_Error +from Standard.Base.Data.Numbers import Number_Parse_Error from Standard.Test import Test, Test_Suite spec = diff --git a/test/Tests/src/Data/Text_Spec.enso b/test/Tests/src/Data/Text_Spec.enso index 83209ff79de6..d6500cf3cd3d 100644 --- a/test/Tests/src/Data/Text_Spec.enso +++ b/test/Tests/src/Data/Text_Spec.enso @@ -7,14 +7,12 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument -import Standard.Base.IO from Standard.Base.Data.Text.Text_Sub_Range.Text_Sub_Range import all from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import all from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions -import Standard.Base.Data.Text.Text_Extensions type Auto Value a diff --git a/test/Tests/src/Random_Spec.enso b/test/Tests/src/Random_Spec.enso index 593f023f3e36..186762f4c8f1 100644 --- a/test/Tests/src/Random_Spec.enso +++ b/test/Tests/src/Random_Spec.enso @@ -1,8 +1,6 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument -import Standard.Base.Random - from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions diff --git a/test/Visualization_Tests/src/Helpers_Spec.enso b/test/Visualization_Tests/src/Helpers_Spec.enso index ce5b59fc2cc6..a51b1da7bc63 100644 --- a/test/Visualization_Tests/src/Helpers_Spec.enso +++ b/test/Visualization_Tests/src/Helpers_Spec.enso @@ -7,7 +7,7 @@ import Standard.Visualization.Helpers from Standard.Test import Test, Test_Suite import Standard.Test.Test_Extensions -import project.Helpers +from project.Helpers import all polyglot java import java.util.LinkedHashSet From e377f17da8cbe667d08897381f8e0eac8a8a2d2b Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 7 Jun 2023 17:30:59 +0200 Subject: [PATCH 25/52] fmt --- .../org/enso/interpreter/runtime/Module.java | 10 +- .../scala/org/enso/compiler/core/IR.scala | 17 +- .../analyse/AmbiguousImportsAnalysis.scala | 173 +++++++++--------- .../org/enso/compiler/test/PassesTest.scala | 7 +- .../test/semantic/ImportExportTest.scala | 4 +- 5 files changed, 108 insertions(+), 103 deletions(-) diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java index bc01537fe55a..f278f0a04ec6 100644 --- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java +++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/Module.java @@ -102,11 +102,11 @@ public boolean isBefore(CompilationStage stage) { private boolean hasCrossModuleLinks; private final boolean synthetic; /** - * This list is filled in case there is a directory with the same name as this module. - * The directory then contains submodules of this module that should be directly - * accessible from this module - achieved by both filling in this list, and inserting - * synthetic imports and exports into this module - See - * {@link org.enso.compiler.Compiler#injectSyntheticModuleExports(IR.Module, List)}. + * This list is filled in case there is a directory with the same name as this module. The + * directory then contains submodules of this module that should be directly accessible from this + * module - achieved by both filling in this list, and inserting synthetic imports and exports + * into this module - See {@link + * org.enso.compiler.Compiler#injectSyntheticModuleExports(IR.Module, List)}. */ private List directModulesRefs; diff --git a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala index 5cc7401a03da..0dd4f2e1ba3f 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/core/IR.scala @@ -8849,15 +8849,14 @@ object IR { s"No such constructor ${constructorName} in type $typeName" } - /** - * Represents an ambiguous import resolution error, where the same symbol is imported more than once refereing - * to different objects. The objects are represented by their physical path in the project. - * @param originalImport the original import statement. - * @param originalSymbolPath the original symbol path. - * @param symbolName the symbol name that is ambiguous. - * @param symbolPath the symbol path that is different than [[originalSymbolPath]]. - * @param source Location of the original import. - */ + /** Represents an ambiguous import resolution error, where the same symbol is imported more than once refereing + * to different objects. The objects are represented by their physical path in the project. + * @param originalImport the original import statement. + * @param originalSymbolPath the original symbol path. + * @param symbolName the symbol name that is ambiguous. + * @param symbolPath the symbol path that is different than [[originalSymbolPath]]. + * @param source Location of the original import. + */ case class AmbiguousImport( originalImport: IR.Module.Scope.Import, originalSymbolPath: String, diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 206b162b09b7..b5f8b6722309 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -9,15 +9,15 @@ import org.enso.compiler.data.BindingsMap import org.enso.compiler.exception.CompilerError import org.enso.compiler.pass.IRPass -import scala.annotation.unused import scala.collection.mutable import scala.collection.mutable.ListBuffer -/** A pass that checks for ambiguous and duplicated symbols from imports. For every encountered +/** A pass that checks for ambiguous and duplicated symbols from imports. * A duplicated import is an import of a symbol that has already been imported and refers to the - * same object. On the other hand, an ambiguous import is an import of a symbol that has already + * same object (entity). On the other hand, an ambiguous import is an import of a symbol that has already * been imported but refers to a different object. For every duplicated import, a warning is attached * to the IR, and for every ambiguous import, the IR is replaced with an error. + * To identify an object, this pass uses physical path of the object instead of the object itself. * * One import IR can be replaced with multiple error IRs. This is the case for `from ... import ...` * import statements. @@ -27,7 +27,7 @@ import scala.collection.mutable.ListBuffer * * Also iterates polyglot imports. * - * All synthetic imports and synthetic modules are ignored by this pass. + * All synthetic imports and exports, as well as synthetic modules are ignored by this pass. * * Thi pass does not alter any metadata. */ @@ -71,9 +71,12 @@ case object AmbiguousImportsAnalysis extends IRPass { ) val encounteredSymbols = new EncounteredSymbols() ir.copy( - imports = ir.imports.flatMap( imp => { + imports = ir.imports.flatMap(imp => { analyseAmbiguousSymbols( - imp, module, bindingMap, encounteredSymbols + imp, + module, + bindingMap, + encounteredSymbols ) match { case Left(errors) => errors @@ -84,14 +87,13 @@ case object AmbiguousImportsAnalysis extends IRPass { } } - /** - * Analyses ambiguous symbols in the given import. - * @param imp current import - * @param module current module - * @param bindingMap binding map of the current module - * @return A list of errors, if any encountered, or an import IR, potentially with some - * warnings attached. - */ + /** Analyses ambiguous symbols in the given import. + * @param imp current import + * @param module current module + * @param bindingMap binding map of the current module + * @return A list of errors, if any encountered, or an import IR, potentially with some + * warnings attached. + */ private def analyseAmbiguousSymbols( imp: IR.Module.Scope.Import, module: Module, @@ -113,30 +115,32 @@ case object AmbiguousImportsAnalysis extends IRPass { ) => getImportTarget(moduleImport, bindingMap) match { case Some(importTarget) => - val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() + val encounteredErrors: ListBuffer[IR.Error.ImportExport] = + ListBuffer() val imp = - onlyNames.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbol) => - val symbolName = symbol.name - importTarget.resolveExportedSymbol(symbolName) match { - case Right(resolvedName) => - val symbolPath = resolvedName.qualifiedName.toString - tryAddEncounteredSymbol( - module, - encounteredSymbols, - imp, - symbolName, - symbolPath - ) match { - case Left(error) => - encounteredErrors += error - imp - case Right(imp) => imp - } - case Left(resolutionError) => - throw new CompilerError( - s"Unreachable: (should have been resolved in previous passes) $resolutionError" - ) - } + onlyNames.foldLeft(moduleImport: IR.Module.Scope.Import) { + case (imp, symbol) => + val symbolName = symbol.name + importTarget.resolveExportedSymbol(symbolName) match { + case Right(resolvedName) => + val symbolPath = resolvedName.qualifiedName.toString + tryAddEncounteredSymbol( + module, + encounteredSymbols, + imp, + symbolName, + symbolPath + ) match { + case Left(error) => + encounteredErrors += error + imp + case Right(imp) => imp + } + case Left(resolutionError) => + throw new CompilerError( + s"Unreachable: (should have been resolved in previous passes) $resolutionError" + ) + } } if (encounteredErrors.nonEmpty) { Left(encounteredErrors.toList) @@ -173,27 +177,29 @@ case object AmbiguousImportsAnalysis extends IRPass { } val encounteredErrors: ListBuffer[IR.Error.ImportExport] = ListBuffer() - val imp = symbolsToIterate.foldLeft(moduleImport: IR.Module.Scope.Import) { case (imp, symbolName) => - importTarget.resolveExportedSymbol(symbolName) match { - case Left(resolutionError) => - throw new CompilerError( - s"Unreachable: (should have been resolved in previous passes) $resolutionError" - ) - case Right(resolvedName) => - tryAddEncounteredSymbol( - module, - encounteredSymbols, - imp, - symbolName, - resolvedName.qualifiedName.toString - ) match { - case Left(error) => - encounteredErrors += error - imp - case Right(imp) => imp + val imp = + symbolsToIterate.foldLeft(moduleImport: IR.Module.Scope.Import) { + case (imp, symbolName) => + importTarget.resolveExportedSymbol(symbolName) match { + case Left(resolutionError) => + throw new CompilerError( + s"Unreachable: (should have been resolved in previous passes) $resolutionError" + ) + case Right(resolvedName) => + tryAddEncounteredSymbol( + module, + encounteredSymbols, + imp, + symbolName, + resolvedName.qualifiedName.toString + ) match { + case Left(error) => + encounteredErrors += error + imp + case Right(imp) => imp + } } } - } if (encounteredErrors.nonEmpty) { Left(encounteredErrors.toList) } else { @@ -247,7 +253,7 @@ case object AmbiguousImportsAnalysis extends IRPass { importPath.parts.last.name, importPath.name ) match { - case Left(err) => Left(List(err)) + case Left(err) => Left(List(err)) case Right(imp) => Right(imp) } @@ -268,7 +274,7 @@ case object AmbiguousImportsAnalysis extends IRPass { symbolName, symbolPath ) match { - case Left(err) => Left(List(err)) + case Left(err) => Left(List(err)) case Right(imp) => Right(imp) } @@ -289,15 +295,14 @@ case object AmbiguousImportsAnalysis extends IRPass { } /** Tries to add the encountered symbol to the encountered symbols map. If it is already contained - * in the map, checks whether the underlying resolved name is the same as the original resolved name. - * Based on that, either attaches a warning for a duplicated import, or returns an IR. - * - * Does not handle polyglot imports. + * in the map, checks whether the underlying entity path is the same as the original entity path. + * Based on that, either attaches a warning for a duplicated import, or returns an [[IR.Error.ImportExport]]. * * @param module Current module * @param encounteredSymbols Encountered symbols in the current module * @param currentImport Currently iterated import * @param symbolName Name of the symbol that is about to be processed + * @param symbolPath physical path of the symbol that is about to be processed * @return */ private def tryAddEncounteredSymbol( @@ -309,11 +314,10 @@ case object AmbiguousImportsAnalysis extends IRPass { ): Either[IR.Error.ImportExport, IR.Module.Scope.Import] = { if (encounteredSymbols.containsSymbol(symbolName)) { val encounteredFullName = - encounteredSymbols.getFullNameForSymbol(symbolName) + encounteredSymbols.getPathForSymbol(symbolName) val originalImport = encounteredSymbols.getOriginalImportForSymbol(symbolName).get if (symbolPath == encounteredFullName) { - // Duplicate warning val warn = createWarningForDuplicatedImport( module, @@ -323,15 +327,16 @@ case object AmbiguousImportsAnalysis extends IRPass { ) Right(currentImport.addDiagnostic(warn)) } else { - // Ambiguous error - Left(createErrorForAmbiguousImport( - module, - originalImport, - encounteredFullName, - currentImport, - symbolName, - symbolPath - )) + Left( + createErrorForAmbiguousImport( + module, + originalImport, + encounteredFullName, + currentImport, + symbolName, + symbolPath + ) + ) } } else { encounteredSymbols.addSymbol(currentImport, symbolName, symbolPath) @@ -374,11 +379,11 @@ case object AmbiguousImportsAnalysis extends IRPass { } /** For every encountered symbol name, we keep track of the original import from which it was imported, - * along with the resolved name (if any). For example, for symbols imported via `polyglot java import`, - * there is no resolved name. + * along with the entity path. The entity path is vital to decide whether an imported symbol is duplicated + * or ambiguous. */ private class EncounteredSymbols( - val encounteredSymbols: mutable.Map[ + private val encounteredSymbols: mutable.Map[ String, (IR.Module.Scope.Import, String) ] = mutable.HashMap.empty @@ -393,12 +398,14 @@ case object AmbiguousImportsAnalysis extends IRPass { def addSymbol( imp: IR.Module.Scope.Import, symbol: String, - fullName: String + symbolPath: String ): Unit = { - encounteredSymbols.put(symbol, (imp, fullName)) + encounteredSymbols.put(symbol, (imp, symbolPath)) } - def getFullNameForSymbol( + /** Returns the entity path for the symbol. + */ + def getPathForSymbol( symbol: String ): String = { encounteredSymbols.get(symbol) match { @@ -419,13 +426,5 @@ case object AmbiguousImportsAnalysis extends IRPass { case None => None } } - - @unused - def debugPrint(title: String): Unit = { - println(s"Encountered symbols ($title):") - encounteredSymbols.foreach { case (symbol, (imp, fullName)) => - println(s" $symbol -> (import=`${imp.showCode()}`, path='$fullName')") - } - } } } diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala index a128cd29a40f..e1cf83984254 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/PassesTest.scala @@ -4,7 +4,12 @@ import org.enso.compiler.Passes import org.enso.compiler.context.{InlineContext, ModuleContext} import org.enso.compiler.core.IR import org.enso.compiler.pass.IRPass -import org.enso.compiler.pass.analyse.{AliasAnalysis, AmbiguousImportsAnalysis, BindingAnalysis, ImportSymbolAnalysis} +import org.enso.compiler.pass.analyse.{ + AliasAnalysis, + AmbiguousImportsAnalysis, + BindingAnalysis, + ImportSymbolAnalysis +} import org.enso.compiler.pass.desugar._ import org.enso.compiler.pass.lint.{ModuleNameConflicts, ShadowedPatternFields} import org.enso.compiler.pass.optimise.UnreachableMatchBranches diff --git a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala index b40bf25e41f2..fb2618c411dd 100644 --- a/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala +++ b/engine/runtime/src/test/scala/org/enso/compiler/test/semantic/ImportExportTest.scala @@ -572,7 +572,9 @@ class ImportExportTest .createModule(packageQualifiedName.createChild("Main_Module")) .getIr mainIr.imports.size shouldEqual 2 - mainIr.imports.foreach(_.isInstanceOf[IR.Error.ImportExport] shouldEqual false) + mainIr.imports.foreach( + _.isInstanceOf[IR.Error.ImportExport] shouldEqual false + ) } "result in error when importing same type twice with two one-symbol import and renamed import" in { From 9f85a58eb8e6ecdd6c53a4ff0d2b097f24b97e91 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Thu, 8 Jun 2023 15:22:50 +0200 Subject: [PATCH 26/52] Fix Extensions module renames --- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso | 2 +- .../interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso index f3b291970a53..da3c2ac4a97d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso @@ -5,7 +5,7 @@ import project.Data.Numbers.Integer import project.Data.Ordering.Comparable import project.Data.Ordering.Ordering import project.Data.Vector.Vector -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Errors.Illegal_Argument.Illegal_Argument import project.Nothing.Nothing diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso index c5ebeff178bb..bd751a5f7da9 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso @@ -4,7 +4,7 @@ import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Range.Range_Extensions import project.Data.Range.Range -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Helpers import project.Data.Text.Span.Span import project.Data.Text.Span.Utf_16_Span diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso index f33dbdbfb700..2c99d9d7b458 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso @@ -3,7 +3,7 @@ import project.Data.Boolean.Boolean import project.Data.Json.JS_Object import project.Data.Numbers.Number import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +import project.Data.Text.Text_Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java b/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java index 10eb026eb964..ffd29b1c0cbb 100644 --- a/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java +++ b/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java @@ -70,7 +70,7 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception { var benchmarkName = SrcUtil.findName(params); var codeBuilder = new StringBuilder(""" - import Standard.Base.Data.Range.Extensions + import Standard.Base.Data.Range.Range_Extensions type Node C1 f1 From 836b1b33c74a8e2177fd23d4d0817c9cb39fd776 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Thu, 8 Jun 2023 17:52:59 +0200 Subject: [PATCH 27/52] Fix more ambiguous imports --- test/Benchmarks/src/Collections.enso | 4 ++-- test/Benchmarks/src/Equality.enso | 1 - test/Benchmarks/src/Table/Aggregate.enso | 2 +- test/Benchmarks/src/Time/Work_Days.enso | 2 -- test/Benchmarks/src/Vector/Distinct.enso | 1 - test/Benchmarks/src/Vector/Operations.enso | 4 ++-- test/Benchmarks/src/Vector/Sort.enso | 4 ++-- test/Benchmarks/src/Vector/Utils.enso | 4 ++-- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/test/Benchmarks/src/Collections.enso b/test/Benchmarks/src/Collections.enso index 9a343eaa0cca..a23dcbf4929e 100644 --- a/test/Benchmarks/src/Collections.enso +++ b/test/Benchmarks/src/Collections.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Test import Bench -polyglot java import java.util.Random +polyglot java import java.util.Random as Java_Random gen_list len = 0.up_to len . fold List.Nil (l -> i -> List.Cons i+1 l) @@ -19,7 +19,7 @@ sum_list_meta list = sum_recur n = if n == 0 then 0 else 1 + sum_recur n-1 build_map size = - rand = Random.new + rand = Java_Random.new 0.up_to size . fold Map.empty (m -> i -> m.insert (rand.nextInt 10000) i) bench = diff --git a/test/Benchmarks/src/Equality.enso b/test/Benchmarks/src/Equality.enso index 80ddee820b51..1cb4f9f4ded3 100644 --- a/test/Benchmarks/src/Equality.enso +++ b/test/Benchmarks/src/Equality.enso @@ -3,7 +3,6 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Bench -polyglot java import java.util.Random polyglot java import org.graalvm.collections.Pair as Graal_Pair type Uniform_Type diff --git a/test/Benchmarks/src/Table/Aggregate.enso b/test/Benchmarks/src/Table/Aggregate.enso index 745433943ec5..f3b7252747e4 100644 --- a/test/Benchmarks/src/Table/Aggregate.enso +++ b/test/Benchmarks/src/Table/Aggregate.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Table import Table -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last from Standard.Test import Bench, Faker diff --git a/test/Benchmarks/src/Time/Work_Days.enso b/test/Benchmarks/src/Time/Work_Days.enso index 84f4c5a8d5dd..a5af20483d0c 100644 --- a/test/Benchmarks/src/Time/Work_Days.enso +++ b/test/Benchmarks/src/Time/Work_Days.enso @@ -2,8 +2,6 @@ from Standard.Base import all from Standard.Test import Bench -polyglot java import java.util.Random - bench = iter_size = 50 num_iterations = 10 diff --git a/test/Benchmarks/src/Vector/Distinct.enso b/test/Benchmarks/src/Vector/Distinct.enso index dcc91f8dfdee..0fc5a4e91c87 100644 --- a/test/Benchmarks/src/Vector/Distinct.enso +++ b/test/Benchmarks/src/Vector/Distinct.enso @@ -5,7 +5,6 @@ from Standard.Test import Bench import project.Vector.Utils -polyglot java import java.util.Random polyglot java import org.enso.base.Time_Utils diff --git a/test/Benchmarks/src/Vector/Operations.enso b/test/Benchmarks/src/Vector/Operations.enso index 4c428c621d55..bfe31103f89c 100644 --- a/test/Benchmarks/src/Vector/Operations.enso +++ b/test/Benchmarks/src/Vector/Operations.enso @@ -6,7 +6,7 @@ from Standard.Test import Bench import project.Vector.Utils -polyglot java import java.util.Random +polyglot java import java.util.Random as Java_Random ## Bench Utilities ============================================================ @@ -19,7 +19,7 @@ num_iterations = 10 bench = random_vec = Utils.make_random_vec vector_size random_vec_2 = Utils.make_random_vec 100000 - random_gen = Random.new 123456 + random_gen = Java_Random.new 123456 Bench.measure (Base.Vector.new vector_size i->i) "New Vector" iter_size num_iterations Bench.measure (Base.Vector.new vector_size _->42) "New Constant" iter_size num_iterations diff --git a/test/Benchmarks/src/Vector/Sort.enso b/test/Benchmarks/src/Vector/Sort.enso index 3c7795015e52..7c61314d04d8 100644 --- a/test/Benchmarks/src/Vector/Sort.enso +++ b/test/Benchmarks/src/Vector/Sort.enso @@ -5,7 +5,7 @@ from Standard.Test import Bench import project.Vector.Utils -polyglot java import java.util.Random +polyglot java import java.util.Random as Java_Random polyglot java import org.enso.base.Time_Utils @@ -21,7 +21,7 @@ make_sorted_ascending_vec n = 0.up_to n+1 . to_vector make_partially_sorted_vec : Integer -> Vector make_partially_sorted_vec n = - random_gen = Random.new n + random_gen = Java_Random.new n direction = Ref.new Sort_Direction.Ascending last_num = Ref.new 0 run_length = Ref.new 0 diff --git a/test/Benchmarks/src/Vector/Utils.enso b/test/Benchmarks/src/Vector/Utils.enso index 2cadbdba633d..9e13a53bac0b 100644 --- a/test/Benchmarks/src/Vector/Utils.enso +++ b/test/Benchmarks/src/Vector/Utils.enso @@ -1,8 +1,8 @@ from Standard.Base import all -polyglot java import java.util.Random +polyglot java import java.util.Random as Java_Random make_random_vec : Integer -> Vector make_random_vec n = - random_gen = Random.new n + random_gen = Java_Random.new n Vector.fill n random_gen.nextLong From d4da61c3328d0835330a0a5a738e507e64c26f38 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Thu, 8 Jun 2023 17:53:07 +0200 Subject: [PATCH 28/52] Remove a Vector duplicate import --- test/Benchmarks/src/Vector/Array_Proxy_Bench.enso | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Benchmarks/src/Vector/Array_Proxy_Bench.enso b/test/Benchmarks/src/Vector/Array_Proxy_Bench.enso index 7174fe195236..80bfdbebae05 100644 --- a/test/Benchmarks/src/Vector/Array_Proxy_Bench.enso +++ b/test/Benchmarks/src/Vector/Array_Proxy_Bench.enso @@ -2,7 +2,6 @@ from Standard.Base import all from Standard.Test import Bench -import Standard.Base.Data.Vector.Vector import Standard.Base.Data.Array_Proxy.Array_Proxy sum arr = From 1ae1414048a152ba456374d5fc3821a867354d83 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:16:09 +0200 Subject: [PATCH 29/52] Revert "Rename Extension.enso files" This reverts commit 08efa41d993f17c40a343af18eae105d40a94ae8. --- .../lib/Standard/Base/0.0.0-dev/src/Any.enso | 2 +- .../Base/0.0.0-dev/src/Data/Array.enso | 2 +- .../0.0.0-dev/src/Data/Filter_Condition.enso | 2 +- .../0.0.0-dev/src/Data/Index_Sub_Range.enso | 2 +- .../Base/0.0.0-dev/src/Data/Json.enso | 6 +-- .../{Json_Extensions.enso => Extensions.enso} | 4 +- .../Base/0.0.0-dev/src/Data/Locale.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Data/Map.enso | 2 +- .../Base/0.0.0-dev/src/Data/Pair.enso | 2 +- ...{Range_Extensions.enso => Extensions.enso} | 0 .../Base/0.0.0-dev/src/Data/Statistics.enso | 2 +- .../{Text_Extensions.enso => Extensions.enso} | 42 +++++++++---------- .../0.0.0-dev/src/Data/Text/Regex/Match.enso | 2 +- .../src/Data/Text/Regex/Pattern.enso | 2 +- .../src/Data/Text/Regex/Replacer.enso | 2 +- .../Base/0.0.0-dev/src/Data/Text/Span.enso | 2 +- .../src/Data/Text/Text_Sub_Range.enso | 2 +- .../0.0.0-dev/src/Data/Time/Date_Range.enso | 2 +- .../0.0.0-dev/src/Data/Time/Duration.enso | 2 +- .../Base/0.0.0-dev/src/Data/Time/Period.enso | 2 +- .../Base/0.0.0-dev/src/Data/Vector.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Main.enso | 16 +++---- ...etwork_Extensions.enso => Extensions.enso} | 2 +- .../0.0.0-dev/src/Network/HTTP/Request.enso | 2 +- .../src/Network/HTTP/Response_Body.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Runtime.enso | 2 +- .../Base/0.0.0-dev/src/System/File.enso | 5 +-- .../src/System/File/Write_Extensions.enso | 2 +- .../0.0.0-dev/src/System/File_Format.enso | 2 +- 29 files changed, 58 insertions(+), 61 deletions(-) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/{Json_Extensions.enso => Extensions.enso} (98%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/{Range_Extensions.enso => Extensions.enso} (100%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/{Text_Extensions.enso => Extensions.enso} (98%) rename distribution/lib/Standard/Base/0.0.0-dev/src/Network/{Network_Extensions.enso => Extensions.enso} (86%) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso index 04d7ff88ce23..d3f91886b890 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso @@ -1,5 +1,5 @@ import project.Data.Pair.Pair -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso index 42482cb2aaf7..490b6d43d027 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso @@ -5,7 +5,7 @@ import project.Data.List.List import project.Data.Ordering.Ordering import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso index 9c7088c63611..ec4aaaa17c4e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso @@ -1,6 +1,6 @@ import project.Any.Any import project.Data.Text.Case_Sensitivity.Case_Sensitivity -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Regex import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso index a75de5e76997..0f0c4ef4a78b 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Range.Range -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso index 5774ac2c9f95..6e618f35fed5 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso @@ -1,13 +1,13 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Array_Proxy.Array_Proxy -import project.Data.Json.Json_Extensions +import project.Data.Json.Extensions import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Pair.Pair -import project.Data.Range.Range_Extensions -import project.Data.Text.Text_Extensions +import project.Data.Range.Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Type_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso similarity index 98% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso index f46fd771b0fc..f175cb8e94c4 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Json_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso @@ -8,8 +8,8 @@ import project.Data.Map.Map import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Numbers.Number -import project.Data.Range.Range_Extensions -import project.Data.Text.Text_Extensions +import project.Data.Range.Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Text.Text_Sub_Range.Text_Sub_Range import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso index 9c0f0c5925aa..a16b9317bb27 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Text.Case.Case -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Metadata.Display diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso index 854c7579b495..08338b088d44 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Vector.Vector import project.Data.Pair.Pair -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Error.Error import project.Errors.Illegal_Argument.Illegal_Argument diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso index 9d95d82d4cb1..bb0bc630d22d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Boolean.Boolean import project.Data.Numbers.Integer import project.Data.Text.Text -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds import project.Errors.Common.Not_Found diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Range_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Extensions.enso similarity index 100% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Range_Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range/Extensions.enso diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso index b1bdcbc65c0a..58f1fc1fbd83 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso @@ -5,7 +5,7 @@ import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Ordering.Ordering import project.Data.Ordering.Comparable -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Vector.Vector import project.Errors.Common.Incomparable_Values import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso similarity index 98% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso index 4434439c28c8..8ad546fe6a53 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso @@ -4,7 +4,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Locale.Locale -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity @@ -1457,14 +1457,14 @@ Text.parse_json self = Json.parse self > Example Parse the date of 23rd December 2020. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-12-23".parse_date > Example Recover from an error due to a wrong format. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = "my birthday".parse_date . catch Time_Error _-> @@ -1473,14 +1473,14 @@ Text.parse_json self = Json.parse self > Example Parse "1999-1-1" as Date using a custom format. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "1999-1-1".parse_date "yyyy-M-d" > Example Recover from the parse error. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = @@ -1525,49 +1525,49 @@ Text.parse_date self format=Nothing = Date.parse self format > Example Parse UTC time. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12Z".parse_date_time > Example Parse UTC-04:00 time. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12-04:00".parse_date_time > Example Parse UTC-04:00 time specifying New York timezone. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12-04:00[America/New_York]".parse_date_time > Example Parse UTC-04:00 time with nanoseconds. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12.177528-04:00".parse_date_time > Example Recover from the parse error. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01".parse_date_time . catch Time_Error (_->Date_Time.now) > Example Parse "2020-05-06 04:30:20" as Date_Time - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "2020-05-06 04:30:20".parse_date_time "yyyy-MM-dd HH:mm:ss" > Example Parse "06 of May 2020 at 04:30AM" as Date_Tme - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "06 of May 2020 at 04:30AM".parse_date_time "dd 'of' MMMM yyyy 'at' hh:mma" @@ -1614,14 +1614,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Get the time 15:05:30. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "15:05:30".parse_time_of_day > Example Recover from the parse error. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse = "half twelve".parse_time_of_day . catch Time_Error _-> @@ -1630,14 +1630,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Parse "04:30:20" as Time_Of_Day. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "04:30:20".parse_time_of_day "HH:mm:ss" > Example Parse "4:30AM" as Time_Of_Day - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "4:30AM".parse_time_of_day "h:mma" @locale Locale.default_widget @@ -1651,28 +1651,28 @@ Text.parse_time_of_day self format=Nothing locale=Locale.default = Time_Of_Day.p > Example Get Central European Time. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "CET".parse_time_zone > Example Get Moscow time. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "Europe/Moscow".parse_time_zone > Example Get time zone -06:00. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "-06:00".parse_time_zone > Example Get custom offset +03:02:01 of 3 hours 2 minutes an 1 second. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "+03:02:01".parse_time_zone Text.parse_time_zone : Time_Zone ! Time_Error @@ -1687,7 +1687,7 @@ Text.parse_time_zone self = Time_Zone.parse self > Example Parse URI text. - import Standard.Base.Data.Text.Text_Extensions + import Standard.Base.Data.Text.Extensions example_parse = "http://example.com".parse_uri Text.parse_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso index 3ab7d36d3798..a58622fbda81 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Regex.No_Such_Group import project.Data.Text.Regex.Pattern.Pattern diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso index bd751a5f7da9..b5a828d9fa77 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Text_Extensions import project.Data.Text.Helpers diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso index 1e2406910a9a..52ec26d15f59 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso @@ -1,5 +1,5 @@ import project.Data.Numbers.Integer -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Regex import project.Data.Text.Regex.Match.Match import project.Data.Text.Regex.No_Such_Group diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso index 5b26a7892d0e..99b0059a0da3 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso @@ -11,7 +11,7 @@ import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso index 44b8e6c580dc..3b326c5a107f 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso index 703708f22a16..c548855796d7 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso @@ -3,7 +3,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Range.Empty_Error -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Date_Period.Date_Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso index ae9d901c93c9..062e81cc3842 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso @@ -4,7 +4,7 @@ import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Ordering.Comparable import project.Data.Pair.Pair -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Time.Date_Time.Date_Time import project.Data.Time.Period.Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso index b742ac57b2eb..2d4c3dd8fc27 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Ordering.Comparable -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Duration.Duration diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso index 87186817876a..d88a56ecacd3 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso @@ -6,7 +6,7 @@ import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Text.Text import project.Errors.Common.Incomparable_Values import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index e30551239431..5633b1bf3190 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -74,7 +74,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Interval.Bound import project.Data.Interval.Interval -import project.Data.Json.Json_Extensions +import project.Data.Json.Extensions import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Locale.Locale @@ -87,13 +87,13 @@ import project.Data.Ordering.Default_Comparator import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Range_Extensions +import project.Data.Range.Extensions import project.Data.Regression import project.Data.Statistics import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Line_Ending_Style.Line_Ending_Style import project.Data.Text.Location.Location import project.Data.Text.Matching_Mode.Matching_Mode @@ -112,7 +112,7 @@ import project.Data.Time.Time_Of_Day.Time_Of_Day import project.Data.Time.Time_Period.Time_Period import project.Data.Time.Time_Zone.Time_Zone import project.Errors.Problem_Behavior.Problem_Behavior -import project.Network.Network_Extensions +import project.Network.Extensions import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP import project.Network.HTTP.HTTP_Method.HTTP_Method @@ -126,7 +126,7 @@ export project.Data.Filter_Condition.Filter_Condition export project.Data.Index_Sub_Range.Index_Sub_Range export project.Data.Interval.Bound export project.Data.Interval.Interval -export project.Data.Json.Json_Extensions +export project.Data.Json.Extensions export project.Data.Json.Json export project.Data.Json.JS_Object export project.Data.Locale.Locale @@ -138,12 +138,12 @@ export project.Data.Ordering.Default_Comparator export project.Data.Ordering.Sort_Direction.Sort_Direction export project.Data.Pair.Pair export project.Data.Range.Range -export project.Data.Range.Range_Extensions +export project.Data.Range.Extensions export project.Data.Regression export project.Data.Text.Case.Case export project.Data.Text.Case_Sensitivity.Case_Sensitivity export project.Data.Text.Encoding.Encoding -export project.Data.Text.Text_Extensions +export project.Data.Text.Extensions export project.Data.Text.Line_Ending_Style.Line_Ending_Style export project.Data.Text.Location.Location export project.Data.Text.Matching_Mode.Matching_Mode @@ -162,7 +162,7 @@ export project.Data.Time.Time_Of_Day.Time_Of_Day export project.Data.Time.Time_Period.Time_Period export project.Data.Time.Time_Zone.Time_Zone export project.Errors.Problem_Behavior.Problem_Behavior -export project.Network.Network_Extensions +export project.Network.Extensions export project.Network.HTTP.Header.Header export project.Network.HTTP.HTTP export project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso similarity index 86% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso index a0794dfb7f22..d6313e24907a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Network_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso @@ -9,7 +9,7 @@ import project.Errors.Common.Syntax_Error > Example Parse URI text. - import Standard.Base.Network.Network_Extensions + import Standard.Base.Network.URI.Extensions example_parse = "http://example.com".to_uri Text.to_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso index d2ae712902c4..553132d0b4fe 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Pair.Pair import project.Data.Text.Text import project.Data.Vector.Vector -import project.Network.Network_Extensions +import project.Network.Extensions import project.Network.HTTP.Form.Form import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso index e23f754ab2c4..2059040fbc87 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso @@ -3,7 +3,7 @@ import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Numbers.Number import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Nothing.Nothing diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso index d2a9cfeb4698..28af61468c6e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Boolean.Boolean import project.Data.Text.Case.Case -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Forbidden_Operation diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index 54480e348f1a..8b7423f30d29 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -68,10 +68,7 @@ type File if self.exists && copy_original then Context.Output.with_enabled <| self.copy_to temp replace_existing=True - - ## Attach a warning to the file that it is a dry run - warning = Dry_Run_Operation.Warning "Only a dry run has occurred, with data written to a temporary file." - Warning.attach warning temp + temp ## ALIAS Current Directory diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso index 5adf0cea3860..14b09fbcd359 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso @@ -1,6 +1,6 @@ import project.Data.Text.Text import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Vector.Vector import project.Error.Error import project.Errors.Common.Unsupported_Argument_Types diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso index 6a93431291dc..1abaef3b9c60 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Json.Json import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error From e8810d687c5ac5ff9dec934415b042b115841654 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:18:41 +0200 Subject: [PATCH 30/52] Revert Extensions module renaming --- .../lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso | 2 +- distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso | 2 +- .../Base/0.0.0-dev/src/System/File/Write_Extensions.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso | 2 +- .../lib/Standard/Visualization/0.0.0-dev/src/Table.enso | 2 +- distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso index ec4aaaa17c4e..c7b36c0708c1 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Filter_Condition.enso @@ -1,6 +1,6 @@ import project.Any.Any import project.Data.Text.Case_Sensitivity.Case_Sensitivity -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Regex import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso index 6e618f35fed5..82047d612551 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso @@ -7,7 +7,7 @@ import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Pair.Pair import project.Data.Range.Extensions -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Type_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso index f175cb8e94c4..5644a1cd3346 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso @@ -9,7 +9,7 @@ import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Range.Extensions -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Text.Text_Sub_Range.Text_Sub_Range import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso index a16b9317bb27..ec5d96dd3a33 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Locale.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Text.Case.Case -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Metadata.Display diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso index 08338b088d44..f7359651211c 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Map.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Vector.Vector import project.Data.Pair.Pair -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Error.Error import project.Errors.Illegal_Argument.Illegal_Argument diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso index bb0bc630d22d..23ac4bb4daf3 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Pair.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Boolean.Boolean import project.Data.Numbers.Integer import project.Data.Text.Text -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds import project.Errors.Common.Not_Found diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso index 52ec26d15f59..1f062fa06fd2 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Replacer.enso @@ -1,5 +1,5 @@ import project.Data.Numbers.Integer -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Regex import project.Data.Text.Regex.Match.Match import project.Data.Text.Regex.No_Such_Group diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso index 062e81cc3842..a36a75939a47 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Duration.enso @@ -4,7 +4,7 @@ import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Ordering.Comparable import project.Data.Pair.Pair -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Time.Date_Time.Date_Time import project.Data.Time.Period.Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso index 2d4c3dd8fc27..2dbff8cb3772 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Period.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Ordering.Comparable -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Duration.Duration diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index 5633b1bf3190..becd609b7837 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -93,7 +93,7 @@ import project.Data.Statistics import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Line_Ending_Style.Line_Ending_Style import project.Data.Text.Location.Location import project.Data.Text.Matching_Mode.Matching_Mode diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso index 2059040fbc87..6670a7b71ac5 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response_Body.enso @@ -3,7 +3,7 @@ import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Numbers.Number import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Nothing.Nothing diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso index 28af61468c6e..8c5506ed637d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Boolean.Boolean import project.Data.Text.Case.Case -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Forbidden_Operation diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso index 14b09fbcd359..99a79f89967c 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Write_Extensions.enso @@ -1,6 +1,6 @@ import project.Data.Text.Text import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Vector.Vector import project.Error.Error import project.Errors.Common.Unsupported_Argument_Types diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso index 1abaef3b9c60..e61a4827233a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File_Format.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Json.Json import project.Data.Text.Encoding.Encoding -import project.Data.Text.Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso index a22440980f99..978b65c00609 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso @@ -1,6 +1,6 @@ from Standard.Base import all -from Standard.Base.Data.Text.Text_Extensions import slice_text +from Standard.Base.Data.Text.Extensions import slice_text from Standard.Visualization.Text import get_chunk_from_line import Standard.Base.Errors.Common.Not_Found import Standard.Table as Table_Module diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso index 2a39ab05b137..c92203244f88 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso @@ -1,6 +1,6 @@ from Standard.Base import all -from Standard.Base.Data.Text.Text_Extensions import slice_text +from Standard.Base.Data.Text.Extensions import slice_text ## PRIVATE Message to be sent to the IDE. From 11358e5e3d7ae08b485aac42a941e40e2541048f Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:18:59 +0200 Subject: [PATCH 31/52] Remove duplicate import from a scala test --- .../org/enso/interpreter/test/instrument/BuiltinTypesTest.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala b/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala index 883f8481ec14..7f0ed86deb03 100644 --- a/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala +++ b/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala @@ -363,7 +363,6 @@ class BuiltinTypesTest val code = """from Standard.Base import all - |import Standard.Base.Data.Array.Array | |main = | Vector.from_array Array.empty From 2a9e19e16db15c8c4a7502d78e60e69872a431d1 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:19:04 +0200 Subject: [PATCH 32/52] typo --- .../enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index b5f8b6722309..4a1d0008f8af 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -29,7 +29,7 @@ import scala.collection.mutable.ListBuffer * * All synthetic imports and exports, as well as synthetic modules are ignored by this pass. * - * Thi pass does not alter any metadata. + * This pass does not alter any metadata. */ case object AmbiguousImportsAnalysis extends IRPass { From 4ce6c07ca81760777f102bcb1c18f1c3cc905762 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:21:57 +0200 Subject: [PATCH 33/52] Revert extensions module renaming --- .../lib/Standard/Base/0.0.0-dev/src/Any.enso | 2 +- .../Base/0.0.0-dev/src/Data/Array.enso | 2 +- .../0.0.0-dev/src/Data/Index_Sub_Range.enso | 2 +- .../Base/0.0.0-dev/src/Data/Json.enso | 4 +- .../0.0.0-dev/src/Data/Json/Extensions.enso | 2 +- .../Standard/Base/0.0.0-dev/src/Data/Set.enso | 2 +- .../Base/0.0.0-dev/src/Data/Statistics.enso | 2 +- .../0.0.0-dev/src/Data/Text/Extensions.enso | 42 +++++++++---------- .../0.0.0-dev/src/Data/Text/Regex/Match.enso | 2 +- .../src/Data/Text/Regex/Pattern.enso | 4 +- .../Base/0.0.0-dev/src/Data/Text/Span.enso | 2 +- .../src/Data/Text/Text_Sub_Range.enso | 2 +- .../0.0.0-dev/src/Data/Time/Date_Range.enso | 2 +- .../Base/0.0.0-dev/src/Data/Vector.enso | 2 +- .../lib/Standard/Base/0.0.0-dev/src/Main.enso | 14 +++---- .../0.0.0-dev/src/Network/Extensions.enso | 2 +- .../0.0.0-dev/src/Network/HTTP/Request.enso | 2 +- .../0.0.0-dev/src/Network/HTTP/Response.enso | 2 +- .../{Test_Extensions.enso => Extensions.enso} | 0 .../lib/Standard/Test/0.0.0-dev/src/Main.enso | 4 +- .../Standard/Test/0.0.0-dev/src/Problems.enso | 2 +- .../lib/Standard/Test/0.0.0-dev/src/Test.enso | 2 +- .../interpreter/test/semantic/TextTest.scala | 2 +- test/Examples_Tests/src/Examples_Spec.enso | 2 +- test/Geo_Tests/src/Geo_Spec.enso | 2 +- test/Image_Tests/src/Data/Image_Spec.enso | 2 +- test/Image_Tests/src/Data/Matrix_Spec.enso | 2 +- .../src/Image_Read_Write_Spec.enso | 2 +- .../data/fail_report/Main.enso | 2 +- .../data/with_clue_1/Main.enso | 2 +- .../data/with_clue_2/Main.enso | 2 +- test/Meta_Test_Suite_Tests/src/Main.enso | 2 +- .../Add_Row_Number_Spec.enso | 2 +- .../Aggregate_Spec.enso | 2 +- .../Column_Operations_Spec.enso | 2 +- .../Conversion_Spec.enso | 2 +- .../Common_Table_Operations/Core_Spec.enso | 2 +- .../Cross_Tab_Spec.enso | 2 +- .../Date_Time_Spec.enso | 2 +- .../Distinct_Spec.enso | 2 +- .../Expression_Spec.enso | 2 +- .../Common_Table_Operations/Filter_Spec.enso | 2 +- .../Integration_Tests.enso | 2 +- .../Join/Cross_Join_Spec.enso | 2 +- .../Join/Join_Spec.enso | 2 +- .../Join/Union_Spec.enso | 2 +- .../Join/Zip_Spec.enso | 2 +- .../Missing_Values_Spec.enso | 2 +- .../Order_By_Spec.enso | 2 +- .../Select_Columns_Spec.enso | 2 +- .../Take_Drop_Spec.enso | 2 +- .../Transpose_Spec.enso | 2 +- .../src/Common_Table_Operations/Util.enso | 2 +- .../src/Database/Codegen_Spec.enso | 2 +- .../Table_Tests/src/Database/Common_Spec.enso | 2 +- .../src/Database/Postgres_Spec.enso | 2 +- .../src/Database/Redshift_Spec.enso | 2 +- .../Table_Tests/src/Database/SQLite_Spec.enso | 2 +- .../Types/Postgres_Type_Mapping_Spec.enso | 2 +- .../Types/SQLite_Type_Mapping_Spec.enso | 2 +- .../Table_Tests/src/Database/Upload_Spec.enso | 2 +- .../src/Formatting/Data_Formatter_Spec.enso | 2 +- .../src/Formatting/Parse_Values_Spec.enso | 2 +- .../Helpers/Unique_Naming_Strategy_Spec.enso | 2 +- .../src/Helpers/Value_Type_Spec.enso | 2 +- test/Table_Tests/src/IO/Csv_Spec.enso | 2 +- .../src/IO/Delimited_Read_Spec.enso | 2 +- .../src/IO/Delimited_Write_Spec.enso | 2 +- test/Table_Tests/src/IO/Excel_Spec.enso | 2 +- test/Table_Tests/src/IO/Formats_Spec.enso | 2 +- test/Table_Tests/src/IO/Json_Spec.enso | 2 +- .../src/In_Memory/Aggregate_Column_Spec.enso | 2 +- .../src/In_Memory/Builders_Spec.enso | 2 +- .../src/In_Memory/Column_Format_Spec.enso | 2 +- .../src/In_Memory/Column_Spec.enso | 2 +- .../src/In_Memory/Join_Performance_Spec.enso | 2 +- .../src/In_Memory/Parse_To_Table_Spec.enso | 2 +- .../src/In_Memory/Split_Tokenize_Spec.enso | 2 +- .../src/In_Memory/Table_Date_Spec.enso | 2 +- .../src/In_Memory/Table_Date_Time_Spec.enso | 2 +- .../Table_Tests/src/In_Memory/Table_Spec.enso | 2 +- .../src/In_Memory/Table_Time_Of_Day_Spec.enso | 2 +- test/Table_Tests/src/Util.enso | 2 +- test/Tests/src/Data/Array_Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Array_Proxy_Spec.enso | 2 +- test/Tests/src/Data/Array_Spec.enso | 2 +- test/Tests/src/Data/Bool_Spec.enso | 2 +- test/Tests/src/Data/Function_Spec.enso | 2 +- test/Tests/src/Data/Interval_Spec.enso | 2 +- test/Tests/src/Data/Json_Spec.enso | 2 +- test/Tests/src/Data/List_Spec.enso | 2 +- test/Tests/src/Data/Locale_Spec.enso | 2 +- test/Tests/src/Data/Map_Spec.enso | 2 +- test/Tests/src/Data/Maybe_Spec.enso | 2 +- test/Tests/src/Data/Noise/Generator_Spec.enso | 2 +- test/Tests/src/Data/Noise_Spec.enso | 2 +- test/Tests/src/Data/Numbers_Spec.enso | 2 +- .../src/Data/Ordering/Comparator_Spec.enso | 2 +- .../src/Data/Ordering/Natural_Order_Spec.enso | 2 +- .../Vector_Lexicographic_Order_Spec.enso | 2 +- test/Tests/src/Data/Ordering_Spec.enso | 2 +- test/Tests/src/Data/Pair_Spec.enso | 2 +- test/Tests/src/Data/Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Problems_Spec.enso | 2 +- test/Tests/src/Data/Range_Spec.enso | 2 +- test/Tests/src/Data/Regression_Spec.enso | 2 +- test/Tests/src/Data/Set_Spec.enso | 2 +- test/Tests/src/Data/Statistics_Spec.enso | 2 +- test/Tests/src/Data/Text/Encoding_Spec.enso | 2 +- test/Tests/src/Data/Text/Parse_Spec.enso | 2 +- test/Tests/src/Data/Text/Regex_Spec.enso | 2 +- test/Tests/src/Data/Text/Span_Spec.enso | 2 +- .../src/Data/Text/Text_Sub_Range_Spec.enso | 2 +- test/Tests/src/Data/Text/Utils_Spec.enso | 2 +- test/Tests/src/Data/Text_Spec.enso | 4 +- test/Tests/src/Data/Time/Date_Part_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Range_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Spec.enso | 3 +- test/Tests/src/Data/Time/Date_Time_Spec.enso | 2 +- .../Tests/src/Data/Time/Day_Of_Week_Spec.enso | 2 +- test/Tests/src/Data/Time/Duration_Spec.enso | 2 +- test/Tests/src/Data/Time/Period_Spec.enso | 2 +- test/Tests/src/Data/Time/Spec.enso | 2 +- .../Tests/src/Data/Time/Time_Of_Day_Spec.enso | 2 +- test/Tests/src/Data/Time/Time_Zone_Spec.enso | 2 +- .../src/Data/Vector/Slicing_Helpers_Spec.enso | 2 +- test/Tests/src/Data/Vector_Spec.enso | 2 +- test/Tests/src/Main.enso | 2 +- test/Tests/src/Network/Http/Header_Spec.enso | 2 +- test/Tests/src/Network/Http/Request_Spec.enso | 2 +- test/Tests/src/Network/Http_Spec.enso | 2 +- test/Tests/src/Network/URI_Spec.enso | 2 +- test/Tests/src/Random_Spec.enso | 2 +- .../src/Runtime/Lazy_Generator_Spec.enso | 2 +- test/Tests/src/Runtime/Lazy_Spec.enso | 2 +- .../src/Runtime/Managed_Resource_Spec.enso | 2 +- test/Tests/src/Runtime/Ref_Spec.enso | 2 +- test/Tests/src/Runtime/Stack_Traces_Spec.enso | 2 +- test/Tests/src/Semantic/Any_Spec.enso | 2 +- test/Tests/src/Semantic/Case_Spec.enso | 2 +- test/Tests/src/Semantic/Conversion_Spec.enso | 2 +- test/Tests/src/Semantic/Deep_Export/Spec.enso | 2 +- .../Tests/src/Semantic/Default_Args_Spec.enso | 2 +- test/Tests/src/Semantic/Equals_Spec.enso | 2 +- test/Tests/src/Semantic/Error_Spec.enso | 2 +- test/Tests/src/Semantic/Import_Loop/Spec.enso | 2 +- .../Tests/src/Semantic/Java_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Js_Interop_Spec.enso | 2 +- .../src/Semantic/Meta_Location_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Spec.enso | 2 +- test/Tests/src/Semantic/Names_Spec.enso | 2 +- .../src/Semantic/Python_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/R_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Runtime_Spec.enso | 2 +- test/Tests/src/Semantic/Self_Type_Spec.enso | 2 +- test/Tests/src/Semantic/Warnings_Spec.enso | 2 +- test/Tests/src/System/Environment_Spec.enso | 2 +- test/Tests/src/System/File_Read_Spec.enso | 2 +- test/Tests/src/System/File_Spec.enso | 2 +- test/Tests/src/System/Process_Spec.enso | 2 +- .../System/Reporting_Stream_Decoder_Spec.enso | 2 +- .../System/Reporting_Stream_Encoder_Spec.enso | 2 +- test/Tests/src/System/System_Spec.enso | 2 +- .../src/Default_Visualizations_Spec.enso | 2 +- .../Visualization_Tests/src/Geo_Map_Spec.enso | 2 +- test/Visualization_Tests/src/Helpers.enso | 2 +- .../Visualization_Tests/src/Helpers_Spec.enso | 2 +- .../src/Histogram_Spec.enso | 2 +- test/Visualization_Tests/src/Id_Spec.enso | 2 +- .../src/Lazy_Table_Spec.enso | 2 +- .../src/Lazy_Text_Spec.enso | 2 +- test/Visualization_Tests/src/SQL_Spec.enso | 2 +- .../src/Scatter_Plot_Spec.enso | 2 +- test/Visualization_Tests/src/Table_Spec.enso | 2 +- .../src/Visualization_Spec.enso | 2 +- .../src/Widgets/Database_Widgets_Spec.enso | 2 +- .../src/Widgets/Table_Widgets_Spec.enso | 2 +- .../src/Widgets/Text_Widgets_Spec.enso | 2 +- 178 files changed, 207 insertions(+), 208 deletions(-) rename distribution/lib/Standard/Test/0.0.0-dev/src/{Test_Extensions.enso => Extensions.enso} (100%) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso index d3f91886b890..c1eb8ddd7bf4 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Any.enso @@ -1,5 +1,5 @@ import project.Data.Pair.Pair -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso index 490b6d43d027..f1aa1065e041 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso @@ -5,7 +5,7 @@ import project.Data.List.List import project.Data.Ordering.Ordering import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso index 0f0c4ef4a78b..6e203996b609 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Index_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Numbers.Integer import project.Data.Range.Range -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso index 82047d612551..849d38a5af83 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso @@ -1,12 +1,12 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Array_Proxy.Array_Proxy -import project.Data.Json.Extensions +from project.Data.Json.Extensions import all import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Pair.Pair -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso index 5644a1cd3346..92ab73fef62d 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Extensions.enso @@ -8,7 +8,7 @@ import project.Data.Map.Map import project.Data.Numbers.Decimal import project.Data.Numbers.Integer import project.Data.Numbers.Number -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Text.Text_Sub_Range.Text_Sub_Range diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso index da3c2ac4a97d..8393b361d43e 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Set.enso @@ -5,7 +5,7 @@ import project.Data.Numbers.Integer import project.Data.Ordering.Comparable import project.Data.Ordering.Ordering import project.Data.Vector.Vector -import project.Data.Text.Text_Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Errors.Illegal_Argument.Illegal_Argument import project.Nothing.Nothing diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso index 58f1fc1fbd83..f9f721db116a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Statistics.enso @@ -5,7 +5,7 @@ import project.Data.Numbers.Integer import project.Data.Numbers.Number import project.Data.Ordering.Ordering import project.Data.Ordering.Comparable -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Vector.Vector import project.Errors.Common.Incomparable_Values import project.Error.Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso index 8ad546fe6a53..514fdd6a768c 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso @@ -4,7 +4,7 @@ import project.Any.Any import project.Data.Array.Array import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Locale.Locale -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range import project.Data.Text.Case.Case import project.Data.Text.Case_Sensitivity.Case_Sensitivity @@ -1457,14 +1457,14 @@ Text.parse_json self = Json.parse self > Example Parse the date of 23rd December 2020. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-12-23".parse_date > Example Recover from an error due to a wrong format. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all from Standard.Base.Errors.Common import Time_Error example_parse_err = "my birthday".parse_date . catch Time_Error _-> @@ -1473,14 +1473,14 @@ Text.parse_json self = Json.parse self > Example Parse "1999-1-1" as Date using a custom format. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "1999-1-1".parse_date "yyyy-M-d" > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all from Standard.Base.Errors.Common import Time_Error example_parse_err = @@ -1525,49 +1525,49 @@ Text.parse_date self format=Nothing = Date.parse self format > Example Parse UTC time. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-10-01T04:11:12Z".parse_date_time > Example Parse UTC-04:00 time. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-10-01T04:11:12-04:00".parse_date_time > Example Parse UTC-04:00 time specifying New York timezone. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-10-01T04:11:12-04:00[America/New_York]".parse_date_time > Example Parse UTC-04:00 time with nanoseconds. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-10-01T04:11:12.177528-04:00".parse_date_time > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-10-01".parse_date_time . catch Time_Error (_->Date_Time.now) > Example Parse "2020-05-06 04:30:20" as Date_Time - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "2020-05-06 04:30:20".parse_date_time "yyyy-MM-dd HH:mm:ss" > Example Parse "06 of May 2020 at 04:30AM" as Date_Tme - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "06 of May 2020 at 04:30AM".parse_date_time "dd 'of' MMMM yyyy 'at' hh:mma" @@ -1614,14 +1614,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Get the time 15:05:30. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "15:05:30".parse_time_of_day > Example Recover from the parse error. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all from Standard.Base.Errors.Common import Time_Error example_parse = "half twelve".parse_time_of_day . catch Time_Error _-> @@ -1630,14 +1630,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Parse "04:30:20" as Time_Of_Day. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "04:30:20".parse_time_of_day "HH:mm:ss" > Example Parse "4:30AM" as Time_Of_Day - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "4:30AM".parse_time_of_day "h:mma" @locale Locale.default_widget @@ -1651,28 +1651,28 @@ Text.parse_time_of_day self format=Nothing locale=Locale.default = Time_Of_Day.p > Example Get Central European Time. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "CET".parse_time_zone > Example Get Moscow time. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "Europe/Moscow".parse_time_zone > Example Get time zone -06:00. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "-06:00".parse_time_zone > Example Get custom offset +03:02:01 of 3 hours 2 minutes an 1 second. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "+03:02:01".parse_time_zone Text.parse_time_zone : Time_Zone ! Time_Error @@ -1687,7 +1687,7 @@ Text.parse_time_zone self = Time_Zone.parse self > Example Parse URI text. - import Standard.Base.Data.Text.Extensions + from Standard.Base.Data.Text.Extensions import all example_parse = "http://example.com".parse_uri Text.parse_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso index a58622fbda81..b09d257ead85 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Match.enso @@ -1,7 +1,7 @@ import project.Any.Any import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range import project.Data.Text.Regex.No_Such_Group import project.Data.Text.Regex.Pattern.Pattern diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso index b5a828d9fa77..f50f0884e7ce 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex/Pattern.enso @@ -2,9 +2,9 @@ import project.Any.Any import project.Data.Filter_Condition.Filter_Condition import project.Data.Map.Map import project.Data.Numbers.Integer -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range -import project.Data.Text.Text_Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Helpers import project.Data.Text.Span.Span import project.Data.Text.Span.Utf_16_Span diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso index 99b0059a0da3..aff480e033fa 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Span.enso @@ -11,7 +11,7 @@ import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range import project.Data.Text.Text import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso index 3b326c5a107f..cf1f623535a8 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Text_Sub_Range.enso @@ -1,7 +1,7 @@ import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Numbers.Integer import project.Data.Pair.Pair -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Range.Range import project.Data.Text.Text import project.Data.Vector.Vector diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso index c548855796d7..ec8ccf2d330b 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Time/Date_Range.enso @@ -3,7 +3,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Range.Empty_Error -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Text.Text import project.Data.Time.Date.Date import project.Data.Time.Date_Period.Date_Period diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso index d88a56ecacd3..c320e9f2bb43 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso @@ -6,7 +6,7 @@ import project.Data.Map.Map import project.Data.Numbers.Integer import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Text.Text import project.Errors.Common.Incomparable_Values import project.Errors.Common.Index_Out_Of_Bounds diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index becd609b7837..12a9fe449a7f 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -74,7 +74,7 @@ import project.Data.Filter_Condition.Filter_Condition import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Interval.Bound import project.Data.Interval.Interval -import project.Data.Json.Extensions +from project.Data.Json.Extensions import all import project.Data.Json.Json import project.Data.Json.JS_Object import project.Data.Locale.Locale @@ -87,7 +87,7 @@ import project.Data.Ordering.Default_Comparator import project.Data.Ordering.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range -import project.Data.Range.Extensions +from project.Data.Range.Extensions import all import project.Data.Regression import project.Data.Statistics import project.Data.Text.Case.Case @@ -112,7 +112,7 @@ import project.Data.Time.Time_Of_Day.Time_Of_Day import project.Data.Time.Time_Period.Time_Period import project.Data.Time.Time_Zone.Time_Zone import project.Errors.Problem_Behavior.Problem_Behavior -import project.Network.Extensions +from project.Network.Extensions import all import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP import project.Network.HTTP.HTTP_Method.HTTP_Method @@ -126,7 +126,7 @@ export project.Data.Filter_Condition.Filter_Condition export project.Data.Index_Sub_Range.Index_Sub_Range export project.Data.Interval.Bound export project.Data.Interval.Interval -export project.Data.Json.Extensions +from project.Data.Json.Extensions export all export project.Data.Json.Json export project.Data.Json.JS_Object export project.Data.Locale.Locale @@ -138,12 +138,12 @@ export project.Data.Ordering.Default_Comparator export project.Data.Ordering.Sort_Direction.Sort_Direction export project.Data.Pair.Pair export project.Data.Range.Range -export project.Data.Range.Extensions +from project.Data.Range.Extensions export all export project.Data.Regression export project.Data.Text.Case.Case export project.Data.Text.Case_Sensitivity.Case_Sensitivity export project.Data.Text.Encoding.Encoding -export project.Data.Text.Extensions +from project.Data.Text.Extensions export all export project.Data.Text.Line_Ending_Style.Line_Ending_Style export project.Data.Text.Location.Location export project.Data.Text.Matching_Mode.Matching_Mode @@ -162,7 +162,7 @@ export project.Data.Time.Time_Of_Day.Time_Of_Day export project.Data.Time.Time_Period.Time_Period export project.Data.Time.Time_Zone.Time_Zone export project.Errors.Problem_Behavior.Problem_Behavior -export project.Network.Extensions +from project.Network.Extensions export all export project.Network.HTTP.Header.Header export project.Network.HTTP.HTTP export project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso index d6313e24907a..6a6860858481 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso @@ -9,7 +9,7 @@ import project.Errors.Common.Syntax_Error > Example Parse URI text. - import Standard.Base.Network.URI.Extensions + from Standard.Base.Network.URI.Extensions import all example_parse = "http://example.com".to_uri Text.to_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso index 553132d0b4fe..76e3bd0105ca 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Request.enso @@ -2,7 +2,7 @@ import project.Any.Any import project.Data.Pair.Pair import project.Data.Text.Text import project.Data.Vector.Vector -import project.Network.Extensions +from project.Network.Extensions import all import project.Network.HTTP.Form.Form import project.Network.HTTP.Header.Header import project.Network.HTTP.HTTP_Method.HTTP_Method diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso index 2c99d9d7b458..fbc3f3bd428b 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Response.enso @@ -3,7 +3,7 @@ import project.Data.Boolean.Boolean import project.Data.Json.JS_Object import project.Data.Numbers.Number import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +from project.Data.Text.Extensions import all import project.Data.Text.Text import project.Data.Vector.Vector import project.Error.Error diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Test_Extensions.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso similarity index 100% rename from distribution/lib/Standard/Test/0.0.0-dev/src/Test_Extensions.enso rename to distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso index 1962f49cd6b4..0298c3b1ce8c 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Main.enso @@ -5,11 +5,11 @@ import project.Faker.Faker import project.Problems import project.Test_Suite.Test_Suite import project.Test.Test -import project.Test_Extensions +from project.Extensions import all export project.Bench.Bench export project.Faker.Faker export project.Problems export project.Test_Suite.Test_Suite export project.Test.Test -export project.Extensions +from project.Extensions import all diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso index ac7844e449b7..0f180270eafa 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Problems.enso @@ -1,7 +1,7 @@ from Standard.Base import all from project import Test -import project.Test_Extensions +from project.Extensions import all ## Returns values of warnings attached to the value. get_attached_warnings v = diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso index 5fe68e6f856d..b4aea9da4909 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso @@ -162,7 +162,7 @@ type Test > Example Add a clue to a test from Standard.Test import Test, Test_Suite - import Standard.Test.Test_Extensions + from Standard.Test.Extensions import all main = Test_Suite.run_main <| Test.group "Tests" <| Test.specify "some property" <| diff --git a/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala b/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala index 8b313a0a9850..48ed54e53081 100644 --- a/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala +++ b/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala @@ -112,7 +112,7 @@ class TextTest extends InterpreterTest { |import Standard.Base.Panic.Panic |import Standard.Base.IO |import Standard.Base.Nothing - |import Standard.Base.Data.Json.Extensions + |from Standard.Base.Data.Json.Extensions import all | |main = | IO.println (List.Cons Nothing Nothing).to_display_text diff --git a/test/Examples_Tests/src/Examples_Spec.enso b/test/Examples_Tests/src/Examples_Spec.enso index b36ba85fe97c..e4f63ecfb6bd 100644 --- a/test/Examples_Tests/src/Examples_Spec.enso +++ b/test/Examples_Tests/src/Examples_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Examples from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all # While we're lacking the ability to run the documentation examples # automatically (#1706), these tests at least check that each of the examples diff --git a/test/Geo_Tests/src/Geo_Spec.enso b/test/Geo_Tests/src/Geo_Spec.enso index 2849d0370cf5..975e26636127 100644 --- a/test/Geo_Tests/src/Geo_Spec.enso +++ b/test/Geo_Tests/src/Geo_Spec.enso @@ -4,7 +4,7 @@ import Standard.Table.Data.Table.Table import Standard.Geo from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Geo Points" <| diff --git a/test/Image_Tests/src/Data/Image_Spec.enso b/test/Image_Tests/src/Data/Image_Spec.enso index d29d7508cf00..6b62a3459fb7 100644 --- a/test/Image_Tests/src/Data/Image_Spec.enso +++ b/test/Image_Tests/src/Data/Image_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Image, Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Image with 1 channel" <| diff --git a/test/Image_Tests/src/Data/Matrix_Spec.enso b/test/Image_Tests/src/Data/Matrix_Spec.enso index ad73ae66c8e6..7ab5986a0f77 100644 --- a/test/Image_Tests/src/Data/Matrix_Spec.enso +++ b/test/Image_Tests/src/Data/Matrix_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Matrix_Error" <| diff --git a/test/Image_Tests/src/Image_Read_Write_Spec.enso b/test/Image_Tests/src/Image_Read_Write_Spec.enso index 1ffe2bc4f83b..178ed7198dd9 100644 --- a/test/Image_Tests/src/Image_Read_Write_Spec.enso +++ b/test/Image_Tests/src/Image_Read_Write_Spec.enso @@ -7,7 +7,7 @@ from Standard.Image import Image, Read_Flag, Write_Flag import Standard.Image.Image_File_Format.Image_File_Format from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.System as Java_System diff --git a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso index 1c38957c6699..296e37312e9d 100644 --- a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso index 4e1b28fddbaa..e73674aef26b 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso index 823206ba6c46..3505ee51417a 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/src/Main.enso b/test/Meta_Test_Suite_Tests/src/Main.enso index c0b304fdcedf..7f0329317215 100644 --- a/test/Meta_Test_Suite_Tests/src/Main.enso +++ b/test/Meta_Test_Suite_Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Setup Config command args diff --git a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso index f39d8a8df8ec..efe1dc4375b5 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import Missing_Input_Columns, Duplicate_Output_Column_Names, Floating_Point_Equality from Standard.Test import Test, Problems -import Standard.Test.Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso index f9cbf5559975..179665778645 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso index eddd34de3106..d7f439b4fdc4 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso index 0d1b8141aeb3..a8d8e655a8a8 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import Missing_Input_Columns, Conversion_Failure from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso index 2b536f6a2c09..fa7e8cbda4bd 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all import Standard.Table.Data.Expression.Expression_Error from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso index 2dde1ab1da06..f2c6e41295a7 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso index 53fc0a1613bd..6175bfc75cec 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion, Invalid_Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso index 47e58b9c734f..25248206120d 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso index 957835ba856a..5ccb84b1242b 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso @@ -10,7 +10,7 @@ import Standard.Table.Data.Expression.Expression_Error from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso index 8b2aa34e71f1..d42ff7f5eeb1 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso @@ -11,7 +11,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso index 582a32e6fbf6..23250b03352e 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso @@ -5,7 +5,7 @@ from Standard.Table import all hiding Table from Standard.Table.Data.Aggregate_Column.Aggregate_Column import Group_By, Count, Sum from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend from project.Common_Table_Operations.Core_Spec import weird_names diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso index 3719686a1e06..835a025a170b 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso index 1598a85b9ba8..a5e81048656f 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso index e0e33e9b77ba..5b8665174fee 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table import project.Util diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso index b60cdb3c71e6..16291ce2a787 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso index 0e4972df4c81..df3d65d3a0e5 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso index 64f499a5b008..17b2d8281ae9 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso index 21fd3c841a77..f486b3304c62 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table.Data.Column_Selector.Column_Selector import By_Name from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso index 6b6bb9d0b5f9..409d297616b6 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table.Errors import all from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso index 3c4393fed0c3..6bbf08fa69e5 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table.Errors import all from Standard.Test import Test, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Util.enso b/test/Table_Tests/src/Common_Table_Operations/Util.enso index a0ac5f3506f7..5ae2b78faffe 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Util.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Util.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.In_Memory.Common_Spec as In_Memory_Table_Spec diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index 732567539ed4..ea3e1f92c0a2 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database.Data.Table import fresh_names from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Database.Helpers.Fake_Test_Connection diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index b3521413a8b7..0a335dde41b5 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import all from Standard.Database.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Util import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index 26514823e582..d54eff07ecbd 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Environment import project.Database.Common_Spec diff --git a/test/Table_Tests/src/Database/Redshift_Spec.enso b/test/Table_Tests/src/Database/Redshift_Spec.enso index c33be025c2a9..88e5c78125e2 100644 --- a/test/Table_Tests/src/Database/Redshift_Spec.enso +++ b/test/Table_Tests/src/Database/Redshift_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import Database, SQL_Query from Standard.AWS import Redshift, AWS_Credential from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Database.Common_Spec import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso index e221df994d75..22ff8a459632 100644 --- a/test/Table_Tests/src/Database/SQLite_Spec.enso +++ b/test/Table_Tests/src/Database/SQLite_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Database.Common_Spec import project.Database.Upload_Spec diff --git a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso index 9ec474f535c3..3288e6c4eda2 100644 --- a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion from Standard.Database import SQL_Query from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Database.Helpers.Name_Generator from project.Database.Postgres_Spec import create_connection_builder diff --git a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso index a54ac1da7446..1bc13ca4ad32 100644 --- a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database import Database, SQLite, In_Memory, SQL_Query from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Table_Tests/src/Database/Upload_Spec.enso b/test/Table_Tests/src/Database/Upload_Spec.enso index 41c4ac157633..c216f114ea29 100644 --- a/test/Table_Tests/src/Database/Upload_Spec.enso +++ b/test/Table_Tests/src/Database/Upload_Spec.enso @@ -10,7 +10,7 @@ from Standard.Database.Internal.Result_Set import result_set_to_table from Standard.Database.Extensions.Upload_Default_Helpers import get_primary_key from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso index c251482e8f24..dcbb596dff6f 100644 --- a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso +++ b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Custom_Type Value field diff --git a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso index c6d0865dbe43..a1752dc35285 100644 --- a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso +++ b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table.Data.Type.Value_Type import Value_Type, Auto from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Util diff --git a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso index 9bcebf87b28c..178e387251bd 100644 --- a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso +++ b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Table.Internal.Unique_Name_Strategy.Unique_Name_Strategy from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group 'Unique_Name_Strategy Helper' <| diff --git a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso index 39bc25e9d3db..018781b0c110 100644 --- a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso +++ b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Data.Type.Value_Type_Helpers from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Value_Type" <| diff --git a/test/Table_Tests/src/IO/Csv_Spec.enso b/test/Table_Tests/src/IO/Csv_Spec.enso index 83756fdaff8a..400563d8c539 100644 --- a/test/Table_Tests/src/IO/Csv_Spec.enso +++ b/test/Table_Tests/src/IO/Csv_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Table, Column, Delimited import Standard.Table.Main as Table_Module from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all diff --git a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso index f5e209b37887..f28c1e5fe578 100644 --- a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso @@ -9,7 +9,7 @@ import Standard.Table.Main as Table_Module from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Util diff --git a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso index 05594115ce69..93bcb738d365 100644 --- a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style, Match_Col from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all diff --git a/test/Table_Tests/src/IO/Excel_Spec.enso b/test/Table_Tests/src/IO/Excel_Spec.enso index 742e76cb7d7f..3c5b68db5006 100644 --- a/test/Table_Tests/src/IO/Excel_Spec.enso +++ b/test/Table_Tests/src/IO/Excel_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Table, Match_Columns, Excel, Excel_Range, Data_Format from Standard.Table.Errors import Invalid_Output_Column_Names, Duplicate_Output_Column_Names, Invalid_Location, Range_Exceeded, Existing_Data, Column_Count_Mismatch, Column_Name_Mismatch, Empty_Sheet_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Examples diff --git a/test/Table_Tests/src/IO/Formats_Spec.enso b/test/Table_Tests/src/IO/Formats_Spec.enso index 960000b19d8e..1cc5edeb1aca 100644 --- a/test/Table_Tests/src/IO/Formats_Spec.enso +++ b/test/Table_Tests/src/IO/Formats_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import all import Standard.Table.Errors.Invalid_JSON_Format from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Util diff --git a/test/Table_Tests/src/IO/Json_Spec.enso b/test/Table_Tests/src/IO/Json_Spec.enso index a566f7e31b1e..0beb43fe77b9 100644 --- a/test/Table_Tests/src/IO/Json_Spec.enso +++ b/test/Table_Tests/src/IO/Json_Spec.enso @@ -3,7 +3,7 @@ from Standard.Table import Table import Standard.Table.Data.Table_Conversions from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Util diff --git a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso index ac592d75e977..f6babea2e334 100644 --- a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso @@ -8,7 +8,7 @@ import Standard.Table.Internal.Aggregate_Column_Helper import Standard.Table.Internal.Problem_Builder.Problem_Builder from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Aggregate Columns" <| simple_table = Table.new [["count", [1, 2, Nothing, 3, Nothing]], ["is_valid", [Nothing, False, True, False, Nothing]], ["float", [3.4, 1, 5.6, 2.1, Nothing]], ["text", ["A", "", Nothing, "B,C", Nothing]]] diff --git a/test/Table_Tests/src/In_Memory/Builders_Spec.enso b/test/Table_Tests/src/In_Memory/Builders_Spec.enso index a934cc0925c2..386140515ae9 100644 --- a/test/Table_Tests/src/In_Memory/Builders_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Builders_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Column import Standard.Table.Internal.Java_Exports from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My Data x y diff --git a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso index a46ef544bbc7..e5ce5dc6d570 100644 --- a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Column, Value_Type from Standard.Table.Errors import Invalid_Value_Type from Standard.Table.Internal.Column_Format import all -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Test import Test, Test_Suite from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Column_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Spec.enso index 4b8c6056f381..5aea6d91668f 100644 --- a/test/Table_Tests/src/In_Memory/Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Spec.enso @@ -5,7 +5,7 @@ import project.Util import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Examples -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Table import Column, Value_Type from Standard.Table.Errors import Invalid_Value_Type diff --git a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso index 473cd7197bf1..04e0364bbefe 100644 --- a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso index c552054f43c2..c15c5c740b75 100644 --- a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Table.Data.Table_Conversions -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Table import Table from Standard.Table.Data.Type.Value_Type import Bits, Value_Type diff --git a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso index a17a4609b4b4..2ecbd0c6c672 100644 --- a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso @@ -1,6 +1,6 @@ from Standard.Base import all -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Table import Table from Standard.Table.Errors import Invalid_Value_Type, Column_Count_Exceeded, Duplicate_Output_Column_Names, No_Such_Column diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso index 61ab75fa7180..3458b3e2720f 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso index 2f6999036064..ee78180ff9c7 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Spec.enso index 2787e300bcb7..e958c0b7c546 100644 --- a/test/Table_Tests/src/In_Memory/Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Spec.enso @@ -17,7 +17,7 @@ import Standard.Database.Extensions.Upload_In_Memory_Table from Standard.Database import Database, SQLite, In_Memory from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso index df2b053a1ba9..bfc7c9b0077e 100644 --- a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Util import all diff --git a/test/Table_Tests/src/Util.enso b/test/Table_Tests/src/Util.enso index 3476ab55868d..1faf83d5e074 100644 --- a/test/Table_Tests/src/Util.enso +++ b/test/Table_Tests/src/Util.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Table, Column from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Result.Test_Result polyglot java import org.enso.base_test_helpers.FileSystemHelper diff --git a/test/Tests/src/Data/Array_Polyglot_Spec.enso b/test/Tests/src/Data/Array_Polyglot_Spec.enso index 558a12368e7d..8ec5f8d204eb 100644 --- a/test/Tests/src/Data/Array_Polyglot_Spec.enso +++ b/test/Tests/src/Data/Array_Polyglot_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "JavaScript Objects, Arrays & Functions" <| diff --git a/test/Tests/src/Data/Array_Proxy_Spec.enso b/test/Tests/src/Data/Array_Proxy_Spec.enso index b062d8fd2877..360fc8b26dbd 100644 --- a/test/Tests/src/Data/Array_Proxy_Spec.enso +++ b/test/Tests/src/Data/Array_Proxy_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Proxy_Object Value length diff --git a/test/Tests/src/Data/Array_Spec.enso b/test/Tests/src/Data/Array_Spec.enso index 705a50c652c7..58d86dd85263 100644 --- a/test/Tests/src/Data/Array_Spec.enso +++ b/test/Tests/src/Data/Array_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all Array.method self = 0 diff --git a/test/Tests/src/Data/Bool_Spec.enso b/test/Tests/src/Data/Bool_Spec.enso index c6fb950f4b88..deef558ebfd8 100644 --- a/test/Tests/src/Data/Bool_Spec.enso +++ b/test/Tests/src/Data/Bool_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all Boolean.method self = self diff --git a/test/Tests/src/Data/Function_Spec.enso b/test/Tests/src/Data/Function_Spec.enso index 66c5c894c3e6..8bae54083bc9 100644 --- a/test/Tests/src/Data/Function_Spec.enso +++ b/test/Tests/src/Data/Function_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "identity" <| diff --git a/test/Tests/src/Data/Interval_Spec.enso b/test/Tests/src/Data/Interval_Spec.enso index 743830cb032f..339fd11c64d3 100644 --- a/test/Tests/src/Data/Interval_Spec.enso +++ b/test/Tests/src/Data/Interval_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Bound" <| diff --git a/test/Tests/src/Data/Json_Spec.enso b/test/Tests/src/Data/Json_Spec.enso index 071665ee2b61..fd20ef305275 100644 --- a/test/Tests/src/Data/Json_Spec.enso +++ b/test/Tests/src/Data/Json_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.No_Such_Key.No_Such_Key from Standard.Base.Data.Json import Invalid_JSON from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Result.Test_Result type Author diff --git a/test/Tests/src/Data/List_Spec.enso b/test/Tests/src/Data/List_Spec.enso index 15c509090846..403890c1282f 100644 --- a/test/Tests/src/Data/List_Spec.enso +++ b/test/Tests/src/Data/List_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Common.Unsupported_Argument_Types import Standard.Base.Runtime.State from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "List" <| l = List.Cons 1 <| List.Cons 2 <| List.Cons 3 <| List.Nil diff --git a/test/Tests/src/Data/Locale_Spec.enso b/test/Tests/src/Data/Locale_Spec.enso index f70dbe8c3dd2..1a9276881a28 100644 --- a/test/Tests/src/Data/Locale_Spec.enso +++ b/test/Tests/src/Data/Locale_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Metadata.Choice import Option from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.util.Locale as JavaLocale diff --git a/test/Tests/src/Data/Map_Spec.enso b/test/Tests/src/Data/Map_Spec.enso index c476f0de072a..065e4502a85e 100644 --- a/test/Tests/src/Data/Map_Spec.enso +++ b/test/Tests/src/Data/Map_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Errors.No_Such_Key.No_Such_Key from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Map as JavaMap diff --git a/test/Tests/src/Data/Maybe_Spec.enso b/test/Tests/src/Data/Maybe_Spec.enso index 42ae685cedcf..4cc01199cc51 100644 --- a/test/Tests/src/Data/Maybe_Spec.enso +++ b/test/Tests/src/Data/Maybe_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Maybe" <| Test.specify "should have a None variant" <| diff --git a/test/Tests/src/Data/Noise/Generator_Spec.enso b/test/Tests/src/Data/Noise/Generator_Spec.enso index 9b8149a16d36..b511908c02b3 100644 --- a/test/Tests/src/Data/Noise/Generator_Spec.enso +++ b/test/Tests/src/Data/Noise/Generator_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Unimplemented.Unimplemented import Standard.Base.Data.Noise.Deterministic_Random from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Deterministic Random Noise Generator" <| diff --git a/test/Tests/src/Data/Noise_Spec.enso b/test/Tests/src/Data/Noise_Spec.enso index b5960ee813d2..77f7036fabbc 100644 --- a/test/Tests/src/Data/Noise_Spec.enso +++ b/test/Tests/src/Data/Noise_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Generator My_Generator.step self _ _ = 1 diff --git a/test/Tests/src/Data/Numbers_Spec.enso b/test/Tests/src/Data/Numbers_Spec.enso index 85ab910b2e5d..b737d30c6040 100644 --- a/test/Tests/src/Data/Numbers_Spec.enso +++ b/test/Tests/src/Data/Numbers_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Numbers import Number_Parse_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all Integer.is_even self = self % 2 == 0 diff --git a/test/Tests/src/Data/Ordering/Comparator_Spec.enso b/test/Tests/src/Data/Ordering/Comparator_Spec.enso index b0d554015096..a7ef4ef9dd13 100644 --- a/test/Tests/src/Data/Ordering/Comparator_Spec.enso +++ b/test/Tests/src/Data/Ordering/Comparator_Spec.enso @@ -6,7 +6,7 @@ polyglot java import org.enso.base.ObjectComparator polyglot java import org.enso.base.CompareException from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all # === Test Resources === diff --git a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso index 3d5318c69543..5188c0750937 100644 --- a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Natural Order" <| case_insensitive_compare a b = Natural_Order.compare a b Case_Sensitivity.Insensitive diff --git a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso index 071ac6220662..b40963131cb4 100644 --- a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Data.Ordering.Vector_Lexicographic_Order from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type Value a b diff --git a/test/Tests/src/Data/Ordering_Spec.enso b/test/Tests/src/Data/Ordering_Spec.enso index 87c66e6a1c45..5e0bd7f90850 100644 --- a/test/Tests/src/Data/Ordering_Spec.enso +++ b/test/Tests/src/Data/Ordering_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Common.Type_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all # === Test Resources === diff --git a/test/Tests/src/Data/Pair_Spec.enso b/test/Tests/src/Data/Pair_Spec.enso index 8cd0e782c26c..f74fa100244b 100644 --- a/test/Tests/src/Data/Pair_Spec.enso +++ b/test/Tests/src/Data/Pair_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Common.Not_Found from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type_spec name ctor = Test.group name <| Test.specify "should allow mapping" <| diff --git a/test/Tests/src/Data/Polyglot_Spec.enso b/test/Tests/src/Data/Polyglot_Spec.enso index 2000092d23dc..37a46a54e6d7 100644 --- a/test/Tests/src/Data/Polyglot_Spec.enso +++ b/test/Tests/src/Data/Polyglot_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.Double polyglot java import java.lang.Integer diff --git a/test/Tests/src/Data/Problems_Spec.enso b/test/Tests/src/Data/Problems_Spec.enso index acf92f4a2a1f..6ccffdeb323f 100644 --- a/test/Tests/src/Data/Problems_Spec.enso +++ b/test/Tests/src/Data/Problems_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Range_Spec.enso b/test/Tests/src/Data/Range_Spec.enso index 8ce63fa1083d..73d2d0871d07 100644 --- a/test/Tests/src/Data/Range_Spec.enso +++ b/test/Tests/src/Data/Range_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Range" <| Test.specify "should be created with a start, an end and a step" <| diff --git a/test/Tests/src/Data/Regression_Spec.enso b/test/Tests/src/Data/Regression_Spec.enso index 3fc73263ee55..47709c5cabd0 100644 --- a/test/Tests/src/Data/Regression_Spec.enso +++ b/test/Tests/src/Data/Regression_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import Nothing, Vector, Number, Decimal, True, False, Regress import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = ## Regression test data produced using an Excel spreadsheet. diff --git a/test/Tests/src/Data/Set_Spec.enso b/test/Tests/src/Data/Set_Spec.enso index 13deef702dad..2f077496f6c5 100644 --- a/test/Tests/src/Data/Set_Spec.enso +++ b/test/Tests/src/Data/Set_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Extensions +from Standard.Test.Extensions import all spec = Test.group "Enso Set" <| diff --git a/test/Tests/src/Data/Statistics_Spec.enso b/test/Tests/src/Data/Statistics_Spec.enso index 9e8c3d72f392..f8fc0b52e650 100644 --- a/test/Tests/src/Data/Statistics_Spec.enso +++ b/test/Tests/src/Data/Statistics_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all # === Test Resources === diff --git a/test/Tests/src/Data/Text/Encoding_Spec.enso b/test/Tests/src/Data/Text/Encoding_Spec.enso index c11e85e1df0f..e1091765f092 100644 --- a/test/Tests/src/Data/Text/Encoding_Spec.enso +++ b/test/Tests/src/Data/Text/Encoding_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.String as Java_String diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index 98ed0285f527..8a339afda355 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Base.Data.Json import Invalid_JSON from Standard.Base.Data.Numbers import Number_Parse_Error diff --git a/test/Tests/src/Data/Text/Regex_Spec.enso b/test/Tests/src/Data/Text/Regex_Spec.enso index b03c33fc9f38..36db6e78a962 100644 --- a/test/Tests/src/Data/Text/Regex_Spec.enso +++ b/test/Tests/src/Data/Text/Regex_Spec.enso @@ -12,7 +12,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Text.Regex.Replacer import get_lru_size, replacer_cache_lookup from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import org.enso.base.Replacer_Cache diff --git a/test/Tests/src/Data/Text/Span_Spec.enso b/test/Tests/src/Data/Text/Span_Spec.enso index 8f85db4ca829..d72d30e98646 100644 --- a/test/Tests/src/Data/Text/Span_Spec.enso +++ b/test/Tests/src/Data/Text/Span_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Data.Text.Span.Span import Standard.Base.Data.Text.Span.Utf_16_Span from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Text.Span" <| diff --git a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso index 923d0d2a86a0..f2bb0da5353b 100644 --- a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso +++ b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Data.Text.Text_Sub_Range import character_ranges from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Text_Sub_Range_Data" <| Test.specify "should correctly split a text into grapheme cluster ranges expressed in codepoint indices" <| diff --git a/test/Tests/src/Data/Text/Utils_Spec.enso b/test/Tests/src/Data/Text/Utils_Spec.enso index 85e4762c4375..0512ccbc53a8 100644 --- a/test/Tests/src/Data/Text/Utils_Spec.enso +++ b/test/Tests/src/Data/Text/Utils_Spec.enso @@ -5,7 +5,7 @@ polyglot java import org.enso.base.text.CaseFoldedString polyglot java import com.ibm.icu.text.BreakIterator from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.Exception as JException diff --git a/test/Tests/src/Data/Text_Spec.enso b/test/Tests/src/Data/Text_Spec.enso index 71e0ed2c7f53..4589dace2ff6 100644 --- a/test/Tests/src/Data/Text_Spec.enso +++ b/test/Tests/src/Data/Text_Spec.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding First, Last import Standard.Base.Data.Text.Regex.No_Such_Group import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Data.Text.Span.Span @@ -12,7 +12,7 @@ from Standard.Base.Data.Text.Text_Sub_Range.Text_Sub_Range import all from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Auto Value a diff --git a/test/Tests/src/Data/Time/Date_Part_Spec.enso b/test/Tests/src/Data/Time/Date_Part_Spec.enso index 3f46cf89283e..6ecd33f557be 100644 --- a/test/Tests/src/Data/Time/Date_Part_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Part_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec name create_new_date = Test.group (name + "date part tests") <| diff --git a/test/Tests/src/Data/Time/Date_Range_Spec.enso b/test/Tests/src/Data/Time/Date_Range_Spec.enso index 8010f2ffc8d3..3ee4f7231369 100644 --- a/test/Tests/src/Data/Time/Date_Range_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Range_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Time/Date_Spec.enso b/test/Tests/src/Data/Time/Date_Spec.enso index c535b744eb2f..4f2631b03ef0 100644 --- a/test/Tests/src/Data/Time/Date_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Spec.enso @@ -2,10 +2,9 @@ from Standard.Base import all import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error -import Standard.Base.Meta from Standard.Test import Problems, Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Date_Time_Spec.enso b/test/Tests/src/Data/Time/Date_Time_Spec.enso index 1f556ce24e84..577dc64fa33d 100644 --- a/test/Tests/src/Data/Time/Date_Time_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Time_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso index 2a778c510629..e664ee7c7b03 100644 --- a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso +++ b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Day_Of_Week conversions" <| diff --git a/test/Tests/src/Data/Time/Duration_Spec.enso b/test/Tests/src/Data/Time/Duration_Spec.enso index 1b03bcd78be1..ea5609a83d5b 100644 --- a/test/Tests/src/Data/Time/Duration_Spec.enso +++ b/test/Tests/src/Data/Time/Duration_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.time.Duration as Java_Duration polyglot java import java.time.LocalDate diff --git a/test/Tests/src/Data/Time/Period_Spec.enso b/test/Tests/src/Data/Time/Period_Spec.enso index 77eea4134bcd..fa7189fcbe71 100644 --- a/test/Tests/src/Data/Time/Period_Spec.enso +++ b/test/Tests/src/Data/Time/Period_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Incomparable_Values from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Period" <| diff --git a/test/Tests/src/Data/Time/Spec.enso b/test/Tests/src/Data/Time/Spec.enso index 340e0ea63870..505c7cc7bdd4 100644 --- a/test/Tests/src/Data/Time/Spec.enso +++ b/test/Tests/src/Data/Time/Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Data.Time.Duration_Spec import project.Data.Time.Period_Spec diff --git a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso index 9d407341e756..22feab2af6a5 100644 --- a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.time.LocalTime polyglot java import java.time.format.DateTimeFormatter diff --git a/test/Tests/src/Data/Time/Time_Zone_Spec.enso b/test/Tests/src/Data/Time/Time_Zone_Spec.enso index 2fbe14eae480..0f89cc453427 100644 --- a/test/Tests/src/Data/Time/Time_Zone_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Zone_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.time.ZoneId polyglot java import java.time.ZoneOffset diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index 128d0b89721e..cbfe0e9ff096 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all hiding Index_Sub_Range import Standard.Base.Data.Index_Sub_Range from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Vector Slicing Helpers" <| Test.specify "should be able to sort correctly merge neighboring sequences" <| diff --git a/test/Tests/src/Data/Vector_Spec.enso b/test/Tests/src/Data/Vector_Spec.enso index 150b10ae60cc..5ef2a4188f9e 100644 --- a/test/Tests/src/Data/Vector_Spec.enso +++ b/test/Tests/src/Data/Vector_Spec.enso @@ -12,7 +12,7 @@ import Standard.Base.Runtime.Ref.Ref from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import While, By_Index, Sample, Every from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.util.ArrayList diff --git a/test/Tests/src/Main.enso b/test/Tests/src/Main.enso index 787430eddf68..ddbb1052114a 100644 --- a/test/Tests/src/Main.enso +++ b/test/Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Semantic.Any_Spec import project.Semantic.Case_Spec diff --git a/test/Tests/src/Network/Http/Header_Spec.enso b/test/Tests/src/Network/Http/Header_Spec.enso index 4f749910deab..cadaa8be7692 100644 --- a/test/Tests/src/Network/Http/Header_Spec.enso +++ b/test/Tests/src/Network/Http/Header_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Header" <| diff --git a/test/Tests/src/Network/Http/Request_Spec.enso b/test/Tests/src/Network/Http/Request_Spec.enso index c2d9c08bdd33..0f06080531ad 100644 --- a/test/Tests/src/Network/Http/Request_Spec.enso +++ b/test/Tests/src/Network/Http/Request_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Network.HTTP.Request.Request import Standard.Base.Network.HTTP.Request_Body.Request_Body from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = test_uri = URI.parse "https://httpbin.org/post" diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index f4dd5caced7f..2c270fb06088 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -8,7 +8,7 @@ import Standard.Base.Network.HTTP.Request_Error import Standard.Base.Network.Proxy.Proxy from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.System as Java_System diff --git a/test/Tests/src/Network/URI_Spec.enso b/test/Tests/src/Network/URI_Spec.enso index 4f9352567f2c..d282e4dff531 100644 --- a/test/Tests/src/Network/URI_Spec.enso +++ b/test/Tests/src/Network/URI_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "URI" <| diff --git a/test/Tests/src/Random_Spec.enso b/test/Tests/src/Random_Spec.enso index 186762f4c8f1..9414a1106809 100644 --- a/test/Tests/src/Random_Spec.enso +++ b/test/Tests/src/Random_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Random" <| ## Random number generator seeded to make the test deterministic diff --git a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso index 5bbf7d7dd1af..1fc3596bdb74 100644 --- a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso @@ -1,5 +1,5 @@ from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Generator Value h t diff --git a/test/Tests/src/Runtime/Lazy_Spec.enso b/test/Tests/src/Runtime/Lazy_Spec.enso index da62ae7294b5..34c90ff3d610 100644 --- a/test/Tests/src/Runtime/Lazy_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Runtime.Ref.Ref import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type Lazy Value ~get diff --git a/test/Tests/src/Runtime/Managed_Resource_Spec.enso b/test/Tests/src/Runtime/Managed_Resource_Spec.enso index 5d05e6e58ab0..5133847ae1e7 100644 --- a/test/Tests/src/Runtime/Managed_Resource_Spec.enso +++ b/test/Tests/src/Runtime/Managed_Resource_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Managed_Resource.Managed_Resource from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Managed_Resource" <| Test.specify "should call the destructor even if the action fails" <| diff --git a/test/Tests/src/Runtime/Ref_Spec.enso b/test/Tests/src/Runtime/Ref_Spec.enso index 3147e9e65e04..76645154bd8c 100644 --- a/test/Tests/src/Runtime/Ref_Spec.enso +++ b/test/Tests/src/Runtime/Ref_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Refs" <| Test.specify "should be able to store and retrieve value in references" <| diff --git a/test/Tests/src/Runtime/Stack_Traces_Spec.enso b/test/Tests/src/Runtime/Stack_Traces_Spec.enso index b09520ffd9bb..affa81202981 100644 --- a/test/Tests/src/Runtime/Stack_Traces_Spec.enso +++ b/test/Tests/src/Runtime/Stack_Traces_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type diff --git a/test/Tests/src/Semantic/Any_Spec.enso b/test/Tests/src/Semantic/Any_Spec.enso index 412d3a7bdf97..ba4581193f03 100644 --- a/test/Tests/src/Semantic/Any_Spec.enso +++ b/test/Tests/src/Semantic/Any_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Semantic.Definitions.Any_Types import all spec = diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index 5363278edf3e..e81a1d601df5 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -11,7 +11,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.List as JList from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Pattern Matches" <| Test.specify "should be able to match on the Boolean type" <| diff --git a/test/Tests/src/Semantic/Conversion_Spec.enso b/test/Tests/src/Semantic/Conversion_Spec.enso index 07f5d5d92448..554049b49853 100644 --- a/test/Tests/src/Semantic/Conversion_Spec.enso +++ b/test/Tests/src/Semantic/Conversion_Spec.enso @@ -4,7 +4,7 @@ import project.Semantic.Conversion.Methods import project.Semantic.Conversion.Types from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.Object diff --git a/test/Tests/src/Semantic/Deep_Export/Spec.enso b/test/Tests/src/Semantic/Deep_Export/Spec.enso index a128ddb6587c..5f8442a34389 100644 --- a/test/Tests/src/Semantic/Deep_Export/Spec.enso +++ b/test/Tests/src/Semantic/Deep_Export/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Deep_Export.Internal from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Deep Exports" <| diff --git a/test/Tests/src/Semantic/Default_Args_Spec.enso b/test/Tests/src/Semantic/Default_Args_Spec.enso index e0596958a0fb..c5b1840b492a 100644 --- a/test/Tests/src/Semantic/Default_Args_Spec.enso +++ b/test/Tests/src/Semantic/Default_Args_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Semantic.Default_Args_Spec.Box import all diff --git a/test/Tests/src/Semantic/Equals_Spec.enso b/test/Tests/src/Semantic/Equals_Spec.enso index 1f8721d67acc..678476d0fcf5 100644 --- a/test/Tests/src/Semantic/Equals_Spec.enso +++ b/test/Tests/src/Semantic/Equals_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Random as Java_Random diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso index 90711bd9dc30..6bc4c4b9d09f 100644 --- a/test/Tests/src/Semantic/Error_Spec.enso +++ b/test/Tests/src/Semantic/Error_Spec.enso @@ -12,7 +12,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.Random as Java_Random from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type Value foo diff --git a/test/Tests/src/Semantic/Import_Loop/Spec.enso b/test/Tests/src/Semantic/Import_Loop/Spec.enso index 1666a91e4bdb..02cfd9fd1a00 100644 --- a/test/Tests/src/Semantic/Import_Loop/Spec.enso +++ b/test/Tests/src/Semantic/Import_Loop/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Import_Loop.B from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Looping Imports" <| Test.specify "should behave correctly and not loop the compiler" <| diff --git a/test/Tests/src/Semantic/Java_Interop_Spec.enso b/test/Tests/src/Semantic/Java_Interop_Spec.enso index c3d232b6d8d3..9d2b91d06f53 100644 --- a/test/Tests/src/Semantic/Java_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Java_Interop_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all polyglot java import java.lang.Float polyglot java import java.lang.Integer as Java_Integer diff --git a/test/Tests/src/Semantic/Js_Interop_Spec.enso b/test/Tests/src/Semantic/Js_Interop_Spec.enso index b8a720ec3997..cba4189acae3 100644 --- a/test/Tests/src/Semantic/Js_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Js_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Meta_Location_Spec.enso b/test/Tests/src/Semantic/Meta_Location_Spec.enso index 3cd441bbe83a..547cc7f6a55b 100644 --- a/test/Tests/src/Semantic/Meta_Location_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Location_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type Value foo bar baz diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index 1e6883004f8e..ca6d8ef79326 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -12,7 +12,7 @@ polyglot java import java.util.Random as Java_Random polyglot java import java.util.Locale as JavaLocale from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Result.Test_Result type My_Type diff --git a/test/Tests/src/Semantic/Names_Spec.enso b/test/Tests/src/Semantic/Names_Spec.enso index 89d13a22c364..4dbf583a28be 100644 --- a/test/Tests/src/Semantic/Names_Spec.enso +++ b/test/Tests/src/Semantic/Names_Spec.enso @@ -4,7 +4,7 @@ from project.Semantic.Definitions.Names import another_method, another_constant, import project.Semantic.Definitions.Names from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all Names.Foo.my_method self = case self of Names.Foo.Value x y z -> x * y * z diff --git a/test/Tests/src/Semantic/Python_Interop_Spec.enso b/test/Tests/src/Semantic/Python_Interop_Spec.enso index 557338159378..e7a193a18f2e 100644 --- a/test/Tests/src/Semantic/Python_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Python_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all foreign python my_method a b = """ return a + b diff --git a/test/Tests/src/Semantic/R_Interop_Spec.enso b/test/Tests/src/Semantic/R_Interop_Spec.enso index 96cb154a2467..3ae3da33360b 100644 --- a/test/Tests/src/Semantic/R_Interop_Spec.enso +++ b/test/Tests/src/Semantic/R_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Runtime_Spec.enso b/test/Tests/src/Semantic/Runtime_Spec.enso index 4b729fcdb502..edaafa192948 100644 --- a/test/Tests/src/Semantic/Runtime_Spec.enso +++ b/test/Tests/src/Semantic/Runtime_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Panic.Panic from Standard.Base.Runtime.Context import Input, Output from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all in_fn : Integer -> Integer in_fn a = Input.if_enabled (a * 2) diff --git a/test/Tests/src/Semantic/Self_Type_Spec.enso b/test/Tests/src/Semantic/Self_Type_Spec.enso index 6a6d03c97731..a4ed9b18616b 100644 --- a/test/Tests/src/Semantic/Self_Type_Spec.enso +++ b/test/Tests/src/Semantic/Self_Type_Spec.enso @@ -1,6 +1,6 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type Cons_A x diff --git a/test/Tests/src/Semantic/Warnings_Spec.enso b/test/Tests/src/Semantic/Warnings_Spec.enso index c46ef3d27868..e3b3acfc8f53 100644 --- a/test/Tests/src/Semantic/Warnings_Spec.enso +++ b/test/Tests/src/Semantic/Warnings_Spec.enso @@ -7,7 +7,7 @@ polyglot java import java.util.function.Function as Java_Function polyglot java import org.enso.base_test_helpers.CallbackHelper from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Warning Value reason diff --git a/test/Tests/src/System/Environment_Spec.enso b/test/Tests/src/System/Environment_Spec.enso index 2f35bbf850c5..380902058c6b 100644 --- a/test/Tests/src/System/Environment_Spec.enso +++ b/test/Tests/src/System/Environment_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Environment spec = Test.group "Environment" <| diff --git a/test/Tests/src/System/File_Read_Spec.enso b/test/Tests/src/System/File_Read_Spec.enso index d68320009a67..7940fda53cf1 100644 --- a/test/Tests/src/System/File_Read_Spec.enso +++ b/test/Tests/src/System/File_Read_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.File_Error.File_Error from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = sample_xxx = enso_project.data / "sample.xxx" diff --git a/test/Tests/src/System/File_Spec.enso b/test/Tests/src/System/File_Spec.enso index 987ba4be9172..502467d927b4 100644 --- a/test/Tests/src/System/File_Spec.enso +++ b/test/Tests/src/System/File_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Runtime.Context polyglot java import org.enso.base_test_helpers.FileSystemHelper from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all set_writable file writable = path = file.absolute.path diff --git a/test/Tests/src/System/Process_Spec.enso b/test/Tests/src/System/Process_Spec.enso index 2f157f868332..5c4f32df5383 100644 --- a/test/Tests/src/System/Process_Spec.enso +++ b/test/Tests/src/System/Process_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Process" <| Test.specify "should call simple command" <| diff --git a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso index 43547ecc759d..ae733c26fa75 100644 --- a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = windows_file = enso_project.data / "windows.txt" diff --git a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso index 162a28140699..9909d74af8c7 100644 --- a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso @@ -6,7 +6,7 @@ polyglot java import org.enso.base.Encoding_Utils polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "ReportingStreamEncoder" <| diff --git a/test/Tests/src/System/System_Spec.enso b/test/Tests/src/System/System_Spec.enso index 67cc84a9cac8..a1e835208ba7 100644 --- a/test/Tests/src/System/System_Spec.enso +++ b/test/Tests/src/System/System_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "System" <| Test.specify "should provide nanosecond timer" <| diff --git a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso index 4fc003868cf3..1ccd3c21eedf 100644 --- a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso +++ b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from Standard.Table import Table sample_table = Table.new [["A", [1, 2, 3]]] diff --git a/test/Visualization_Tests/src/Geo_Map_Spec.enso b/test/Visualization_Tests/src/Geo_Map_Spec.enso index 6ad1df9d4f5d..13b071e43b69 100644 --- a/test/Visualization_Tests/src/Geo_Map_Spec.enso +++ b/test/Visualization_Tests/src/Geo_Map_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Table import Standard.Visualization.Geo_Map from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project.Helpers diff --git a/test/Visualization_Tests/src/Helpers.enso b/test/Visualization_Tests/src/Helpers.enso index 6de781357dbb..f3c6d4f02a29 100644 --- a/test/Visualization_Tests/src/Helpers.enso +++ b/test/Visualization_Tests/src/Helpers.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Column from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Test.Test_Result.Test_Result Column.expect : Text -> Vector -> Test_Result diff --git a/test/Visualization_Tests/src/Helpers_Spec.enso b/test/Visualization_Tests/src/Helpers_Spec.enso index a51b1da7bc63..0cf44389b898 100644 --- a/test/Visualization_Tests/src/Helpers_Spec.enso +++ b/test/Visualization_Tests/src/Helpers_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table import Standard.Visualization.Helpers from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all from project.Helpers import all diff --git a/test/Visualization_Tests/src/Histogram_Spec.enso b/test/Visualization_Tests/src/Histogram_Spec.enso index fa6d5c8b8c8f..37c5128ce99f 100644 --- a/test/Visualization_Tests/src/Histogram_Spec.enso +++ b/test/Visualization_Tests/src/Histogram_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Histogram from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project diff --git a/test/Visualization_Tests/src/Id_Spec.enso b/test/Visualization_Tests/src/Id_Spec.enso index 446fcffe59c5..0764195a77dd 100644 --- a/test/Visualization_Tests/src/Id_Spec.enso +++ b/test/Visualization_Tests/src/Id_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table import Standard.Visualization from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all type My_Type Value my_field diff --git a/test/Visualization_Tests/src/Lazy_Table_Spec.enso b/test/Visualization_Tests/src/Lazy_Table_Spec.enso index d0fd0cbc5093..4acff3f0c115 100644 --- a/test/Visualization_Tests/src/Lazy_Table_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Table_Spec.enso @@ -7,7 +7,7 @@ import Standard.Visualization.Table as Table_Visualisation import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all t1 = """ 12 23 diff --git a/test/Visualization_Tests/src/Lazy_Text_Spec.enso b/test/Visualization_Tests/src/Lazy_Text_Spec.enso index e1fc147386d4..32f17c5df78a 100644 --- a/test/Visualization_Tests/src/Lazy_Text_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Text_Spec.enso @@ -6,7 +6,7 @@ import Standard.Visualization.Text as TextVis import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all sample_text_single_line = "ABCDEFGHIJKLMNOPQRS" sample_text_multi_line = """ diff --git a/test/Visualization_Tests/src/SQL_Spec.enso b/test/Visualization_Tests/src/SQL_Spec.enso index f098ab48585f..e211fe4a4e2f 100644 --- a/test/Visualization_Tests/src/SQL_Spec.enso +++ b/test/Visualization_Tests/src/SQL_Spec.enso @@ -5,7 +5,7 @@ from Standard.Database import Database, SQLite, SQL_Query import Standard.Visualization.SQL.Visualization from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all visualization_spec connection = connection.execute_update 'CREATE TABLE "T" ("A" VARCHAR, "B" INTEGER, "C" INTEGER)' diff --git a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso index 424226f475ce..687b7f4d526c 100644 --- a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso +++ b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Scatter_Plot from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import project diff --git a/test/Visualization_Tests/src/Table_Spec.enso b/test/Visualization_Tests/src/Table_Spec.enso index c9924ca1023a..046b3a203d14 100644 --- a/test/Visualization_Tests/src/Table_Spec.enso +++ b/test/Visualization_Tests/src/Table_Spec.enso @@ -11,7 +11,7 @@ import Standard.Visualization.Helpers import Standard.Visualization.Id.Id from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Base.Errors.Common.Type_Error polyglot java import java.util.UUID diff --git a/test/Visualization_Tests/src/Visualization_Spec.enso b/test/Visualization_Tests/src/Visualization_Spec.enso index 34904a5dd672..c2aea41e6c1d 100644 --- a/test/Visualization_Tests/src/Visualization_Spec.enso +++ b/test/Visualization_Tests/src/Visualization_Spec.enso @@ -5,7 +5,7 @@ import Standard.Examples import Standard.Visualization from Standard.Test import Test -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all import Standard.Visualization.File_Upload.File_Being_Uploaded diff --git a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso index 4bfa5fa08927..642021bb35a6 100644 --- a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso @@ -11,7 +11,7 @@ from Standard.AWS import all import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso index ebc38885e54f..336c8a5c6130 100644 --- a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso @@ -9,7 +9,7 @@ from Standard.Table import Table import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Widgets for In-Memory with column name sets" <| diff --git a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso index 8cf9eeaaaeb6..160d39d7469d 100644 --- a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso @@ -8,7 +8,7 @@ import Standard.Base.Metadata.Display import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -import Standard.Test.Test_Extensions +from Standard.Test.Extensions import all spec = Test.group "Widgets for the Text type" <| From 0181c4c514916de1eaf5a91d2a78f046118dc6a0 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 15:41:47 +0200 Subject: [PATCH 34/52] Remove some duplicates --- .../lib/Standard/Visualization/0.0.0-dev/src/Table.enso | 1 - distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso | 2 -- 2 files changed, 3 deletions(-) diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso index 978b65c00609..3d23f9d854d4 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table.enso @@ -1,6 +1,5 @@ from Standard.Base import all -from Standard.Base.Data.Text.Extensions import slice_text from Standard.Visualization.Text import get_chunk_from_line import Standard.Base.Errors.Common.Not_Found import Standard.Table as Table_Module diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso index c92203244f88..88da2f8614a0 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Text.enso @@ -1,7 +1,5 @@ from Standard.Base import all -from Standard.Base.Data.Text.Extensions import slice_text - ## PRIVATE Message to be sent to the IDE. type Message From 3103fe43f34eafdf929148a51da820f039497d6d Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:36:57 +0200 Subject: [PATCH 35/52] Apply suggestions from code review Co-authored-by: James Dunkerley --- test/Tests/src/Data/Text/Parse_Spec.enso | 4 ++-- test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index 8a339afda355..0110e9916bd7 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -3,9 +3,9 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test.Extensions import all -from Standard.Base.Data.Json import Invalid_JSON +import Standard.Base.Data.Json.Invalid_JSON -from Standard.Base.Data.Numbers import Number_Parse_Error +import Standard.Base.Data.Numbers.Number_Parse_Error from Standard.Test import Test, Test_Suite spec = diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index cbfe0e9ff096..94d66ec61ff0 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -1,5 +1,5 @@ -from Standard.Base import all hiding Index_Sub_Range -import Standard.Base.Data.Index_Sub_Range +from Standard.Base import all +from Standard.Base.Data.Index_Sub_Range import sort_and_merge_ranges from Standard.Test import Test, Test_Suite from Standard.Test.Extensions import all From e1cb0ced3f0cc4c2571d8f2fd2f6794eee50c70d Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:40:44 +0200 Subject: [PATCH 36/52] Consistent naming of polyglot java imports --- test/Tests/src/Semantic/Case_Spec.enso | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index e81a1d601df5..d927fae7aa90 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -4,11 +4,11 @@ import Standard.Base.Data.Text as Text_Module import Standard.Base.Data.Vector as Vector_Module polyglot java import java.lang.Class -polyglot java import java.lang.Object as JObject -polyglot java import java.util.Random as JRandom +polyglot java import java.lang.Object as Java_Object +polyglot java import java.util.Random as Java_Random polyglot java import java.util.AbstractList polyglot java import java.util.ArrayList -polyglot java import java.util.List as JList +polyglot java import java.util.List as Java_List from Standard.Test import Test, Test_Suite from Standard.Test.Extensions import all @@ -108,7 +108,7 @@ spec = Test.group "Pattern Matches" <| Array_Module -> Nothing _ -> Test.fail "Expected the Array module to match." Test.specify "should be able to match on the Polyglot type" <| - random_gen = JRandom.new + random_gen = Java_Random.new case random_gen of Polyglot -> Nothing _ -> Test.fail "Expected a polyglot object to match." @@ -285,7 +285,7 @@ spec = Test.group "Pattern Matches" <| _ -> Test.fail "Expected to match on Any type." case ArrayList.new of - _ : JObject -> Nothing + _ : Java_Object -> Nothing _ -> Test.fail "Expected to match on java.lang.Object type." case ArrayList.new of @@ -293,7 +293,7 @@ spec = Test.group "Pattern Matches" <| _ -> Test.fail "Expected to match on java.lang.Object type." case ArrayList.new of - _ : JList -> Nothing + _ : Java_List -> Nothing _ -> Test.fail "Expected to match on java.lang.Object type." case ArrayList.new of From 5cb41fc9ba9f88126fb0182534d3e877bb6a643a Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:42:06 +0200 Subject: [PATCH 37/52] Hide symbols from more generic imports --- test/Benchmarks/src/Table/Aggregate.enso | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Benchmarks/src/Table/Aggregate.enso b/test/Benchmarks/src/Table/Aggregate.enso index f3b7252747e4..7057660b0b16 100644 --- a/test/Benchmarks/src/Table/Aggregate.enso +++ b/test/Benchmarks/src/Table/Aggregate.enso @@ -1,7 +1,7 @@ -from Standard.Base import all +from Standard.Base import all hiding First, Last from Standard.Table import Table -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all from Standard.Test import Bench, Faker From 78375fa2cacf99e76cd574ce3943911b5c2a0ad8 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:45:25 +0200 Subject: [PATCH 38/52] Move Sort_Direction from Ordering module to Data --- distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso | 2 +- .../Base/0.0.0-dev/src/Data/{Ordering => }/Sort_Direction.enso | 0 distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso | 2 +- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso | 2 +- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename distribution/lib/Standard/Base/0.0.0-dev/src/Data/{Ordering => }/Sort_Direction.enso (100%) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso index f1aa1065e041..d4a02d2c3b40 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso @@ -3,7 +3,7 @@ import project.Data.Numbers.Integer import project.Data.Filter_Condition.Filter_Condition import project.Data.List.List import project.Data.Ordering.Ordering -import project.Data.Ordering.Sort_Direction.Sort_Direction +import project.Data.Sort_Direction.Sort_Direction import project.Data.Pair.Pair from project.Data.Range.Extensions import all import project.Data.Range.Range diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Ordering/Sort_Direction.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Sort_Direction.enso similarity index 100% rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Ordering/Sort_Direction.enso rename to distribution/lib/Standard/Base/0.0.0-dev/src/Data/Sort_Direction.enso diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index 12a9fe449a7f..93b696456c02 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -84,7 +84,7 @@ import project.Data.Ordering.Natural_Order import project.Data.Ordering.Ordering import project.Data.Ordering.Comparable import project.Data.Ordering.Default_Comparator -import project.Data.Ordering.Sort_Direction.Sort_Direction +import project.Data.Sort_Direction.Sort_Direction import project.Data.Pair.Pair import project.Data.Range.Range from project.Data.Range.Extensions import all diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso index a33b9f2ca484..94824825b355 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso @@ -1,4 +1,4 @@ -from Standard.Base import all hiding Sort_Direction +from Standard.Base import all import Standard.Base.Runtime.Context import Standard.Base.Errors.Common.Forbidden_Operation import Standard.Base.Errors.File_Error.File_Error diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso index 7587286f186e..ec137273c55f 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso @@ -1,4 +1,4 @@ -from Standard.Base import all hiding Sort_Direction +from Standard.Base import all from Standard.Base.Data.Ordering import all From 7dfdd36095bf3a389446a8172d18adb1bb68126a Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:51:18 +0200 Subject: [PATCH 39/52] Use more specific imports in Std lib instead of import all --- .../Base/0.0.0-dev/src/System/File.enso | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index 8b7423f30d29..f776377449a8 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -1,11 +1,31 @@ -from Standard.Base import all +import project.Any.Any +import project.Data.Array.Array +import project.Data.Index_Sub_Range.Index_Sub_Range +import project.Data.Json.JS_Object +import project.Data.Numbers.Integer +import project.Data.Text.Encoding.Encoding +import project.Data.Text.Text_Extensions +import project.Data.Text.Matching_Mode.Matching_Mode +import project.Data.Text.Text +import project.Data.Time.Time_Of_Day.Time_Of_Day +import project.Data.Vector.Vector +import project.Error.Error import project.Errors.Common.Dry_Run_Operation import project.Errors.Common.Forbidden_Operation import project.Errors.Encoding_Error.Encoding_Error import project.Errors.File_Error.File_Error import project.Errors.Illegal_Argument.Illegal_Argument +import project.Errors.Problem_Behavior.Problem_Behavior +import project.Meta +import project.Nothing.Nothing +import project.Panic.Panic import project.Runtime.Context import project.Runtime.Managed_Resource.Managed_Resource +import project.System.File.File_Access.File_Access +import project.System.File.File_Permissions.File_Permissions + +from project.Data.Boolean import Boolean, True, False +from project.System.File_Format import Auto_Detect, File_Format import project.Metadata.Widget from project.Metadata.Choice import Option From a759efd3268c6ea63d3ea67683c1b1646699945a Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 16:57:28 +0200 Subject: [PATCH 40/52] Revert examples documentation --- .../0.0.0-dev/src/Data/Text/Extensions.enso | 40 +++++++++---------- .../0.0.0-dev/src/Network/Extensions.enso | 2 +- .../lib/Standard/Test/0.0.0-dev/src/Test.enso | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso index 514fdd6a768c..af6f77b21b69 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Extensions.enso @@ -1457,14 +1457,14 @@ Text.parse_json self = Json.parse self > Example Parse the date of 23rd December 2020. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-12-23".parse_date > Example Recover from an error due to a wrong format. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = "my birthday".parse_date . catch Time_Error _-> @@ -1473,14 +1473,14 @@ Text.parse_json self = Json.parse self > Example Parse "1999-1-1" as Date using a custom format. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "1999-1-1".parse_date "yyyy-M-d" > Example Recover from the parse error. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse_err = @@ -1525,49 +1525,49 @@ Text.parse_date self format=Nothing = Date.parse self format > Example Parse UTC time. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12Z".parse_date_time > Example Parse UTC-04:00 time. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12-04:00".parse_date_time > Example Parse UTC-04:00 time specifying New York timezone. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12-04:00[America/New_York]".parse_date_time > Example Parse UTC-04:00 time with nanoseconds. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01T04:11:12.177528-04:00".parse_date_time > Example Recover from the parse error. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-10-01".parse_date_time . catch Time_Error (_->Date_Time.now) > Example Parse "2020-05-06 04:30:20" as Date_Time - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "2020-05-06 04:30:20".parse_date_time "yyyy-MM-dd HH:mm:ss" > Example Parse "06 of May 2020 at 04:30AM" as Date_Tme - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "06 of May 2020 at 04:30AM".parse_date_time "dd 'of' MMMM yyyy 'at' hh:mma" @@ -1614,14 +1614,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Get the time 15:05:30. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "15:05:30".parse_time_of_day > Example Recover from the parse error. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions from Standard.Base.Errors.Common import Time_Error example_parse = "half twelve".parse_time_of_day . catch Time_Error _-> @@ -1630,14 +1630,14 @@ Text.parse_date_time self format=Nothing locale=Locale.default = Date_Time.parse > Example Parse "04:30:20" as Time_Of_Day. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "04:30:20".parse_time_of_day "HH:mm:ss" > Example Parse "4:30AM" as Time_Of_Day - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "4:30AM".parse_time_of_day "h:mma" @locale Locale.default_widget @@ -1651,28 +1651,28 @@ Text.parse_time_of_day self format=Nothing locale=Locale.default = Time_Of_Day.p > Example Get Central European Time. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "CET".parse_time_zone > Example Get Moscow time. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "Europe/Moscow".parse_time_zone > Example Get time zone -06:00. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "-06:00".parse_time_zone > Example Get custom offset +03:02:01 of 3 hours 2 minutes an 1 second. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "+03:02:01".parse_time_zone Text.parse_time_zone : Time_Zone ! Time_Error @@ -1687,7 +1687,7 @@ Text.parse_time_zone self = Time_Zone.parse self > Example Parse URI text. - from Standard.Base.Data.Text.Extensions import all + import Standard.Base.Data.Text.Extensions example_parse = "http://example.com".parse_uri Text.parse_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso index 6a6860858481..d6313e24907a 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/Extensions.enso @@ -9,7 +9,7 @@ import project.Errors.Common.Syntax_Error > Example Parse URI text. - from Standard.Base.Network.URI.Extensions import all + import Standard.Base.Network.URI.Extensions example_parse = "http://example.com".to_uri Text.to_uri : URI ! Syntax_Error diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso index b4aea9da4909..2064ec40bda3 100644 --- a/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso +++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Test.enso @@ -162,7 +162,7 @@ type Test > Example Add a clue to a test from Standard.Test import Test, Test_Suite - from Standard.Test.Extensions import all + import Standard.Test.Extensions main = Test_Suite.run_main <| Test.group "Tests" <| Test.specify "some property" <| From 102e4f679eb0e8a83544c9f8af43a125a7078e73 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 17:21:21 +0200 Subject: [PATCH 41/52] Revert extensions module renaming --- distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso | 2 +- .../interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java | 2 +- .../scala/org/enso/interpreter/test/semantic/TextTest.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index f776377449a8..78ec2e027d38 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -4,7 +4,7 @@ import project.Data.Index_Sub_Range.Index_Sub_Range import project.Data.Json.JS_Object import project.Data.Numbers.Integer import project.Data.Text.Encoding.Encoding -import project.Data.Text.Text_Extensions +import project.Data.Text.Extensions import project.Data.Text.Matching_Mode.Matching_Mode import project.Data.Text.Text import project.Data.Time.Time_Of_Day.Time_Of_Day diff --git a/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java b/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java index ffd29b1c0cbb..10eb026eb964 100644 --- a/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java +++ b/engine/runtime/src/bench/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java @@ -70,7 +70,7 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception { var benchmarkName = SrcUtil.findName(params); var codeBuilder = new StringBuilder(""" - import Standard.Base.Data.Range.Range_Extensions + import Standard.Base.Data.Range.Extensions type Node C1 f1 diff --git a/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala b/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala index 48ed54e53081..8b313a0a9850 100644 --- a/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala +++ b/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala @@ -112,7 +112,7 @@ class TextTest extends InterpreterTest { |import Standard.Base.Panic.Panic |import Standard.Base.IO |import Standard.Base.Nothing - |from Standard.Base.Data.Json.Extensions import all + |import Standard.Base.Data.Json.Extensions | |main = | IO.println (List.Cons Nothing Nothing).to_display_text From c99b60878f2cae2315e6f4723c80d6aa70fb8881 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 17:21:38 +0200 Subject: [PATCH 42/52] Move Sort_Direction from Ordering module to Data --- .../lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso | 5 +++-- distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso index c320e9f2bb43..294406fcb81f 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso @@ -8,6 +8,7 @@ import project.Data.Pair.Pair import project.Data.Range.Range from project.Data.Range.Extensions import all import project.Data.Text.Text +import project.Data.Sort_Direction.Sort_Direction import project.Errors.Common.Incomparable_Values import project.Errors.Common.Index_Out_Of_Bounds import project.Errors.Common.No_Such_Method @@ -939,8 +940,8 @@ type Vector a because it has the default comparator. [My_Type.Value 'hello', 1].sort == [1, My_Type.Value 'hello'] - sort : Sort_Direction.Sort_Direction -> (Any -> Any)|Nothing -> (Any -> Any -> (Ordering|Nothing))|Nothing -> Problem_Behavior -> Vector Any ! Incomparable_Values - sort self (order = Sort_Direction.Sort_Direction.Ascending) on=Nothing by=Nothing on_incomparable=Problem_Behavior.Ignore = + sort : Sort_Direction -> (Any -> Any)|Nothing -> (Any -> Any -> (Ordering|Nothing))|Nothing -> Problem_Behavior -> Vector Any ! Incomparable_Values + sort self (order = Sort_Direction.Ascending) on=Nothing by=Nothing on_incomparable=Problem_Behavior.Ignore = comps = case on == Nothing of True -> self.map it-> Comparable.from it False -> self.map it-> Comparable.from (on it) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso index 93b696456c02..f36f01c10cd9 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso @@ -135,11 +135,11 @@ export project.Data.Ordering.Natural_Order export project.Data.Ordering.Ordering export project.Data.Ordering.Comparable export project.Data.Ordering.Default_Comparator -export project.Data.Ordering.Sort_Direction.Sort_Direction export project.Data.Pair.Pair export project.Data.Range.Range from project.Data.Range.Extensions export all export project.Data.Regression +export project.Data.Sort_Direction.Sort_Direction export project.Data.Text.Case.Case export project.Data.Text.Case_Sensitivity.Case_Sensitivity export project.Data.Text.Encoding.Encoding From 0cca1a64d328aecb5b6dbd3120bba442a429e328 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 17:22:00 +0200 Subject: [PATCH 43/52] Fix after merge --- .../lib/Standard/Base/0.0.0-dev/src/System/File.enso | 6 +++++- test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso index 78ec2e027d38..e4a067aa6f6c 100644 --- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso +++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso @@ -23,6 +23,7 @@ import project.Runtime.Context import project.Runtime.Managed_Resource.Managed_Resource import project.System.File.File_Access.File_Access import project.System.File.File_Permissions.File_Permissions +import project.Warning.Warning from project.Data.Boolean import Boolean, True, False from project.System.File_Format import Auto_Detect, File_Format @@ -88,7 +89,10 @@ type File if self.exists && copy_original then Context.Output.with_enabled <| self.copy_to temp replace_existing=True - temp + + ## Attach a warning to the file that it is a dry run + warning = Dry_Run_Operation.Warning "Only a dry run has occurred, with data written to a temporary file." + Warning.attach warning temp ## ALIAS Current Directory diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index 94d66ec61ff0..57d535fc7d25 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -6,7 +6,7 @@ from Standard.Test.Extensions import all spec = Test.group "Vector Slicing Helpers" <| Test.specify "should be able to sort correctly merge neighboring sequences" <| - merge = Index_Sub_Range.sort_and_merge_ranges + merge = sort_and_merge_ranges merge [] . should_equal [] merge [0.up_to 0] . should_equal [] merge [0.up_to 10] . should_equal [0.up_to 10] From 2b4903608f16d91a83ae45583042d5ba85daf9c4 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 17:36:44 +0200 Subject: [PATCH 44/52] Specific symbols are hidden from more generic imports --- test/Table_Tests/src/Database/Codegen_Spec.enso | 4 ++-- test/Table_Tests/src/Database/Common_Spec.enso | 4 ++-- test/Table_Tests/src/Database/Postgres_Spec.enso | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index ea3e1f92c0a2..8b17b22a43a9 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -1,8 +1,8 @@ -from Standard.Base import all +from Standard.Base import all hiding First, Last import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all from Standard.Table.Errors import No_Input_Columns_Selected, Missing_Input_Columns, No_Such_Column from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index 0a335dde41b5..03e68ecaa875 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -1,8 +1,8 @@ -from Standard.Base import all +from Standard.Base import all hiding First, Last import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Table, Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all from Standard.Table.Errors import all from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index d54eff07ecbd..13b518b5bbce 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -1,10 +1,10 @@ -from Standard.Base import all +from Standard.Base import all hiding First, Last import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Ref.Ref import Standard.Table.Data.Type.Value_Type.Bits from Standard.Table import Table, Value_Type -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all import Standard.Database.Data.SQL_Type.SQL_Type import Standard.Database.Internal.Postgres.Pgpass From b36b4b8ae89e571206bbcc07245d0e8c29a928c2 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Fri, 9 Jun 2023 18:12:18 +0200 Subject: [PATCH 45/52] Remove unnecessary from.. Extensions import all statements --- test/Examples_Tests/src/Examples_Spec.enso | 2 +- test/Geo_Tests/src/Geo_Spec.enso | 2 +- test/Image_Tests/src/Data/Image_Spec.enso | 2 +- test/Image_Tests/src/Data/Matrix_Spec.enso | 2 +- test/Image_Tests/src/Image_Read_Write_Spec.enso | 2 +- test/Meta_Test_Suite_Tests/data/fail_report/Main.enso | 2 +- test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso | 2 +- test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso | 2 +- test/Meta_Test_Suite_Tests/src/Main.enso | 2 +- .../src/Common_Table_Operations/Add_Row_Number_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso | 2 +- .../src/Common_Table_Operations/Column_Operations_Spec.enso | 2 +- .../src/Common_Table_Operations/Conversion_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso | 2 +- .../src/Common_Table_Operations/Expression_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso | 2 +- .../src/Common_Table_Operations/Integration_Tests.enso | 2 +- .../src/Common_Table_Operations/Join/Cross_Join_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso | 2 +- .../src/Common_Table_Operations/Join/Union_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso | 2 +- .../src/Common_Table_Operations/Missing_Values_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso | 2 +- .../src/Common_Table_Operations/Select_Columns_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso | 2 +- .../Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso | 2 +- test/Table_Tests/src/Common_Table_Operations/Util.enso | 2 +- test/Table_Tests/src/Database/Codegen_Spec.enso | 2 +- test/Table_Tests/src/Database/Common_Spec.enso | 2 +- test/Table_Tests/src/Database/Postgres_Spec.enso | 2 +- test/Table_Tests/src/Database/Redshift_Spec.enso | 2 +- test/Table_Tests/src/Database/SQLite_Spec.enso | 2 +- .../src/Database/Types/Postgres_Type_Mapping_Spec.enso | 2 +- .../src/Database/Types/SQLite_Type_Mapping_Spec.enso | 2 +- test/Table_Tests/src/Database/Upload_Spec.enso | 2 +- test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso | 2 +- test/Table_Tests/src/Formatting/Parse_Values_Spec.enso | 2 +- test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso | 2 +- test/Table_Tests/src/Helpers/Value_Type_Spec.enso | 2 +- test/Table_Tests/src/IO/Csv_Spec.enso | 2 +- test/Table_Tests/src/IO/Delimited_Read_Spec.enso | 2 +- test/Table_Tests/src/IO/Delimited_Write_Spec.enso | 2 +- test/Table_Tests/src/IO/Excel_Spec.enso | 2 +- test/Table_Tests/src/IO/Formats_Spec.enso | 2 +- test/Table_Tests/src/IO/Json_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Builders_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Column_Format_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Column_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Date_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Spec.enso | 2 +- test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso | 2 +- test/Table_Tests/src/Util.enso | 2 +- test/Tests/src/Data/Array_Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Array_Proxy_Spec.enso | 2 +- test/Tests/src/Data/Array_Spec.enso | 2 +- test/Tests/src/Data/Bool_Spec.enso | 2 +- test/Tests/src/Data/Function_Spec.enso | 2 +- test/Tests/src/Data/Interval_Spec.enso | 2 +- test/Tests/src/Data/Json_Spec.enso | 2 +- test/Tests/src/Data/List_Spec.enso | 2 +- test/Tests/src/Data/Locale_Spec.enso | 2 +- test/Tests/src/Data/Map_Spec.enso | 2 +- test/Tests/src/Data/Maybe_Spec.enso | 2 +- test/Tests/src/Data/Noise/Generator_Spec.enso | 2 +- test/Tests/src/Data/Noise_Spec.enso | 2 +- test/Tests/src/Data/Numbers_Spec.enso | 2 +- test/Tests/src/Data/Ordering/Comparator_Spec.enso | 2 +- test/Tests/src/Data/Ordering/Natural_Order_Spec.enso | 2 +- .../src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso | 2 +- test/Tests/src/Data/Ordering_Spec.enso | 2 +- test/Tests/src/Data/Pair_Spec.enso | 2 +- test/Tests/src/Data/Polyglot_Spec.enso | 2 +- test/Tests/src/Data/Problems_Spec.enso | 2 +- test/Tests/src/Data/Range_Spec.enso | 2 +- test/Tests/src/Data/Regression_Spec.enso | 2 +- test/Tests/src/Data/Set_Spec.enso | 2 +- test/Tests/src/Data/Statistics_Spec.enso | 2 +- test/Tests/src/Data/Text/Encoding_Spec.enso | 2 +- test/Tests/src/Data/Text/Parse_Spec.enso | 2 +- test/Tests/src/Data/Text/Regex_Spec.enso | 2 +- test/Tests/src/Data/Text/Span_Spec.enso | 2 +- test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso | 2 +- test/Tests/src/Data/Text/Utils_Spec.enso | 2 +- test/Tests/src/Data/Text_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Part_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Range_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Spec.enso | 2 +- test/Tests/src/Data/Time/Date_Time_Spec.enso | 2 +- test/Tests/src/Data/Time/Day_Of_Week_Spec.enso | 2 +- test/Tests/src/Data/Time/Duration_Spec.enso | 2 +- test/Tests/src/Data/Time/Period_Spec.enso | 2 +- test/Tests/src/Data/Time/Spec.enso | 2 +- test/Tests/src/Data/Time/Time_Of_Day_Spec.enso | 2 +- test/Tests/src/Data/Time/Time_Zone_Spec.enso | 2 +- test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso | 2 +- test/Tests/src/Data/Vector_Spec.enso | 2 +- test/Tests/src/Main.enso | 2 +- test/Tests/src/Network/Http/Header_Spec.enso | 2 +- test/Tests/src/Network/Http/Request_Spec.enso | 2 +- test/Tests/src/Network/Http_Spec.enso | 2 +- test/Tests/src/Network/URI_Spec.enso | 2 +- test/Tests/src/Random_Spec.enso | 2 +- test/Tests/src/Runtime/Lazy_Generator_Spec.enso | 2 +- test/Tests/src/Runtime/Lazy_Spec.enso | 2 +- test/Tests/src/Runtime/Managed_Resource_Spec.enso | 2 +- test/Tests/src/Runtime/Ref_Spec.enso | 2 +- test/Tests/src/Runtime/Stack_Traces_Spec.enso | 2 +- test/Tests/src/Semantic/Any_Spec.enso | 2 +- test/Tests/src/Semantic/Case_Spec.enso | 2 +- test/Tests/src/Semantic/Conversion_Spec.enso | 2 +- test/Tests/src/Semantic/Deep_Export/Spec.enso | 2 +- test/Tests/src/Semantic/Default_Args_Spec.enso | 2 +- test/Tests/src/Semantic/Equals_Spec.enso | 2 +- test/Tests/src/Semantic/Error_Spec.enso | 2 +- test/Tests/src/Semantic/Import_Loop/Spec.enso | 2 +- test/Tests/src/Semantic/Java_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Js_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Location_Spec.enso | 2 +- test/Tests/src/Semantic/Meta_Spec.enso | 2 +- test/Tests/src/Semantic/Names_Spec.enso | 2 +- test/Tests/src/Semantic/Python_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/R_Interop_Spec.enso | 2 +- test/Tests/src/Semantic/Runtime_Spec.enso | 2 +- test/Tests/src/Semantic/Self_Type_Spec.enso | 2 +- test/Tests/src/Semantic/Warnings_Spec.enso | 2 +- test/Tests/src/System/Environment_Spec.enso | 2 +- test/Tests/src/System/File_Read_Spec.enso | 2 +- test/Tests/src/System/File_Spec.enso | 2 +- test/Tests/src/System/Process_Spec.enso | 2 +- test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso | 2 +- test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso | 2 +- test/Tests/src/System/System_Spec.enso | 2 +- test/Visualization_Tests/src/Default_Visualizations_Spec.enso | 2 +- test/Visualization_Tests/src/Geo_Map_Spec.enso | 2 +- test/Visualization_Tests/src/Helpers.enso | 2 +- test/Visualization_Tests/src/Helpers_Spec.enso | 2 +- test/Visualization_Tests/src/Histogram_Spec.enso | 2 +- test/Visualization_Tests/src/Id_Spec.enso | 2 +- test/Visualization_Tests/src/Lazy_Table_Spec.enso | 2 +- test/Visualization_Tests/src/Lazy_Text_Spec.enso | 2 +- test/Visualization_Tests/src/SQL_Spec.enso | 2 +- test/Visualization_Tests/src/Scatter_Plot_Spec.enso | 2 +- test/Visualization_Tests/src/Table_Spec.enso | 2 +- test/Visualization_Tests/src/Visualization_Spec.enso | 2 +- test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso | 2 +- test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso | 2 +- test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso | 2 +- 155 files changed, 155 insertions(+), 155 deletions(-) diff --git a/test/Examples_Tests/src/Examples_Spec.enso b/test/Examples_Tests/src/Examples_Spec.enso index e4f63ecfb6bd..0662ddc7590a 100644 --- a/test/Examples_Tests/src/Examples_Spec.enso +++ b/test/Examples_Tests/src/Examples_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Examples from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions # While we're lacking the ability to run the documentation examples # automatically (#1706), these tests at least check that each of the examples diff --git a/test/Geo_Tests/src/Geo_Spec.enso b/test/Geo_Tests/src/Geo_Spec.enso index 975e26636127..9c589658a41a 100644 --- a/test/Geo_Tests/src/Geo_Spec.enso +++ b/test/Geo_Tests/src/Geo_Spec.enso @@ -4,7 +4,7 @@ import Standard.Table.Data.Table.Table import Standard.Geo from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Geo Points" <| diff --git a/test/Image_Tests/src/Data/Image_Spec.enso b/test/Image_Tests/src/Data/Image_Spec.enso index 6b62a3459fb7..176e207520e6 100644 --- a/test/Image_Tests/src/Data/Image_Spec.enso +++ b/test/Image_Tests/src/Data/Image_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Image, Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Image with 1 channel" <| diff --git a/test/Image_Tests/src/Data/Matrix_Spec.enso b/test/Image_Tests/src/Data/Matrix_Spec.enso index 7ab5986a0f77..b544981242bf 100644 --- a/test/Image_Tests/src/Data/Matrix_Spec.enso +++ b/test/Image_Tests/src/Data/Matrix_Spec.enso @@ -4,7 +4,7 @@ from Standard.Image import Matrix import Standard.Image.Data.Matrix_Error.Matrix_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Matrix_Error" <| diff --git a/test/Image_Tests/src/Image_Read_Write_Spec.enso b/test/Image_Tests/src/Image_Read_Write_Spec.enso index 178ed7198dd9..b69eb09695c5 100644 --- a/test/Image_Tests/src/Image_Read_Write_Spec.enso +++ b/test/Image_Tests/src/Image_Read_Write_Spec.enso @@ -7,7 +7,7 @@ from Standard.Image import Image, Read_Flag, Write_Flag import Standard.Image.Image_File_Format.Image_File_Format from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.System as Java_System diff --git a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso index 296e37312e9d..d041c839e3b4 100644 --- a/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/fail_report/Main.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso index e73674aef26b..353484a832a5 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_1/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso index 3505ee51417a..4161a43303b4 100644 --- a/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso +++ b/test/Meta_Test_Suite_Tests/data/with_clue_2/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Tests" <| Test.specify "some property" <| diff --git a/test/Meta_Test_Suite_Tests/src/Main.enso b/test/Meta_Test_Suite_Tests/src/Main.enso index 7f0329317215..5d50802dbe51 100644 --- a/test/Meta_Test_Suite_Tests/src/Main.enso +++ b/test/Meta_Test_Suite_Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Setup Config command args diff --git a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso index efe1dc4375b5..f39d8a8df8ec 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import Missing_Input_Columns, Duplicate_Output_Column_Names, Floating_Point_Equality from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso index 179665778645..debe577c718a 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso index d7f439b4fdc4..98975fc93a04 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import all from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso index a8d8e655a8a8..3ff920c70ec2 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import Missing_Input_Columns, Conversion_Failure from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso index fa7e8cbda4bd..ae7842786fb0 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all import Standard.Table.Data.Expression.Expression_Error from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso index f2c6e41295a7..7e835290d271 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso @@ -8,7 +8,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso index 6175bfc75cec..c0ca07099ce1 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion, Invalid_Value_Type from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso index 25248206120d..84d7d698cc34 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso index 5ccb84b1242b..f2b0d71a6298 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso @@ -10,7 +10,7 @@ import Standard.Table.Data.Expression.Expression_Error from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso index d42ff7f5eeb1..08ad71d44657 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso @@ -11,7 +11,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso index 23250b03352e..8ae48df0538e 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso @@ -5,7 +5,7 @@ from Standard.Table import all hiding Table from Standard.Table.Data.Aggregate_Column.Aggregate_Column import Group_By, Count, Sum from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend from project.Common_Table_Operations.Core_Spec import weird_names diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso index 835a025a170b..3f60df4ca93a 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Cross_Join_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso index a5e81048656f..aca32726a746 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso index 5b8665174fee..91e6440caf73 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table import project.Util diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso index 16291ce2a787..5011cf4095c3 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso index df3d65d3a0e5..bd00c3e25322 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import all from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso index 17b2d8281ae9..61360a890f92 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Sort_Column from Standard.Table.Errors import all from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso index f486b3304c62..9c630a0ffd40 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table.Data.Column_Selector.Column_Selector import By_Name from Standard.Table.Errors import all from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import expect_column_names, run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso index 409d297616b6..711d1a11f147 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table.Errors import all from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso index 6bbf08fa69e5..cfcab8498c5f 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Transpose_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table.Errors import all from Standard.Test import Test, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Common_Table_Operations.Util import run_default_backend diff --git a/test/Table_Tests/src/Common_Table_Operations/Util.enso b/test/Table_Tests/src/Common_Table_Operations/Util.enso index 5ae2b78faffe..3ea6969fff2e 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Util.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Util.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.In_Memory.Common_Spec as In_Memory_Table_Spec diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index 8b17b22a43a9..4fa1bd950704 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database.Data.Table import fresh_names from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Database.Helpers.Fake_Test_Connection diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index 03e68ecaa875..b07f0f7cb529 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import all from Standard.Database.Errors import all from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Util import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index 13b518b5bbce..bc3c205e2d2d 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Environment import project.Database.Common_Spec diff --git a/test/Table_Tests/src/Database/Redshift_Spec.enso b/test/Table_Tests/src/Database/Redshift_Spec.enso index 88e5c78125e2..fa61748f7ab5 100644 --- a/test/Table_Tests/src/Database/Redshift_Spec.enso +++ b/test/Table_Tests/src/Database/Redshift_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import Database, SQL_Query from Standard.AWS import Redshift, AWS_Credential from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Database.Common_Spec import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso index 22ff8a459632..980367c78cbf 100644 --- a/test/Table_Tests/src/Database/SQLite_Spec.enso +++ b/test/Table_Tests/src/Database/SQLite_Spec.enso @@ -9,7 +9,7 @@ from Standard.Database import all from Standard.Database.Errors import SQL_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Database.Common_Spec import project.Database.Upload_Spec diff --git a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso index 3288e6c4eda2..ab7ab6962491 100644 --- a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table.Errors import Inexact_Type_Coercion from Standard.Database import SQL_Query from Standard.Test import Problems, Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Database.Helpers.Name_Generator from project.Database.Postgres_Spec import create_connection_builder diff --git a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso index 1bc13ca4ad32..4ff60f59c6a2 100644 --- a/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso +++ b/test/Table_Tests/src/Database/Types/SQLite_Type_Mapping_Spec.enso @@ -12,7 +12,7 @@ from Standard.Database import Database, SQLite, In_Memory, SQL_Query from Standard.Database.Errors import Unsupported_Database_Operation from Standard.Test import Problems, Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Table_Tests/src/Database/Upload_Spec.enso b/test/Table_Tests/src/Database/Upload_Spec.enso index c216f114ea29..f5794df8cbb2 100644 --- a/test/Table_Tests/src/Database/Upload_Spec.enso +++ b/test/Table_Tests/src/Database/Upload_Spec.enso @@ -10,7 +10,7 @@ from Standard.Database.Internal.Result_Set import result_set_to_table from Standard.Database.Extensions.Upload_Default_Helpers import get_primary_key from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Database.Helpers.Name_Generator diff --git a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso index dcbb596dff6f..3fa504df6a2a 100644 --- a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso +++ b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Custom_Type Value field diff --git a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso index a1752dc35285..95565e66e6da 100644 --- a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso +++ b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table.Data.Type.Value_Type import Value_Type, Auto from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Util diff --git a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso index 178e387251bd..c9d3ef258fd1 100644 --- a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso +++ b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Table.Internal.Unique_Name_Strategy.Unique_Name_Strategy from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group 'Unique_Name_Strategy Helper' <| diff --git a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso index 018781b0c110..876018133e95 100644 --- a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso +++ b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Data.Type.Value_Type_Helpers from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Value_Type" <| diff --git a/test/Table_Tests/src/IO/Csv_Spec.enso b/test/Table_Tests/src/IO/Csv_Spec.enso index 400563d8c539..78bc0aab320f 100644 --- a/test/Table_Tests/src/IO/Csv_Spec.enso +++ b/test/Table_Tests/src/IO/Csv_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Table, Column, Delimited import Standard.Table.Main as Table_Module from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all diff --git a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso index f28c1e5fe578..a32002b94598 100644 --- a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso @@ -9,7 +9,7 @@ import Standard.Table.Main as Table_Module from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Util diff --git a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso index 93bcb738d365..a732b73da59e 100644 --- a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso +++ b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Table, Column, Data_Formatter, Quote_Style, Match_Col from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all diff --git a/test/Table_Tests/src/IO/Excel_Spec.enso b/test/Table_Tests/src/IO/Excel_Spec.enso index 3c5b68db5006..5e209a763cf0 100644 --- a/test/Table_Tests/src/IO/Excel_Spec.enso +++ b/test/Table_Tests/src/IO/Excel_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Table, Match_Columns, Excel, Excel_Range, Data_Format from Standard.Table.Errors import Invalid_Output_Column_Names, Duplicate_Output_Column_Names, Invalid_Location, Range_Exceeded, Existing_Data, Column_Count_Mismatch, Column_Name_Mismatch, Empty_Sheet_Error from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Examples diff --git a/test/Table_Tests/src/IO/Formats_Spec.enso b/test/Table_Tests/src/IO/Formats_Spec.enso index 1cc5edeb1aca..d539d3590ddb 100644 --- a/test/Table_Tests/src/IO/Formats_Spec.enso +++ b/test/Table_Tests/src/IO/Formats_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import all import Standard.Table.Errors.Invalid_JSON_Format from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Util diff --git a/test/Table_Tests/src/IO/Json_Spec.enso b/test/Table_Tests/src/IO/Json_Spec.enso index 0beb43fe77b9..673db873b0d2 100644 --- a/test/Table_Tests/src/IO/Json_Spec.enso +++ b/test/Table_Tests/src/IO/Json_Spec.enso @@ -3,7 +3,7 @@ from Standard.Table import Table import Standard.Table.Data.Table_Conversions from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Util diff --git a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso index f6babea2e334..1c5c9b596ef8 100644 --- a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso @@ -8,7 +8,7 @@ import Standard.Table.Internal.Aggregate_Column_Helper import Standard.Table.Internal.Problem_Builder.Problem_Builder from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Aggregate Columns" <| simple_table = Table.new [["count", [1, 2, Nothing, 3, Nothing]], ["is_valid", [Nothing, False, True, False, Nothing]], ["float", [3.4, 1, 5.6, 2.1, Nothing]], ["text", ["A", "", Nothing, "B,C", Nothing]]] diff --git a/test/Table_Tests/src/In_Memory/Builders_Spec.enso b/test/Table_Tests/src/In_Memory/Builders_Spec.enso index 386140515ae9..33f1aa9479f2 100644 --- a/test/Table_Tests/src/In_Memory/Builders_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Builders_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Column import Standard.Table.Internal.Java_Exports from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My Data x y diff --git a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso index e5ce5dc6d570..30abd594bb05 100644 --- a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso @@ -7,7 +7,7 @@ from Standard.Table import Column, Value_Type from Standard.Table.Errors import Invalid_Value_Type from Standard.Table.Internal.Column_Format import all -from Standard.Test.Extensions import all +import Standard.Test.Extensions from Standard.Test import Test, Test_Suite from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Column_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Spec.enso index 5aea6d91668f..f2b2eeeeba94 100644 --- a/test/Table_Tests/src/In_Memory/Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Spec.enso @@ -5,7 +5,7 @@ import project.Util import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Examples -from Standard.Test.Extensions import all +import Standard.Test.Extensions from Standard.Table import Column, Value_Type from Standard.Table.Errors import Invalid_Value_Type diff --git a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso index 04e0364bbefe..5014a25555f1 100644 --- a/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Join_Performance_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso index c15c5c740b75..eb2c1ab25a2e 100644 --- a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Data.Text.Regex.Regex_Syntax_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Table.Data.Table_Conversions -from Standard.Test.Extensions import all +import Standard.Test.Extensions from Standard.Table import Table from Standard.Table.Data.Type.Value_Type import Bits, Value_Type diff --git a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso index 2ecbd0c6c672..f9cd354c65e5 100644 --- a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso @@ -1,6 +1,6 @@ from Standard.Base import all -from Standard.Test.Extensions import all +import Standard.Test.Extensions from Standard.Table import Table from Standard.Table.Errors import Invalid_Value_Type, Column_Count_Exceeded, Duplicate_Output_Column_Names, No_Such_Column diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso index 3458b3e2720f..c5509d2b1281 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all spec = diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso index ee78180ff9c7..a723f22c01b9 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Spec.enso index e958c0b7c546..6b85e554cdf5 100644 --- a/test/Table_Tests/src/In_Memory/Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Spec.enso @@ -17,7 +17,7 @@ import Standard.Database.Extensions.Upload_In_Memory_Table from Standard.Database import Database, SQLite, In_Memory from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all diff --git a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso index bfc7c9b0077e..815f933d7285 100644 --- a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso @@ -5,7 +5,7 @@ import Standard.Table.Data.Table_Conversions import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Util import all diff --git a/test/Table_Tests/src/Util.enso b/test/Table_Tests/src/Util.enso index 1faf83d5e074..3d586781b417 100644 --- a/test/Table_Tests/src/Util.enso +++ b/test/Table_Tests/src/Util.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Table, Column from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Result.Test_Result polyglot java import org.enso.base_test_helpers.FileSystemHelper diff --git a/test/Tests/src/Data/Array_Polyglot_Spec.enso b/test/Tests/src/Data/Array_Polyglot_Spec.enso index 8ec5f8d204eb..ca4d036bf359 100644 --- a/test/Tests/src/Data/Array_Polyglot_Spec.enso +++ b/test/Tests/src/Data/Array_Polyglot_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "JavaScript Objects, Arrays & Functions" <| diff --git a/test/Tests/src/Data/Array_Proxy_Spec.enso b/test/Tests/src/Data/Array_Proxy_Spec.enso index 360fc8b26dbd..e083c7b9f3d9 100644 --- a/test/Tests/src/Data/Array_Proxy_Spec.enso +++ b/test/Tests/src/Data/Array_Proxy_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Proxy_Object Value length diff --git a/test/Tests/src/Data/Array_Spec.enso b/test/Tests/src/Data/Array_Spec.enso index 58d86dd85263..86581f37d9f0 100644 --- a/test/Tests/src/Data/Array_Spec.enso +++ b/test/Tests/src/Data/Array_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions Array.method self = 0 diff --git a/test/Tests/src/Data/Bool_Spec.enso b/test/Tests/src/Data/Bool_Spec.enso index deef558ebfd8..0d866167618c 100644 --- a/test/Tests/src/Data/Bool_Spec.enso +++ b/test/Tests/src/Data/Bool_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions Boolean.method self = self diff --git a/test/Tests/src/Data/Function_Spec.enso b/test/Tests/src/Data/Function_Spec.enso index 8bae54083bc9..05290ea3a1ec 100644 --- a/test/Tests/src/Data/Function_Spec.enso +++ b/test/Tests/src/Data/Function_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "identity" <| diff --git a/test/Tests/src/Data/Interval_Spec.enso b/test/Tests/src/Data/Interval_Spec.enso index 339fd11c64d3..5c0978268d80 100644 --- a/test/Tests/src/Data/Interval_Spec.enso +++ b/test/Tests/src/Data/Interval_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Bound" <| diff --git a/test/Tests/src/Data/Json_Spec.enso b/test/Tests/src/Data/Json_Spec.enso index fd20ef305275..fe93655766ea 100644 --- a/test/Tests/src/Data/Json_Spec.enso +++ b/test/Tests/src/Data/Json_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.No_Such_Key.No_Such_Key from Standard.Base.Data.Json import Invalid_JSON from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Result.Test_Result type Author diff --git a/test/Tests/src/Data/List_Spec.enso b/test/Tests/src/Data/List_Spec.enso index 403890c1282f..a0d0d3d0d820 100644 --- a/test/Tests/src/Data/List_Spec.enso +++ b/test/Tests/src/Data/List_Spec.enso @@ -7,7 +7,7 @@ import Standard.Base.Errors.Common.Unsupported_Argument_Types import Standard.Base.Runtime.State from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "List" <| l = List.Cons 1 <| List.Cons 2 <| List.Cons 3 <| List.Nil diff --git a/test/Tests/src/Data/Locale_Spec.enso b/test/Tests/src/Data/Locale_Spec.enso index 1a9276881a28..2338116a68fd 100644 --- a/test/Tests/src/Data/Locale_Spec.enso +++ b/test/Tests/src/Data/Locale_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Metadata.Choice import Option from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.util.Locale as JavaLocale diff --git a/test/Tests/src/Data/Map_Spec.enso b/test/Tests/src/Data/Map_Spec.enso index 065e4502a85e..375ccd8cf489 100644 --- a/test/Tests/src/Data/Map_Spec.enso +++ b/test/Tests/src/Data/Map_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Errors.No_Such_Key.No_Such_Key from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Map as JavaMap diff --git a/test/Tests/src/Data/Maybe_Spec.enso b/test/Tests/src/Data/Maybe_Spec.enso index 4cc01199cc51..467148bdbd90 100644 --- a/test/Tests/src/Data/Maybe_Spec.enso +++ b/test/Tests/src/Data/Maybe_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Maybe" <| Test.specify "should have a None variant" <| diff --git a/test/Tests/src/Data/Noise/Generator_Spec.enso b/test/Tests/src/Data/Noise/Generator_Spec.enso index b511908c02b3..708d1c4cc056 100644 --- a/test/Tests/src/Data/Noise/Generator_Spec.enso +++ b/test/Tests/src/Data/Noise/Generator_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Unimplemented.Unimplemented import Standard.Base.Data.Noise.Deterministic_Random from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Deterministic Random Noise Generator" <| diff --git a/test/Tests/src/Data/Noise_Spec.enso b/test/Tests/src/Data/Noise_Spec.enso index 77f7036fabbc..65664cd4e4be 100644 --- a/test/Tests/src/Data/Noise_Spec.enso +++ b/test/Tests/src/Data/Noise_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Generator My_Generator.step self _ _ = 1 diff --git a/test/Tests/src/Data/Numbers_Spec.enso b/test/Tests/src/Data/Numbers_Spec.enso index b737d30c6040..1663c79092b5 100644 --- a/test/Tests/src/Data/Numbers_Spec.enso +++ b/test/Tests/src/Data/Numbers_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Numbers import Number_Parse_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions Integer.is_even self = self % 2 == 0 diff --git a/test/Tests/src/Data/Ordering/Comparator_Spec.enso b/test/Tests/src/Data/Ordering/Comparator_Spec.enso index a7ef4ef9dd13..d9e6a0df7cfe 100644 --- a/test/Tests/src/Data/Ordering/Comparator_Spec.enso +++ b/test/Tests/src/Data/Ordering/Comparator_Spec.enso @@ -6,7 +6,7 @@ polyglot java import org.enso.base.ObjectComparator polyglot java import org.enso.base.CompareException from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso index 5188c0750937..0ff14dbefcff 100644 --- a/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Natural_Order_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Natural Order" <| case_insensitive_compare a b = Natural_Order.compare a b Case_Sensitivity.Insensitive diff --git a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso index b40963131cb4..f96403578b26 100644 --- a/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso +++ b/test/Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Data.Ordering.Vector_Lexicographic_Order from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type Value a b diff --git a/test/Tests/src/Data/Ordering_Spec.enso b/test/Tests/src/Data/Ordering_Spec.enso index 5e0bd7f90850..098e44f34cc3 100644 --- a/test/Tests/src/Data/Ordering_Spec.enso +++ b/test/Tests/src/Data/Ordering_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Common.Type_Error from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Pair_Spec.enso b/test/Tests/src/Data/Pair_Spec.enso index f74fa100244b..7c1846e5279e 100644 --- a/test/Tests/src/Data/Pair_Spec.enso +++ b/test/Tests/src/Data/Pair_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Common.Not_Found from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type_spec name ctor = Test.group name <| Test.specify "should allow mapping" <| diff --git a/test/Tests/src/Data/Polyglot_Spec.enso b/test/Tests/src/Data/Polyglot_Spec.enso index 37a46a54e6d7..4db1cdd426a7 100644 --- a/test/Tests/src/Data/Polyglot_Spec.enso +++ b/test/Tests/src/Data/Polyglot_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.Double polyglot java import java.lang.Integer diff --git a/test/Tests/src/Data/Problems_Spec.enso b/test/Tests/src/Data/Problems_Spec.enso index 6ccffdeb323f..92bfabe2e7c1 100644 --- a/test/Tests/src/Data/Problems_Spec.enso +++ b/test/Tests/src/Data/Problems_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Range_Spec.enso b/test/Tests/src/Data/Range_Spec.enso index 73d2d0871d07..a875a2700f88 100644 --- a/test/Tests/src/Data/Range_Spec.enso +++ b/test/Tests/src/Data/Range_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Range" <| Test.specify "should be created with a start, an end and a step" <| diff --git a/test/Tests/src/Data/Regression_Spec.enso b/test/Tests/src/Data/Regression_Spec.enso index 47709c5cabd0..15862d51e56e 100644 --- a/test/Tests/src/Data/Regression_Spec.enso +++ b/test/Tests/src/Data/Regression_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import Nothing, Vector, Number, Decimal, True, False, Regress import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = ## Regression test data produced using an Excel spreadsheet. diff --git a/test/Tests/src/Data/Set_Spec.enso b/test/Tests/src/Data/Set_Spec.enso index 2f077496f6c5..13deef702dad 100644 --- a/test/Tests/src/Data/Set_Spec.enso +++ b/test/Tests/src/Data/Set_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Enso Set" <| diff --git a/test/Tests/src/Data/Statistics_Spec.enso b/test/Tests/src/Data/Statistics_Spec.enso index f8fc0b52e650..e06ef22d700e 100644 --- a/test/Tests/src/Data/Statistics_Spec.enso +++ b/test/Tests/src/Data/Statistics_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions # === Test Resources === diff --git a/test/Tests/src/Data/Text/Encoding_Spec.enso b/test/Tests/src/Data/Text/Encoding_Spec.enso index e1091765f092..bb8bc6a99fba 100644 --- a/test/Tests/src/Data/Text/Encoding_Spec.enso +++ b/test/Tests/src/Data/Text/Encoding_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.String as Java_String diff --git a/test/Tests/src/Data/Text/Parse_Spec.enso b/test/Tests/src/Data/Text/Parse_Spec.enso index 0110e9916bd7..42b925991871 100644 --- a/test/Tests/src/Data/Text/Parse_Spec.enso +++ b/test/Tests/src/Data/Text/Parse_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error import Standard.Base.Errors.Time_Error.Time_Error -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Base.Data.Json.Invalid_JSON import Standard.Base.Data.Numbers.Number_Parse_Error diff --git a/test/Tests/src/Data/Text/Regex_Spec.enso b/test/Tests/src/Data/Text/Regex_Spec.enso index 36db6e78a962..cbd9d3e14905 100644 --- a/test/Tests/src/Data/Text/Regex_Spec.enso +++ b/test/Tests/src/Data/Text/Regex_Spec.enso @@ -12,7 +12,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Base.Data.Text.Regex.Replacer import get_lru_size, replacer_cache_lookup from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import org.enso.base.Replacer_Cache diff --git a/test/Tests/src/Data/Text/Span_Spec.enso b/test/Tests/src/Data/Text/Span_Spec.enso index d72d30e98646..28fbde8d30f5 100644 --- a/test/Tests/src/Data/Text/Span_Spec.enso +++ b/test/Tests/src/Data/Text/Span_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Data.Text.Span.Span import Standard.Base.Data.Text.Span.Utf_16_Span from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Text.Span" <| diff --git a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso index f2bb0da5353b..d32f684c9c93 100644 --- a/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso +++ b/test/Tests/src/Data/Text/Text_Sub_Range_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Data.Text.Text_Sub_Range import character_ranges from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Text_Sub_Range_Data" <| Test.specify "should correctly split a text into grapheme cluster ranges expressed in codepoint indices" <| diff --git a/test/Tests/src/Data/Text/Utils_Spec.enso b/test/Tests/src/Data/Text/Utils_Spec.enso index 0512ccbc53a8..97d08dcd987c 100644 --- a/test/Tests/src/Data/Text/Utils_Spec.enso +++ b/test/Tests/src/Data/Text/Utils_Spec.enso @@ -5,7 +5,7 @@ polyglot java import org.enso.base.text.CaseFoldedString polyglot java import com.ibm.icu.text.BreakIterator from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.Exception as JException diff --git a/test/Tests/src/Data/Text_Spec.enso b/test/Tests/src/Data/Text_Spec.enso index 4589dace2ff6..8dae329fc6b6 100644 --- a/test/Tests/src/Data/Text_Spec.enso +++ b/test/Tests/src/Data/Text_Spec.enso @@ -12,7 +12,7 @@ from Standard.Base.Data.Text.Text_Sub_Range.Text_Sub_Range import all from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Auto Value a diff --git a/test/Tests/src/Data/Time/Date_Part_Spec.enso b/test/Tests/src/Data/Time/Date_Part_Spec.enso index 6ecd33f557be..61178f8be9e1 100644 --- a/test/Tests/src/Data/Time/Date_Part_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Part_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec name create_new_date = Test.group (name + "date part tests") <| diff --git a/test/Tests/src/Data/Time/Date_Range_Spec.enso b/test/Tests/src/Data/Time/Date_Range_Spec.enso index 3ee4f7231369..20fe0933ef22 100644 --- a/test/Tests/src/Data/Time/Date_Range_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Range_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Problems, Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions main = Test_Suite.run_main spec diff --git a/test/Tests/src/Data/Time/Date_Spec.enso b/test/Tests/src/Data/Time/Date_Spec.enso index 4f2631b03ef0..723479443b10 100644 --- a/test/Tests/src/Data/Time/Date_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Problems, Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Date_Time_Spec.enso b/test/Tests/src/Data/Time/Date_Time_Spec.enso index 577dc64fa33d..e851257b4f9d 100644 --- a/test/Tests/src/Data/Time/Date_Time_Spec.enso +++ b/test/Tests/src/Data/Time/Date_Time_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Data.Time.Date_Part_Spec diff --git a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso index e664ee7c7b03..b7c8d8ae231a 100644 --- a/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso +++ b/test/Tests/src/Data/Time/Day_Of_Week_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Day_Of_Week conversions" <| diff --git a/test/Tests/src/Data/Time/Duration_Spec.enso b/test/Tests/src/Data/Time/Duration_Spec.enso index ea5609a83d5b..0d0d45a136bb 100644 --- a/test/Tests/src/Data/Time/Duration_Spec.enso +++ b/test/Tests/src/Data/Time/Duration_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Incomparable_Values import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.time.Duration as Java_Duration polyglot java import java.time.LocalDate diff --git a/test/Tests/src/Data/Time/Period_Spec.enso b/test/Tests/src/Data/Time/Period_Spec.enso index fa7189fcbe71..9895ae126861 100644 --- a/test/Tests/src/Data/Time/Period_Spec.enso +++ b/test/Tests/src/Data/Time/Period_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Incomparable_Values from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Period" <| diff --git a/test/Tests/src/Data/Time/Spec.enso b/test/Tests/src/Data/Time/Spec.enso index 505c7cc7bdd4..1322d2dd627c 100644 --- a/test/Tests/src/Data/Time/Spec.enso +++ b/test/Tests/src/Data/Time/Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Data.Time.Duration_Spec import project.Data.Time.Period_Spec diff --git a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso index 22feab2af6a5..20c0f172a7d4 100644 --- a/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Of_Day_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.time.LocalTime polyglot java import java.time.format.DateTimeFormatter diff --git a/test/Tests/src/Data/Time/Time_Zone_Spec.enso b/test/Tests/src/Data/Time/Time_Zone_Spec.enso index 0f89cc453427..9190ed5313dd 100644 --- a/test/Tests/src/Data/Time/Time_Zone_Spec.enso +++ b/test/Tests/src/Data/Time/Time_Zone_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Time_Error.Time_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.time.ZoneId polyglot java import java.time.ZoneOffset diff --git a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso index 57d535fc7d25..2842241f15f9 100644 --- a/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso +++ b/test/Tests/src/Data/Vector/Slicing_Helpers_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Base.Data.Index_Sub_Range import sort_and_merge_ranges from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Vector Slicing Helpers" <| Test.specify "should be able to sort correctly merge neighboring sequences" <| diff --git a/test/Tests/src/Data/Vector_Spec.enso b/test/Tests/src/Data/Vector_Spec.enso index 5ef2a4188f9e..9ed592143ad4 100644 --- a/test/Tests/src/Data/Vector_Spec.enso +++ b/test/Tests/src/Data/Vector_Spec.enso @@ -12,7 +12,7 @@ import Standard.Base.Runtime.Ref.Ref from Standard.Base.Data.Index_Sub_Range.Index_Sub_Range import While, By_Index, Sample, Every from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.util.ArrayList diff --git a/test/Tests/src/Main.enso b/test/Tests/src/Main.enso index ddbb1052114a..15ebd49f9447 100644 --- a/test/Tests/src/Main.enso +++ b/test/Tests/src/Main.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Semantic.Any_Spec import project.Semantic.Case_Spec diff --git a/test/Tests/src/Network/Http/Header_Spec.enso b/test/Tests/src/Network/Http/Header_Spec.enso index cadaa8be7692..4d90cfe25762 100644 --- a/test/Tests/src/Network/Http/Header_Spec.enso +++ b/test/Tests/src/Network/Http/Header_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Header" <| diff --git a/test/Tests/src/Network/Http/Request_Spec.enso b/test/Tests/src/Network/Http/Request_Spec.enso index 0f06080531ad..a27989dbcab5 100644 --- a/test/Tests/src/Network/Http/Request_Spec.enso +++ b/test/Tests/src/Network/Http/Request_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Network.HTTP.Request.Request import Standard.Base.Network.HTTP.Request_Body.Request_Body from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = test_uri = URI.parse "https://httpbin.org/post" diff --git a/test/Tests/src/Network/Http_Spec.enso b/test/Tests/src/Network/Http_Spec.enso index 2c270fb06088..57affaae8afb 100644 --- a/test/Tests/src/Network/Http_Spec.enso +++ b/test/Tests/src/Network/Http_Spec.enso @@ -8,7 +8,7 @@ import Standard.Base.Network.HTTP.Request_Error import Standard.Base.Network.Proxy.Proxy from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.System as Java_System diff --git a/test/Tests/src/Network/URI_Spec.enso b/test/Tests/src/Network/URI_Spec.enso index d282e4dff531..b73853a5c0b4 100644 --- a/test/Tests/src/Network/URI_Spec.enso +++ b/test/Tests/src/Network/URI_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Syntax_Error from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "URI" <| diff --git a/test/Tests/src/Random_Spec.enso b/test/Tests/src/Random_Spec.enso index 9414a1106809..7896d8efa797 100644 --- a/test/Tests/src/Random_Spec.enso +++ b/test/Tests/src/Random_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Random" <| ## Random number generator seeded to make the test deterministic diff --git a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso index 1fc3596bdb74..0c1650258198 100644 --- a/test/Tests/src/Runtime/Lazy_Generator_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Generator_Spec.enso @@ -1,5 +1,5 @@ from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Generator Value h t diff --git a/test/Tests/src/Runtime/Lazy_Spec.enso b/test/Tests/src/Runtime/Lazy_Spec.enso index 34c90ff3d610..e024ed534e37 100644 --- a/test/Tests/src/Runtime/Lazy_Spec.enso +++ b/test/Tests/src/Runtime/Lazy_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Runtime.Ref.Ref import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type Lazy Value ~get diff --git a/test/Tests/src/Runtime/Managed_Resource_Spec.enso b/test/Tests/src/Runtime/Managed_Resource_Spec.enso index 5133847ae1e7..faeb79acde7e 100644 --- a/test/Tests/src/Runtime/Managed_Resource_Spec.enso +++ b/test/Tests/src/Runtime/Managed_Resource_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Managed_Resource.Managed_Resource from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Managed_Resource" <| Test.specify "should call the destructor even if the action fails" <| diff --git a/test/Tests/src/Runtime/Ref_Spec.enso b/test/Tests/src/Runtime/Ref_Spec.enso index 76645154bd8c..64dd1a3a583c 100644 --- a/test/Tests/src/Runtime/Ref_Spec.enso +++ b/test/Tests/src/Runtime/Ref_Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import Standard.Base.Runtime.Ref.Ref from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Refs" <| Test.specify "should be able to store and retrieve value in references" <| diff --git a/test/Tests/src/Runtime/Stack_Traces_Spec.enso b/test/Tests/src/Runtime/Stack_Traces_Spec.enso index affa81202981..713414667774 100644 --- a/test/Tests/src/Runtime/Stack_Traces_Spec.enso +++ b/test/Tests/src/Runtime/Stack_Traces_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type diff --git a/test/Tests/src/Semantic/Any_Spec.enso b/test/Tests/src/Semantic/Any_Spec.enso index ba4581193f03..46a2b06cc95c 100644 --- a/test/Tests/src/Semantic/Any_Spec.enso +++ b/test/Tests/src/Semantic/Any_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Semantic.Definitions.Any_Types import all spec = diff --git a/test/Tests/src/Semantic/Case_Spec.enso b/test/Tests/src/Semantic/Case_Spec.enso index d927fae7aa90..11a4bb598c2b 100644 --- a/test/Tests/src/Semantic/Case_Spec.enso +++ b/test/Tests/src/Semantic/Case_Spec.enso @@ -11,7 +11,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.List as Java_List from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Pattern Matches" <| Test.specify "should be able to match on the Boolean type" <| diff --git a/test/Tests/src/Semantic/Conversion_Spec.enso b/test/Tests/src/Semantic/Conversion_Spec.enso index 554049b49853..5d2eec40efa2 100644 --- a/test/Tests/src/Semantic/Conversion_Spec.enso +++ b/test/Tests/src/Semantic/Conversion_Spec.enso @@ -4,7 +4,7 @@ import project.Semantic.Conversion.Methods import project.Semantic.Conversion.Types from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.Object diff --git a/test/Tests/src/Semantic/Deep_Export/Spec.enso b/test/Tests/src/Semantic/Deep_Export/Spec.enso index 5f8442a34389..1ddb32bf3bb0 100644 --- a/test/Tests/src/Semantic/Deep_Export/Spec.enso +++ b/test/Tests/src/Semantic/Deep_Export/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Deep_Export.Internal from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Deep Exports" <| diff --git a/test/Tests/src/Semantic/Default_Args_Spec.enso b/test/Tests/src/Semantic/Default_Args_Spec.enso index c5b1840b492a..e486820eea8c 100644 --- a/test/Tests/src/Semantic/Default_Args_Spec.enso +++ b/test/Tests/src/Semantic/Default_Args_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Semantic.Default_Args_Spec.Box import all diff --git a/test/Tests/src/Semantic/Equals_Spec.enso b/test/Tests/src/Semantic/Equals_Spec.enso index 678476d0fcf5..ced1df6a608f 100644 --- a/test/Tests/src/Semantic/Equals_Spec.enso +++ b/test/Tests/src/Semantic/Equals_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.nio.file.Path as JavaPath polyglot java import java.util.Random as Java_Random diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso index 6bc4c4b9d09f..6d32a7258240 100644 --- a/test/Tests/src/Semantic/Error_Spec.enso +++ b/test/Tests/src/Semantic/Error_Spec.enso @@ -12,7 +12,7 @@ polyglot java import java.util.ArrayList polyglot java import java.util.Random as Java_Random from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type Value foo diff --git a/test/Tests/src/Semantic/Import_Loop/Spec.enso b/test/Tests/src/Semantic/Import_Loop/Spec.enso index 02cfd9fd1a00..3649b1f76660 100644 --- a/test/Tests/src/Semantic/Import_Loop/Spec.enso +++ b/test/Tests/src/Semantic/Import_Loop/Spec.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Semantic.Import_Loop.B from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Looping Imports" <| Test.specify "should behave correctly and not loop the compiler" <| diff --git a/test/Tests/src/Semantic/Java_Interop_Spec.enso b/test/Tests/src/Semantic/Java_Interop_Spec.enso index 9d2b91d06f53..0d62618f1e59 100644 --- a/test/Tests/src/Semantic/Java_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Java_Interop_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions polyglot java import java.lang.Float polyglot java import java.lang.Integer as Java_Integer diff --git a/test/Tests/src/Semantic/Js_Interop_Spec.enso b/test/Tests/src/Semantic/Js_Interop_Spec.enso index cba4189acae3..798e05b28f89 100644 --- a/test/Tests/src/Semantic/Js_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Js_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Meta_Location_Spec.enso b/test/Tests/src/Semantic/Meta_Location_Spec.enso index 547cc7f6a55b..40dfe9d69a63 100644 --- a/test/Tests/src/Semantic/Meta_Location_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Location_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type Value foo bar baz diff --git a/test/Tests/src/Semantic/Meta_Spec.enso b/test/Tests/src/Semantic/Meta_Spec.enso index ca6d8ef79326..8f01de54ed9b 100644 --- a/test/Tests/src/Semantic/Meta_Spec.enso +++ b/test/Tests/src/Semantic/Meta_Spec.enso @@ -12,7 +12,7 @@ polyglot java import java.util.Random as Java_Random polyglot java import java.util.Locale as JavaLocale from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Result.Test_Result type My_Type diff --git a/test/Tests/src/Semantic/Names_Spec.enso b/test/Tests/src/Semantic/Names_Spec.enso index 4dbf583a28be..765e26de685d 100644 --- a/test/Tests/src/Semantic/Names_Spec.enso +++ b/test/Tests/src/Semantic/Names_Spec.enso @@ -4,7 +4,7 @@ from project.Semantic.Definitions.Names import another_method, another_constant, import project.Semantic.Definitions.Names from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions Names.Foo.my_method self = case self of Names.Foo.Value x y z -> x * y * z diff --git a/test/Tests/src/Semantic/Python_Interop_Spec.enso b/test/Tests/src/Semantic/Python_Interop_Spec.enso index e7a193a18f2e..d3ad1b1570c5 100644 --- a/test/Tests/src/Semantic/Python_Interop_Spec.enso +++ b/test/Tests/src/Semantic/Python_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions foreign python my_method a b = """ return a + b diff --git a/test/Tests/src/Semantic/R_Interop_Spec.enso b/test/Tests/src/Semantic/R_Interop_Spec.enso index 3ae3da33360b..28d721d2214c 100644 --- a/test/Tests/src/Semantic/R_Interop_Spec.enso +++ b/test/Tests/src/Semantic/R_Interop_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions foreign js my_method a b = """ return a + b; diff --git a/test/Tests/src/Semantic/Runtime_Spec.enso b/test/Tests/src/Semantic/Runtime_Spec.enso index edaafa192948..55a3d22d5f18 100644 --- a/test/Tests/src/Semantic/Runtime_Spec.enso +++ b/test/Tests/src/Semantic/Runtime_Spec.enso @@ -6,7 +6,7 @@ import Standard.Base.Panic.Panic from Standard.Base.Runtime.Context import Input, Output from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions in_fn : Integer -> Integer in_fn a = Input.if_enabled (a * 2) diff --git a/test/Tests/src/Semantic/Self_Type_Spec.enso b/test/Tests/src/Semantic/Self_Type_Spec.enso index a4ed9b18616b..7b620f70900c 100644 --- a/test/Tests/src/Semantic/Self_Type_Spec.enso +++ b/test/Tests/src/Semantic/Self_Type_Spec.enso @@ -1,6 +1,6 @@ from Standard.Base import all from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type Cons_A x diff --git a/test/Tests/src/Semantic/Warnings_Spec.enso b/test/Tests/src/Semantic/Warnings_Spec.enso index e3b3acfc8f53..fd52d72289da 100644 --- a/test/Tests/src/Semantic/Warnings_Spec.enso +++ b/test/Tests/src/Semantic/Warnings_Spec.enso @@ -7,7 +7,7 @@ polyglot java import java.util.function.Function as Java_Function polyglot java import org.enso.base_test_helpers.CallbackHelper from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Warning Value reason diff --git a/test/Tests/src/System/Environment_Spec.enso b/test/Tests/src/System/Environment_Spec.enso index 380902058c6b..3152bbd57717 100644 --- a/test/Tests/src/System/Environment_Spec.enso +++ b/test/Tests/src/System/Environment_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Environment spec = Test.group "Environment" <| diff --git a/test/Tests/src/System/File_Read_Spec.enso b/test/Tests/src/System/File_Read_Spec.enso index 7940fda53cf1..c294d5df3274 100644 --- a/test/Tests/src/System/File_Read_Spec.enso +++ b/test/Tests/src/System/File_Read_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error import Standard.Base.Errors.File_Error.File_Error from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = sample_xxx = enso_project.data / "sample.xxx" diff --git a/test/Tests/src/System/File_Spec.enso b/test/Tests/src/System/File_Spec.enso index 502467d927b4..7634fd73ad0b 100644 --- a/test/Tests/src/System/File_Spec.enso +++ b/test/Tests/src/System/File_Spec.enso @@ -10,7 +10,7 @@ import Standard.Base.Runtime.Context polyglot java import org.enso.base_test_helpers.FileSystemHelper from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions set_writable file writable = path = file.absolute.path diff --git a/test/Tests/src/System/Process_Spec.enso b/test/Tests/src/System/Process_Spec.enso index 5c4f32df5383..600a67f89864 100644 --- a/test/Tests/src/System/Process_Spec.enso +++ b/test/Tests/src/System/Process_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Process" <| Test.specify "should call simple command" <| diff --git a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso index ae733c26fa75..c5b45c8f8454 100644 --- a/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Decoder_Spec.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Encoding_Error.Encoding_Error polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = windows_file = enso_project.data / "windows.txt" diff --git a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso index 9909d74af8c7..42cee53b6e34 100644 --- a/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso +++ b/test/Tests/src/System/Reporting_Stream_Encoder_Spec.enso @@ -6,7 +6,7 @@ polyglot java import org.enso.base.Encoding_Utils polyglot java import java.nio.CharBuffer from Standard.Test import Test, Test_Suite, Problems -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "ReportingStreamEncoder" <| diff --git a/test/Tests/src/System/System_Spec.enso b/test/Tests/src/System/System_Spec.enso index a1e835208ba7..3b5165ce41fa 100644 --- a/test/Tests/src/System/System_Spec.enso +++ b/test/Tests/src/System/System_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "System" <| Test.specify "should provide nanosecond timer" <| diff --git a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso index 1ccd3c21eedf..322ebd35b9df 100644 --- a/test/Visualization_Tests/src/Default_Visualizations_Spec.enso +++ b/test/Visualization_Tests/src/Default_Visualizations_Spec.enso @@ -1,7 +1,7 @@ from Standard.Base import all from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions from Standard.Table import Table sample_table = Table.new [["A", [1, 2, 3]]] diff --git a/test/Visualization_Tests/src/Geo_Map_Spec.enso b/test/Visualization_Tests/src/Geo_Map_Spec.enso index 13b071e43b69..b50305875c04 100644 --- a/test/Visualization_Tests/src/Geo_Map_Spec.enso +++ b/test/Visualization_Tests/src/Geo_Map_Spec.enso @@ -4,7 +4,7 @@ from Standard.Table import Table import Standard.Visualization.Geo_Map from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project.Helpers diff --git a/test/Visualization_Tests/src/Helpers.enso b/test/Visualization_Tests/src/Helpers.enso index f3c6d4f02a29..c9c5e5aca7b6 100644 --- a/test/Visualization_Tests/src/Helpers.enso +++ b/test/Visualization_Tests/src/Helpers.enso @@ -3,7 +3,7 @@ from Standard.Base import all from Standard.Table import Column from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Test.Test_Result.Test_Result Column.expect : Text -> Vector -> Test_Result diff --git a/test/Visualization_Tests/src/Helpers_Spec.enso b/test/Visualization_Tests/src/Helpers_Spec.enso index 0cf44389b898..b90da5132a95 100644 --- a/test/Visualization_Tests/src/Helpers_Spec.enso +++ b/test/Visualization_Tests/src/Helpers_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table import Standard.Visualization.Helpers from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions from project.Helpers import all diff --git a/test/Visualization_Tests/src/Histogram_Spec.enso b/test/Visualization_Tests/src/Histogram_Spec.enso index 37c5128ce99f..69f7b6ca74a1 100644 --- a/test/Visualization_Tests/src/Histogram_Spec.enso +++ b/test/Visualization_Tests/src/Histogram_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Histogram from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project diff --git a/test/Visualization_Tests/src/Id_Spec.enso b/test/Visualization_Tests/src/Id_Spec.enso index 0764195a77dd..2e6855ccfe8f 100644 --- a/test/Visualization_Tests/src/Id_Spec.enso +++ b/test/Visualization_Tests/src/Id_Spec.enso @@ -6,7 +6,7 @@ from Standard.Table import Table import Standard.Visualization from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions type My_Type Value my_field diff --git a/test/Visualization_Tests/src/Lazy_Table_Spec.enso b/test/Visualization_Tests/src/Lazy_Table_Spec.enso index 4acff3f0c115..e61e92266a2d 100644 --- a/test/Visualization_Tests/src/Lazy_Table_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Table_Spec.enso @@ -7,7 +7,7 @@ import Standard.Visualization.Table as Table_Visualisation import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions t1 = """ 12 23 diff --git a/test/Visualization_Tests/src/Lazy_Text_Spec.enso b/test/Visualization_Tests/src/Lazy_Text_Spec.enso index 32f17c5df78a..12da49cf4d3c 100644 --- a/test/Visualization_Tests/src/Lazy_Text_Spec.enso +++ b/test/Visualization_Tests/src/Lazy_Text_Spec.enso @@ -6,7 +6,7 @@ import Standard.Visualization.Text as TextVis import Standard.Visualization.Preprocessor as Preprocessor from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions sample_text_single_line = "ABCDEFGHIJKLMNOPQRS" sample_text_multi_line = """ diff --git a/test/Visualization_Tests/src/SQL_Spec.enso b/test/Visualization_Tests/src/SQL_Spec.enso index e211fe4a4e2f..56ba2393ffe6 100644 --- a/test/Visualization_Tests/src/SQL_Spec.enso +++ b/test/Visualization_Tests/src/SQL_Spec.enso @@ -5,7 +5,7 @@ from Standard.Database import Database, SQLite, SQL_Query import Standard.Visualization.SQL.Visualization from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions visualization_spec connection = connection.execute_update 'CREATE TABLE "T" ("A" VARCHAR, "B" INTEGER, "C" INTEGER)' diff --git a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso index 687b7f4d526c..376fbf79329f 100644 --- a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso +++ b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso @@ -5,7 +5,7 @@ from Standard.Table import Table, Column import Standard.Visualization.Scatter_Plot from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import project diff --git a/test/Visualization_Tests/src/Table_Spec.enso b/test/Visualization_Tests/src/Table_Spec.enso index 046b3a203d14..15ca245ce9ab 100644 --- a/test/Visualization_Tests/src/Table_Spec.enso +++ b/test/Visualization_Tests/src/Table_Spec.enso @@ -11,7 +11,7 @@ import Standard.Visualization.Helpers import Standard.Visualization.Id.Id from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Base.Errors.Common.Type_Error polyglot java import java.util.UUID diff --git a/test/Visualization_Tests/src/Visualization_Spec.enso b/test/Visualization_Tests/src/Visualization_Spec.enso index c2aea41e6c1d..16b5554972d6 100644 --- a/test/Visualization_Tests/src/Visualization_Spec.enso +++ b/test/Visualization_Tests/src/Visualization_Spec.enso @@ -5,7 +5,7 @@ import Standard.Examples import Standard.Visualization from Standard.Test import Test -from Standard.Test.Extensions import all +import Standard.Test.Extensions import Standard.Visualization.File_Upload.File_Being_Uploaded diff --git a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso index 642021bb35a6..c14a5c57d9aa 100644 --- a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso @@ -11,7 +11,7 @@ from Standard.AWS import all import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = connection = Database.connect (SQLite In_Memory) diff --git a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso index 336c8a5c6130..bd49093326f6 100644 --- a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso @@ -9,7 +9,7 @@ from Standard.Table import Table import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Widgets for In-Memory with column name sets" <| diff --git a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso index 160d39d7469d..071068fe931d 100644 --- a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso +++ b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso @@ -8,7 +8,7 @@ import Standard.Base.Metadata.Display import Standard.Visualization.Widgets from Standard.Test import Test, Test_Suite -from Standard.Test.Extensions import all +import Standard.Test.Extensions spec = Test.group "Widgets for the Text type" <| From dd77052aa6e8305f7e9ddf228347b914c7871fd8 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Mon, 12 Jun 2023 13:19:13 +0200 Subject: [PATCH 46/52] Apply some PR suggestions --- .../pass/analyse/AmbiguousImportsAnalysis.scala | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala index 4a1d0008f8af..4801e70b05ee 100644 --- a/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala +++ b/engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/AmbiguousImportsAnalysis.scala @@ -77,11 +77,7 @@ case object AmbiguousImportsAnalysis extends IRPass { module, bindingMap, encounteredSymbols - ) match { - case Left(errors) => - errors - case Right(imp) => List(imp) - } + ).fold(identity, imp => List(imp)) }) ) } @@ -259,10 +255,7 @@ case object AmbiguousImportsAnalysis extends IRPass { // Polyglot import case polyImport @ Import.Polyglot(entity, rename, _, _, _) => - val symbolName = rename match { - case Some(rename) => rename - case None => entity.getVisibleName - } + val symbolName = rename.getOrElse(entity.getVisibleName) val symbolPath = entity match { case Polyglot.Java(packageName, className) => packageName + "." + className @@ -421,10 +414,7 @@ case object AmbiguousImportsAnalysis extends IRPass { def getOriginalImportForSymbol( symbol: String ): Option[IR.Module.Scope.Import] = { - encounteredSymbols.get(symbol) match { - case Some((originalImport, _)) => Some(originalImport) - case None => None - } + encounteredSymbols.get(symbol).map(_._1) } } } From 45ffd3a7c6b81f301002c08bcb19447e0b9c2a93 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 13 Jun 2023 12:06:24 +0200 Subject: [PATCH 47/52] Get rid of some more duplicated imports --- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso | 2 +- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso index 94824825b355..066a8535af4d 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding Ordering import Standard.Base.Runtime.Context import Standard.Base.Errors.Common.Forbidden_Operation import Standard.Base.Errors.File_Error.File_Error diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso index ec137273c55f..ff6a9a8e46fc 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso @@ -1,4 +1,4 @@ -from Standard.Base import all +from Standard.Base import all hiding Ordering from Standard.Base.Data.Ordering import all From 71e39e5d623848f8c9b5f1c80733c84abc4ea060 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 13 Jun 2023 12:06:31 +0200 Subject: [PATCH 48/52] typo in docs --- .../interpreter/instrument/execution/JobExecutionEngine.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala index 5977a76d1c61..a193503b9332 100644 --- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala +++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala @@ -12,7 +12,7 @@ import java.util.logging.Level import scala.concurrent.{Future, Promise} import scala.util.control.NonFatal -/** This component schedules the execution of jobs. It keep a queue of +/** This component schedules the execution of jobs. It keeps a queue of * pending jobs and activates job execution in FIFO order. * * @param interpreterContext suppliers of services that provide interpreter From 608e69ee4160a09e5eaa51bc441a246d6c688977 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 13 Jun 2023 13:07:43 +0200 Subject: [PATCH 49/52] Fix builtin types test metadata --- .../enso/interpreter/test/instrument/BuiltinTypesTest.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala b/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala index 7f0ed86deb03..2f339c31199b 100644 --- a/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala +++ b/engine/runtime-with-instruments/src/test/scala/org/enso/interpreter/test/instrument/BuiltinTypesTest.scala @@ -359,10 +359,10 @@ class BuiltinTypesTest val requestId = UUID.randomUUID() val metadata = new Metadata - val idMain = metadata.addItem(75, 34) + val idMain = metadata.addItem(47, 34) val code = - """from Standard.Base import all + """from Standard.Base import Vector, Array | |main = | Vector.from_array Array.empty From 47697eb240b8ce79c433d3ace4a9c0973727b9d1 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 13 Jun 2023 17:56:12 +0200 Subject: [PATCH 50/52] Revert "Get rid of some more duplicated imports" This reverts commit 45ffd3a7c6b81f301002c08bcb19447e0b9c2a93. --- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso | 2 +- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso index 066a8535af4d..94824825b355 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso @@ -1,4 +1,4 @@ -from Standard.Base import all hiding Ordering +from Standard.Base import all import Standard.Base.Runtime.Context import Standard.Base.Errors.Common.Forbidden_Operation import Standard.Base.Errors.File_Error.File_Error diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso index ff6a9a8e46fc..ec137273c55f 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso @@ -1,4 +1,4 @@ -from Standard.Base import all hiding Ordering +from Standard.Base import all from Standard.Base.Data.Ordering import all From 354b5f3e994528c6af6e757eb2604396e0e7f92c Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Tue, 13 Jun 2023 18:29:52 +0200 Subject: [PATCH 51/52] Remove unnecessary imports causing duplication warnings --- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso | 2 -- distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso | 2 -- 2 files changed, 4 deletions(-) diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso index 94824825b355..2e242e6bee79 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso @@ -3,8 +3,6 @@ import Standard.Base.Runtime.Context import Standard.Base.Errors.Common.Forbidden_Operation import Standard.Base.Errors.File_Error.File_Error -from Standard.Base.Data.Ordering import all - import project.Read_Flag.Read_Flag import project.Write_Flag.Write_Flag import project.Data.Histogram.Histogram diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso index ec137273c55f..37eb61a74e72 100644 --- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso +++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Matrix.enso @@ -1,7 +1,5 @@ from Standard.Base import all -from Standard.Base.Data.Ordering import all - import project.Data.Image.Image import project.Data.Matrix_Error.Matrix_Error From f291dec8449e7e520f5204cd3631cf9367a17535 Mon Sep 17 00:00:00 2001 From: Pavel Marek Date: Wed, 14 Jun 2023 11:01:36 +0200 Subject: [PATCH 52/52] Revert "Specific symbols are hidden from more generic imports" This reverts commit 2b4903608f16d91a83ae45583042d5ba85daf9c4. --- test/Table_Tests/src/Database/Codegen_Spec.enso | 4 ++-- test/Table_Tests/src/Database/Common_Spec.enso | 4 ++-- test/Table_Tests/src/Database/Postgres_Spec.enso | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso index 4fa1bd950704..7bce900d5a90 100644 --- a/test/Table_Tests/src/Database/Codegen_Spec.enso +++ b/test/Table_Tests/src/Database/Codegen_Spec.enso @@ -1,8 +1,8 @@ -from Standard.Base import all hiding First, Last +from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last from Standard.Table.Errors import No_Input_Columns_Selected, Missing_Input_Columns, No_Such_Column from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Common_Spec.enso b/test/Table_Tests/src/Database/Common_Spec.enso index b07f0f7cb529..7d9c6584807c 100644 --- a/test/Table_Tests/src/Database/Common_Spec.enso +++ b/test/Table_Tests/src/Database/Common_Spec.enso @@ -1,8 +1,8 @@ -from Standard.Base import all hiding First, Last +from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Table, Sort_Column -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last from Standard.Table.Errors import all from Standard.Database import all diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso index bc3c205e2d2d..ec2b13d7e9eb 100644 --- a/test/Table_Tests/src/Database/Postgres_Spec.enso +++ b/test/Table_Tests/src/Database/Postgres_Spec.enso @@ -1,10 +1,10 @@ -from Standard.Base import all hiding First, Last +from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Ref.Ref import Standard.Table.Data.Type.Value_Type.Bits from Standard.Table import Table, Value_Type -from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all +from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last import Standard.Database.Data.SQL_Type.SQL_Type import Standard.Database.Internal.Postgres.Pgpass