remove gen_stub_lib

roc-lang · lukewilliamboswell · Jul 2, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
commit 287d00df85babfbad00b5090e0c2014aff38857a
diff --git a/.github/workflows/nix_macos_apple_silicon.yml b/.github/workflows/nix_macos_apple_silicon.yml
@@ -40,7 40,7 @@ jobs:
  run: nix develop -c ./ci/roc_test_builtins.sh
 
  - name: make a libapp.so for the next step
- run: nix develop -c cargo run -- gen-stub-lib examples/platform-switching/rocLovesRust.roc
  run: nix develop -c cargo run -- build --lib examples/platform-switching/rust-platform/libapp.roc
 
  - name: check that the platform`s produced dylib is loadable
  run: cd examples/platform-switching/rust-platform && nix develop -c cargo test --release --locked

diff --git a/.github/workflows/nix_macos_x86_64.yml b/.github/workflows/nix_macos_x86_64.yml
@@ -24,7 24,7 @@ jobs:
  run: nix develop -c ./ci/roc_test_builtins.sh
 
  - name: make a libapp.so for the next step
- run: nix develop -c cargo run -- gen-stub-lib examples/platform-switching/rocLovesRust.roc
  run: nix develop -c cargo run -- build --lib examples/platform-switching/rust-platform/libapp.roc
 
  - name: check that the platform`s produced dylib is loadable
  run: cd examples/platform-switching/rust-platform && nix develop -c cargo test --release --locked
diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
@@ -54,7 54,6 @@ pub const CMD_VERSION: &str = "version";
 pub const CMD_FORMAT: &str = "format";
 pub const CMD_TEST: &str = "test";
 pub const CMD_GLUE: &str = "glue";
-pub const CMD_GEN_STUB_LIB: &str = "gen-stub-lib";
 pub const CMD_PREPROCESS_HOST: &str = "preprocess-host";
 
 pub const FLAG_EMIT_LLVM_IR: &str = "emit-llvm-ir";
@@ -388,23 387,6 @@ pub fn build_app() -> Command {
  .default_value(DEFAULT_ROC_FILENAME)
  )
  )
- .subcommand(Command::new(CMD_GEN_STUB_LIB)
- .about("Generate a stubbed shared library that can be used for linking a platform binary.\nThe stubbed library has prototypes, but no function bodies.\n\nNote: This command will be removed in favor of just using `roc build` once all platforms support the surgical linker")
- .arg(
- Arg::new(ROC_FILE)
- .help("The .roc file for an app using the platform")
- .value_parser(value_parser!(PathBuf))
- .required(true)
- )
- .arg(
- Arg::new(FLAG_TARGET)
- .long(FLAG_TARGET)
- .help("Choose a different target")
- .default_value(Into::<&'static str>::into(Target::default()))
- .value_parser(build_target_values_parser.clone())
- .required(false),
- )
- )
  .subcommand(Command::new(CMD_PREPROCESS_HOST)
  .about("Runs the surgical linker preprocessor to generate `.rh` and `.rm` files.")
  .arg(

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -4,10 4,10 @@ use roc_build::link::LinkType;
 use roc_build::program::{check_file, CodeGenBackend};
 use roc_cli::{
  build_app, format_files, format_src, test, BuildConfig, FormatMode, CMD_BUILD, CMD_CHECK,
- CMD_DEV, CMD_DOCS, CMD_FORMAT, CMD_GEN_STUB_LIB, CMD_GLUE, CMD_PREPROCESS_HOST, CMD_REPL,
- CMD_RUN, CMD_TEST, CMD_VERSION, DIRECTORY_OR_FILES, FLAG_CHECK, FLAG_DEV, FLAG_LIB, FLAG_MAIN,
- FLAG_NO_LINK, FLAG_OUTPUT, FLAG_PP_DYLIB, FLAG_PP_HOST, FLAG_PP_PLATFORM, FLAG_STDIN,
- FLAG_STDOUT, FLAG_TARGET, FLAG_TIME, GLUE_DIR, GLUE_SPEC, ROC_FILE,
  CMD_DEV, CMD_DOCS, CMD_FORMAT, CMD_GLUE, CMD_PREPROCESS_HOST, CMD_REPL, CMD_RUN, CMD_TEST,
  CMD_VERSION, DIRECTORY_OR_FILES, FLAG_CHECK, FLAG_DEV, FLAG_LIB, FLAG_MAIN, FLAG_NO_LINK,
  FLAG_OUTPUT, FLAG_PP_DYLIB, FLAG_PP_HOST, FLAG_PP_PLATFORM, FLAG_STDIN, FLAG_STDOUT,
  FLAG_TARGET, FLAG_TIME, GLUE_DIR, GLUE_SPEC, ROC_FILE,
 };
 use roc_docs::generate_docs_html;
 use roc_error_macros::user_error;
@@ -120,21 120,6 @@ fn main() -> io::Result<()> {
  Ok(1)
  }
  }
- Some((CMD_GEN_STUB_LIB, matches)) => {
- let input_path = matches.get_one::<PathBuf>(ROC_FILE).unwrap();
- let target = matches
- .get_one::<String>(FLAG_TARGET)
- .and_then(|s| Target::from_str(s).ok())
- .unwrap_or_default();
- let function_kind = FunctionKind::from_env();
- roc_linker::generate_stub_lib(
- input_path,
- RocCacheDir::Persistent(cache::roc_cache_dir().as_path()),
- target,
- function_kind,
- );
- Ok(0)
- }
  Some((CMD_PREPROCESS_HOST, matches)) => {
  let preprocess_host_err =
  { |msg: String| user_error!("\n\n ERROR PRE-PROCESSING HOST: {}\n\n", msg) };

diff --git a/crates/linker/src/lib.rs b/crates/linker/src/lib.rs
@@ -54,69 54,6 @@ pub fn link_preprocessed_host(
  surgery(roc_app_bytes, &metadata, binary_path, false, false, target)
 }
 
-// Exposed function to load a platform file and generate a stub lib for it.
-pub fn generate_stub_lib(
- input_path: &Path,
- roc_cache_dir: RocCacheDir<'_>,
- target: Target,
- function_kind: FunctionKind,
-) -> (PathBuf, PathBuf, Vec<String>) {
- // Note: this should theoretically just be able to load the host, I think.
- // Instead, I am loading an entire app because that was simpler and had example code.
- // If this was expected to stay around for the the long term, we should change it.
- // But hopefully it will be removable once we have surgical linking on all platforms.
- let arena = &bumpalo::Bump::new();
- let loaded = roc_load::load_and_monomorphize(
- arena,
- input_path.to_path_buf(),
- None,
- roc_cache_dir,
- LoadConfig {
- target,
- function_kind,
- render: RenderTarget::Generic,
- palette: DEFAULT_PALETTE,
- threading: Threading::AllAvailable,
- exec_mode: ExecutionMode::Executable,
- },
- )
- .unwrap_or_else(|problem| todo!("{:?}", problem));
-
- let exposed_to_host = loaded
- .exposed_to_host
- .top_level_values
- .keys()
- .map(|x| x.as_str(&loaded.interns).to_string())
- .collect();
-
- let exported_closure_types = loaded
- .exposed_to_host
- .closure_types
- .iter()
- .map(|x| {
- format!(
- "{}_{}",
- x.module_string(&loaded.interns),
- x.as_str(&loaded.interns)
- )
- })
- .collect();
-
- let exposed_symbols = ExposedSymbols {
- top_level_values: exposed_to_host,
- exported_closure_types,
- };
-
- if let EntryPoint::Executable { platform_path, .. } = &loaded.entry_point {
- let stub_lib = platform_path.with_file_name(target.stub_app_lib_file_name());
- let stub_dll_symbols = exposed_symbols.stub_dll_symbols();
- generate_dynamic_lib(target, &stub_dll_symbols, stub_lib.as_path());
- (platform_path.into(), stub_lib, stub_dll_symbols)
- } else {
- unreachable!();
- }
-}
-
 pub fn generate_stub_lib_from_loaded(
  target: Target,
  platform_main_roc: &Path,