Skip to content

Move remaining code in fusion._private to runtime._private. #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toddjonker merged 1 commit into from
Mar 11, 2026
Merged

Move remaining code in fusion._private to runtime._private. #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageInfoPair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import static java.math.RoundingMode.HALF_EVEN;

import dev.ionfusion.fusion._private.HtmlWriter;
import java.io.IOException;
import java.math.BigDecimal;

Expand Down
3 changes: 1 addition & 2 deletions fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/CoverageReportWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
import com.amazon.ion.SpanProvider;
import com.amazon.ion.Timestamp;
import com.amazon.ion.system.IonReaderBuilder;
import dev.ionfusion.fusion._private.HtmlWriter;
import dev.ionfusion.fusion._private.StreamWriter;
import dev.ionfusion.runtime._private.io.StreamWriter;
import dev.ionfusion.runtime.base.ModuleIdentity;
import dev.ionfusion.runtime.base.SourceLocation;
import java.io.IOException;
Expand Down
1 change: 0 additions & 1 deletion fusioncli/src/main/java/dev/ionfusion/fusioncli/cover/EstimatedCoverageInfoPair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

package dev.ionfusion.fusioncli.cover;

import dev.ionfusion.fusion._private.HtmlWriter;
import java.io.IOException;

class EstimatedCoverageInfoPair
Expand Down
3 changes: 2 additions & 1 deletion ...ionfusion/fusion/_private/HtmlWriter.java → ...ionfusion/fusioncli/cover/HtmlWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Copyright Ion Fusion contributors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package dev.ionfusion.fusion._private;
package dev.ionfusion.fusioncli.cover;

import dev.ionfusion.runtime._private.io.StreamWriter;
import dev.ionfusion.runtime.base.ModuleIdentity;
import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/SiteBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import static java.nio.file.Files.isDirectory;

import dev.ionfusion.fusion._private.StreamWriter;
import dev.ionfusion.fusioncli.doc.site.FileCopyTemplate;
import dev.ionfusion.fusioncli.doc.site.Site;
import dev.ionfusion.fusioncli.doc.site.Template;
import dev.ionfusion.fusioncli.doc.tool.layout.StreamingTemplate;
import dev.ionfusion.fusioncli.doc.tool.mustache.MustacheTemplate;
import dev.ionfusion.runtime._private.io.StreamWriter;
import dev.ionfusion.runtime.base.FusionException;
import dev.ionfusion.runtime.base.ModuleIdentity;
import dev.ionfusion.runtime.embed.TopLevel;
Expand Down
2 changes: 1 addition & 1 deletion fusioncli/src/main/java/dev/ionfusion/fusioncli/doc/tool/layout/StreamingTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

package dev.ionfusion.fusioncli.doc.tool.layout;

import dev.ionfusion.fusion._private.StreamWriter;
import dev.ionfusion.fusioncli.doc.site.Artifact;
import dev.ionfusion.fusioncli.doc.site.Generator;
import dev.ionfusion.fusioncli.doc.site.Template;
import dev.ionfusion.runtime._private.io.StreamWriter;
import java.nio.file.Path;

/**
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.amazon.ion.ValueFactory;
import com.amazon.ion.util.IonTextUtils;
import dev.ionfusion.fusion.FusionBool.BaseBool;
import dev.ionfusion.fusion._private.InternMap;
import dev.ionfusion.runtime._private.util.InternMap;
import dev.ionfusion.runtime.base.FusionException;
import dev.ionfusion.runtime.base.SourceLocation;
import dev.ionfusion.runtime.embed.TopLevel;
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageCollectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import static java.nio.file.Files.createDirectories;
import static java.nio.file.Files.isDirectory;

import dev.ionfusion.fusion._private.InternMap;
import dev.ionfusion.runtime._private.util.InternMap;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Path;
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/java/dev/ionfusion/runtime/_private/cover/CoverageSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import static java.nio.file.Files.createTempFile;

import dev.ionfusion.fusion._Private_CoverageCollector;
import dev.ionfusion.fusion._private.InternMap;
import dev.ionfusion.runtime._private.util.Flusher;
import dev.ionfusion.runtime._private.util.InternMap;
import dev.ionfusion.runtime.base.SourceLocation;
import java.io.File;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...nfusion/fusion/_private/StreamWriter.java → ...ion/runtime/_private/io/StreamWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Ion Fusion contributors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package dev.ionfusion.fusion._private;
package dev.ionfusion.runtime._private.io;

import static com.amazon.ion.system.IonTextWriterBuilder.UTF8;

Expand Down
2 changes: 1 addition & 1 deletion .../ionfusion/fusion/_private/InternMap.java → ...sion/runtime/_private/util/InternMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Ion Fusion contributors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package dev.ionfusion.fusion._private;
package dev.ionfusion.runtime._private.util;

import static java.util.Objects.requireNonNull;

Expand Down
2 changes: 1 addition & 1 deletion ...fusion/fusion/_private/InternMapTest.java → .../runtime/_private/util/InternMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Ion Fusion contributors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package dev.ionfusion.fusion._private;
package dev.ionfusion.runtime._private.util;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
Expand Down
2 changes: 1 addition & 1 deletion ...usion/fusion/_private/InternedString.java → ...runtime/_private/util/InternedString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Ion Fusion contributors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package dev.ionfusion.fusion._private;
package dev.ionfusion.runtime._private.util;

import java.util.Objects;

Expand Down