update

Author: tgross35

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

@@ -21,7 +21,7 @@ Usage:
 "#;
 
 fn main() {
-    let sync = GitSync::from_current_dir()?;
+    let sync = GitSync::from_current_dir();
 
     // Collect args, then recollect as str refs so we can match on them
     let args: Vec<_> = env::args().collect();

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

@@ -17,17 +17,17 @@ pub struct GitSync {
 /// This code was adapted from the miri repository, via the rustc-dev-guide
 /// (https://github.com/rust-lang/rustc-dev-guide/tree/c51adbd12d/josh-sync)
 impl GitSync {
-    pub fn from_current_dir() -> anyhow::Result<Self> {
+    pub fn from_current_dir() -> Self {
         let upstream_repo =
             env::var("UPSTREAM_ORG").unwrap_or_else(|_| "rust-lang".to_owned()) + "/rust";
 
-        Ok(Self {
-            upstream_url: format!("https://github.com/{upstream_repo}/"),
+        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_url_base: format!("http://localhost:{JOSH_PORT}"),
-        })
+        }
     }
 
     /// Pull from rust-lang/rust to compiler-builtins.
@@ -108,7 +108,7 @@ impl GitSync {
 
         let merge_message = format!(
             "Merge ref {upstream_head_short}{filter} from {upstream_url}\n\n\
-            Pull recent changes from {upstream_repo} via Josh.\n\n
+            Pull recent changes from {upstream_repo} via Josh.\n\n\
             Upstream ref: {new_upstream_base}\n\
             Filtered ref: {incoming_ref}\n\
             ",