Skip to content

Commit

Permalink
Reorder imports
Browse files Browse the repository at this point in the history
  • Loading branch information
propensive committed Dec 14, 2024
1 parent 231ece5 commit 458b37e
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 54 deletions.
23 changes: 12 additions & 11 deletions src/cli/actions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@
package fury

import ambience.*
import aviation.*, calendars.gregorian
import anthology.*
import anticipation.*, filesystemInterfaces.galileiApi
import aviation.*, calendars.gregorian
import cellulose.*, codlPrinters.standard
import contingency.*
import anthology.*
import escapade.*
import escritoire.*, insufficientSpaceHandling.ignore, tableStyles.default
import ethereal.*
import eucalyptus.*
import exoskeleton.*
import fulminate.*
import gastronomy.*, alphabets.base32.zBase32Unpadded
import galilei.*, filesystemOptions.dereferenceSymlinks
import gastronomy.*, alphabets.base32.zBase32Unpadded
import gossamer.*
import guillotine.*
import hieroglyph.*, textMetrics.eastAsianScripts, charEncoders.utf8
import iridescence.*, colors.*
import nettlesome.*
import zeppelin.*
import octogenarian.*
import surveillance.*
import parasite.*
import profanity.*
import quantitative.*
import cellulose.*, codlPrinters.standard
import rudiments.*
import serpentine.*, pathHierarchies.unixOrWindows
import spectacular.*
import surveillance.*
import turbulence.*
import vacuous.*
import zeppelin.*

def accede(error: Error): UserError = UserError(error.message)

Expand Down Expand Up @@ -82,9 +82,9 @@ object actions:

Exit.Ok

.remedy:
case InstallError(message) => abort(UserError(message.communicate))
case DismissError() => Exit.Fail(1)
. remedy:
case InstallError(message) => abort(UserError(message.communicate))
case DismissError() => Exit.Fail(1)

def batch(force: Boolean, noTabCompletions: Boolean)
(using DaemonService[?],
Expand All @@ -101,8 +101,9 @@ object actions:
log(Installer.install(force).communicate)
if !noTabCompletions then info(TabCompletions.install(force = true).communicate)
Exit.Ok
.remedy:
case InstallError(message) => abort(UserError(message.communicate))

. remedy:
case InstallError(message) => abort(UserError(message.communicate))

def clean(all: Boolean)(using FrontEnd, Installation): Exit raises UserError =
import filesystemOptions.
Expand Down
20 changes: 10 additions & 10 deletions src/cli/clifrontend.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@

package fury

import profanity.*, terminalOptions.terminalSizeDetection
import turbulence.*
import exoskeleton.*
import acyclicity.*
import anticipation.*
import contingency.*
import parasite.*, orphanDisposal.cancel
import dendrology.*, dagStyles.default
import vacuous.*
import hieroglyph.*, textMetrics.uniform
import escapade.*
import anticipation.*
import iridescence.*
import eucalyptus.*
import exoskeleton.*
import gossamer.*
import hieroglyph.*, textMetrics.uniform
import iridescence.*
import parasite.*, orphanDisposal.cancel
import profanity.*, terminalOptions.terminalSizeDetection
import quantitative.*
import rudiments.*
import spectacular.*
import quantitative.*
import eucalyptus.*
import turbulence.*
import vacuous.*

import scala.collection.concurrent as scc

Expand Down
8 changes: 4 additions & 4 deletions src/engine/build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package fury

import anticipation.*
import anthology.*
import ambience.*
import anthology.*
import anticipation.*
import aviation.*, calendars.gregorian
import digression.*
import escapade.*
import eucalyptus.*
import ethereal.*
import digression.*
import eucalyptus.*
import fulminate.*
import gastronomy.*

Expand Down
4 changes: 2 additions & 2 deletions src/engine/cache.scala
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ given Timezone = tz"Etc/UTC"
case class CachedFile(lastModified: Instant, text: Task[Text], hash: Task[Hash])

case class CacheInfo
(ecosystems: Int, snapshots: Int, workspaces: Int, files: Int, dataSize: ByteSize)
(ecosystems: Int, snapshots: Int, workspaces: Int, files: Int, dataSize: Memory)

object Cache:
private val ecosystems: scc.TrieMap[Ecosystem, Task[Vault]] = scc.TrieMap()
Expand Down Expand Up @@ -85,7 +85,7 @@ object Cache:
files.clear()

def about: CacheInfo =
val dataSize = ByteSize(files.values.map { file => safely(file.text.await().length).or(0) }.sum)
val dataSize = Memory(files.values.map { file => safely(file.text.await().length).or(0) }.sum)
CacheInfo(ecosystems.size, snapshots.size, workspaces.size, files.size, dataSize)

def gitProgress(stream: LazyList[Progress]): LazyList[Double] = stream.collect:
Expand Down
3 changes: 1 addition & 2 deletions src/engine/flow.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@

package fury

import anticipation.*
import feudalism.*
import galilei.*
import anticipation.*
import rudiments.*


class Workflow():
val classes: Mutex[List[Directory]] = Mutex(Nil)
val files: Mutex[Map[WorkPath, Bytes]] = Mutex(Map())
4 changes: 2 additions & 2 deletions src/engine/frontend.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package fury

import acyclicity.*
import anticipation.*
import parasite.*
import vacuous.*
import rudiments.*
import acyclicity.*
import vacuous.*

import scala.collection.concurrent as scc
import scala.collection.mutable as scm
Expand Down
2 changes: 1 addition & 1 deletion src/engine/install.scala
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ object Installation:

val buildId: Int =
safely((Classpath / p"build.id")().read[Text].trim.decode[Int]).or:
throw Panic(m"The build.id file was missing or corrupt")
panic(m"The build.id file was missing or corrupt")

Installation(buildId, config, cache, vault, tmp, snapshots)

Expand Down
18 changes: 9 additions & 9 deletions src/model/ids.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@

package fury

import rudiments.*
import vacuous.*
import fulminate.*
import prepositional.*
import gossamer.*
import anticipation.*
import gastronomy.*
import galilei.*
import contingency.*
import spectacular.*
import kaleidoscope.*
import fulminate.*
import galilei.*
import gastronomy.*
import gossamer.*
import hieroglyph.*, charEncoders.utf8
import kaleidoscope.*
import prepositional.*
import rudiments.*
import spectacular.*
import vacuous.*

import errorDiagnostics.stackTraces

Expand Down
2 changes: 1 addition & 1 deletion src/model/licenses.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package fury

import anticipation.*
import punctuation.*
import gossamer.*
import punctuation.*

enum LicenseGroup:
case Afl, Apache, Artistic, Bsl, Bsd, Cc, Wtfpl, Ecl, Epl, Eupl, Agpl, Gpl, Lgpl, Isc, Lppl, Ms,
Expand Down
12 changes: 6 additions & 6 deletions src/model/model.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ package fury
import anticipation.*
import aviation.*, calendars.gregorian
import cellulose.*
import contingency.*
import digression.*
import escapade.*
import exoskeleton.*
import filesystemApi.galileiPath
import filesystemOptions.createNonexistent.disabled
import filesystemOptions.dereferenceSymlinks.enabled
import fulminate.*
import galilei.*
import filesystemOptions.dereferenceSymlinks.enabled
import filesystemOptions.createNonexistent.disabled
import filesystemApi.galileiPath
import gastronomy.*
import gossamer.*
import hieroglyph.*, charEncoders.utf8, charDecoders.utf8, textSanitizers.strict
import digression.*
import kaleidoscope.*
import monotonous.*
import nettlesome.*
import octogenarian.*
import contingency.*
import prepositional.*
import punctuation.*
import rudiments.*
import serpentine.*, pathHierarchies.unixOrWindows
import spectacular.*
import prepositional.*
import symbolism.*
import turbulence.*
import vacuous.*
Expand Down
12 changes: 6 additions & 6 deletions src/test/test.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

package fury

import probably.*
import gossamer.*
import spectacular.*
import rudiments.*
import anticipation.*
import cellulose.*
import contingency.*, strategies.throwUnsafely
import galilei.*
import gossamer.*
import probably.*
import rudiments.*
import serpentine.*
import contingency.*, strategies.throwUnsafely
import cellulose.*
import spectacular.*

import unsafeExceptions.canThrowAny

Expand Down

0 comments on commit 458b37e

Please sign in to comment.