update

Author: tgross35

library/compiler-builtins/crates/josh-sync/Cargo.toml

@@ -4,5 +4,4 @@ edition = "2024"
 publish = false
 
 [dependencies]
-anyhow = "1.0.98"
 directories = "6.0.0"

library/compiler-builtins/crates/josh-sync/src/main.rs

@@ -1,7 +1,8 @@
-use std::env;
+use std::io::{Read, Write};
 use std::process::exit;
+use std::{env, io};
 
-use crate::sync::GitSync;
+use crate::sync::{GitSync, Josh};
 
 mod sync;
 
@@ -19,7 +20,7 @@ Usage:
         Create a branch off of rust-lang/rust updating compiler-builtins.
 "#;
 
-fn main() -> anyhow::Result<()> {
+fn main() {
     let sync = GitSync::from_current_dir()?;
 
     // Collect args, then recollect as str refs so we can match on them
@@ -30,10 +31,15 @@ fn main() -> anyhow::Result<()> {
         ["rustc-pull"] => sync.rustc_pull(None),
         ["rustc-push", github_user, branch] => sync.rustc_push(github_user, Some(branch)),
         ["rustc-push", github_user] => sync.rustc_push(github_user, None),
+        ["start-josh"] => {
+            let _josh = Josh::start();
+            println!("press enter to stop");
+            io::stdout().flush().unwrap();
+            let _ = io::stdin().read(&mut [0u8]).unwrap();
+        }
         _ => {
             println!("{USAGE}");
             exit(1);
         }
     }
-    Ok(())
 }

library/compiler-builtins/crates/josh-sync/src/sync.rs

@@ -3,14 +3,14 @@ use std::process::{Command, Stdio, exit};
 use std::time::Duration;
 use std::{env, fs, process, thread};
 
+const JOSH_PORT: u16 = 42042;
 const DEFAULT_PR_BRANCH: &str = "update-builtins";
 
 pub struct GitSync {
     upstream_repo: String,
     upstream_ref: String,
     upstream_url: String,
     josh_filter: String,
-    josh_port: u16,
     josh_url_base: String,
 }
 
@@ -20,15 +20,13 @@ impl GitSync {
     pub fn from_current_dir() -> anyhow::Result<Self> {
         let upstream_repo =
             env::var("UPSTREAM_ORG").unwrap_or_else(|_| "rust-lang".to_owned()) + "/rust";
-        let josh_port = 42042;
 
         Ok(Self {
             upstream_url: format!("https://github.com/{upstream_repo}/"),
             upstream_repo,
             upstream_ref: env::var("UPSTREAM_REF").unwrap_or_else(|_| "HEAD".to_owned()),
             josh_filter: ":/library/compiler-builtins".to_owned(),
-            josh_port,
-            josh_url_base: format!("http://localhost:{josh_port}"),
+            josh_url_base: format!("http://localhost:{JOSH_PORT}"),
         })
     }
 
@@ -52,7 +50,7 @@ impl GitSync {
         self.ensure_clean();
 
         // Make sure josh is running.
-        let _josh = self.start_josh();
+        let _josh = Josh::start();
         let josh_url_filtered = self.josh_url(
             &self.upstream_repo,
             Some(&new_upstream_base),
@@ -182,7 +180,7 @@ impl GitSync {
             .to_string();
 
         // Make sure josh is running.
-        let _josh = self.start_josh();
+        let _josh = Josh::start();
 
         // Prepare the branch. Pushing works much better if we use as base exactly
         // the commit that we pulled from last time, so we use the `rust-version`
@@ -245,10 +243,6 @@ impl GitSync {
         );
     }
 
-    fn start_josh(&self) -> impl Drop {
-        Josh::start(self.josh_port)
-    }
-
     /// Construct a url to the local Josh server with (optionally)
     fn josh_url(&self, repo: &str, rev: Option<&str>, filter: Option<&str>) -> String {
         format!(
@@ -301,10 +295,10 @@ impl GitSync {
 }
 
 /// Create a wrapper that stops Josh on drop.
-struct Josh(process::Child);
+pub struct Josh(process::Child);
 
 impl Josh {
-    fn start(port: u16) -> Self {
+    pub fn start() -> Self {
         // Determine cache directory.
         let local_dir = {
             let user_dirs =
@@ -318,7 +312,7 @@ impl Josh {
             .arg(local_dir)
             .args([
                 "--remote=https://github.com",
-                &format!("--port={port}"),
+                &format!("--port={JOSH_PORT}"),
                 "--no-background",
             ])
             .stdout(Stdio::null())
@@ -329,10 +323,11 @@ impl Josh {
         // Wait until the port is open. We try every 10ms until 1s passed.
         for _ in 0..100 {
             // This will generally fail immediately when the port is still closed.
-            let addr = SocketAddr::from(([127, 0, 0, 1], port));
+            let addr = SocketAddr::from(([127, 0, 0, 1], JOSH_PORT));
             let josh_ready = TcpStream::connect_timeout(&addr, Duration::from_millis(1));
 
             if josh_ready.is_ok() {
+                println!("josh up and running");
                 return Josh(josh);
             }