Re-export all maelstrom-client-base macros from maelstrom-client.

Also, don't re-export other types from maelstrom_client_base::spec, as
maelstrom_client_base::spec is already re-exported.

crates/maelstrom-client/src/lib.rs

@@ -1,9 +1,10 @@
 pub use maelstrom_client_base::{
-    container_container_parent, container_spec, environment_spec, image_container_parent, job_spec,
-    spec,
-    spec::{ContainerParent, ContainerSpec, JobSpec},
-    AcceptInvalidRemoteContainerTlsCerts, CacheDir, IntrospectResponse, JobRunningStatus,
-    JobStatus, ProjectDir, RemoteProgress, RpcLogMessage, StateDir, MANIFEST_DIR,
+    container_container_parent, container_ref, container_spec, converted_image, environment_spec,
+    glob_layer_spec, image_container_parent, image_ref, job_spec, paths_layer_spec, prefix_options,
+    shared_library_dependencies_layer_spec, spec, stubs_layer_spec, symlink_spec,
+    symlinks_layer_spec, tar_layer_spec, AcceptInvalidRemoteContainerTlsCerts, CacheDir,
+    IntrospectResponse, JobRunningStatus, JobStatus, ProjectDir, RemoteProgress, RpcLogMessage,
+    StateDir, MANIFEST_DIR,
 };
 pub use maelstrom_container::ContainerImageDepotDir;
 
@@ -12,6 +13,7 @@ use futures::stream::StreamExt as _;
 use maelstrom_base::{ClientJobId, JobOutcomeResult};
 use maelstrom_client_base::{
     proto::{self, client_process_client::ClientProcessClient},
+    spec::{ContainerSpec, JobSpec},
     AddContainerRequest, IntoProtoBuf, StartRequest, TryFromProtoBuf,
 };
 use maelstrom_linux::{self as linux, Pid};

crates/maelstrom-pytest/src/lib.rs

@@ -10,9 +10,9 @@ use maelstrom_base::{
 };
 use maelstrom_client::{
     job_spec,
-    spec::{ImageRef, LayerSpec, PrefixOptions},
+    spec::{ContainerParent, ImageRef, LayerSpec, PrefixOptions},
     AcceptInvalidRemoteContainerTlsCerts, CacheDir, Client, ClientBgProcess,
-    ContainerImageDepotDir, ContainerParent, ProjectDir, StateDir,
+    ContainerImageDepotDir, ProjectDir, StateDir,
 };
 use maelstrom_container::{DockerReference, ImageName};
 use maelstrom_test_runner::{

crates/maelstrom-run/Cargo.toml

@@ -34,5 +34,4 @@ xdg.workspace = true
 [dev-dependencies]
 assert_matches.workspace = true
 maplit.workspace = true
-maelstrom-client-base.workspace = true
 maelstrom-test.workspace = true

crates/maelstrom-run/src/job_spec_or_containers.rs

@@ -74,9 +74,8 @@ mod tests {
     use indoc::indoc;
     use maelstrom_base::JobNetwork;
     use maelstrom_client::{
-        container_container_parent, container_spec, environment_spec, job_spec,
+        container_container_parent, container_spec, environment_spec, job_spec, tar_layer_spec,
     };
-    use maelstrom_client_base::tar_layer_spec;
     use maplit::hashmap;
 
     #[track_caller]

crates/maelstrom-run/src/main.rs

@@ -5,8 +5,8 @@ use maelstrom_base::{
     JobOutputResult, JobTerminationStatus, JobTty, WindowSize,
 };
 use maelstrom_client::{
-    AcceptInvalidRemoteContainerTlsCerts, CacheDir, Client, ClientBgProcess,
-    ContainerImageDepotDir, JobSpec, JobStatus, ProjectDir, StateDir,
+    spec::JobSpec, AcceptInvalidRemoteContainerTlsCerts, CacheDir, Client, ClientBgProcess,
+    ContainerImageDepotDir, JobStatus, ProjectDir, StateDir,
 };
 use maelstrom_linux::{self as linux, Fd, PollEvents, PollFd, Signal, SignalSet, SigprocmaskHow};
 use maelstrom_macro::Config;

crates/maelstrom-test-runner/Cargo.toml

@@ -53,7 +53,6 @@ colored-diff.workspace = true
 enum-map.workspace = true
 indoc.workspace = true
 itertools.workspace = true
-maelstrom-client-base.workspace = true
 maelstrom-simex.workspace = true
 maelstrom-test.workspace = true
 maplit.workspace = true

crates/maelstrom-test-runner/src/app/main_app.rs

@@ -10,7 +10,10 @@ use crate::ui::{
 };
 use crate::*;
 use maelstrom_base::{ClientJobId, JobOutcomeResult};
-use maelstrom_client::{spec::JobSpec, ContainerSpec, JobStatus};
+use maelstrom_client::{
+    spec::{ContainerSpec, JobSpec},
+    JobStatus,
+};
 use maelstrom_util::{ext::OptionExt as _, process::ExitCode};
 use std::collections::{BTreeMap, HashMap};
 

crates/maelstrom-test-runner/src/metadata.rs

@@ -106,8 +106,7 @@ mod tests {
     use crate::{NoCaseMetadata, SimpleFilter};
     use anyhow::Error;
     use maelstrom_base::{enum_set, GroupId, JobDevice, JobMount, JobNetwork, UserId};
-    use maelstrom_client::{image_container_parent, ProjectDir};
-    use maelstrom_client_base::tar_layer_spec;
+    use maelstrom_client::{image_container_parent, tar_layer_spec, ProjectDir};
     use maelstrom_test::utf8_path_buf;
     use maelstrom_util::{fs::Fs, root::RootBuf, template::TemplateVars};
     use maplit::btreemap;