Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
112 changes: 111 additions & 1 deletion tools/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tools/hermes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ anyhow = "1.0.101"
cargo_metadata = "0.23.1"
clap = { version = "4.5.57", features = ["derive"] }
clap-cargo = { version = "0.18.3", features = ["cargo_metadata"] }
dashmap = "6.1.0"
log = "0.4.29"
miette = { version = "7.6.0", features = ["derive", "fancy"] }
proc-macro2 = { version = "1.0.105", features = ["span-locations"] }
rayon = "1.11.0"
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
syn = { version = "2.0.114", features = ["full", "visit", "extra-traits", "parsing"] }
Expand Down
41 changes: 4 additions & 37 deletions tools/hermes/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,46 +17,13 @@ struct Cli {
resolve: resolve::Args,
}

fn main() {
fn main() -> anyhow::Result<()> {
if env::var("HERMES_UI_TEST_MODE").is_ok() {
ui_test_shim::run();
return;
return Ok(());
}

let args = Cli::parse();

// TODO: Better error handling than `.unwrap()`.
let roots = resolve::resolve_roots(&args.resolve).unwrap();

// TODO: What artifacts need to be updated (not just copied)? E.g., do we
// need to update `Cargo.toml` to rewrite relative paths?

// TODO: From each root, parse and walk referenced modules.
let mut has_errors = false;
for (package, kind, path) in roots.roots {
let mut edits = Vec::new();
let res = parse::read_file_and_scan_compilation_unit(&path, |_src, res| {
if let Err(e) = res {
has_errors = true;
eprint!("{:?}", miette::Report::new(e));
} else if let Ok(item) = res {
transform::append_edits(&item, &mut edits);
}
});

let (source, unloaded_modules) = res.unwrap_or_else(|e| {
eprintln!("Error parsing file: {}", e);
exit(1);
});

if has_errors {
exit(1);
}

let mut source = source.into_bytes();
transform::apply_edits(&mut source, &edits);
}

// TODO: Create shadow skeleton.
// shadow::create_shadow_skeleton(&roots.workspace, &roots.shadow_root, &roots.cargo_target_dir, todo!()).unwrap();
let roots = resolve::resolve_roots(&args.resolve)?;
shadow::build_shadow_crate(&roots)
}
10 changes: 9 additions & 1 deletion tools/hermes/src/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ fn resolve_shadow_path(metadata: &Metadata) -> PathBuf {
// NOTE: Automatically handles `CARGO_TARGET_DIR` env var.
let target_dir = metadata.target_directory.as_std_path();

// Used by integration tests to ensure deterministic shadow dir names.
if let Ok(name) = std::env::var("HERMES_TEST_SHADOW_NAME") {
return target_dir.join(name);
}

// Hash the path to the workspace root to avoid collisions between different
// workspaces using the same target directory.
let workspace_root_hash = {
Expand Down Expand Up @@ -195,7 +200,10 @@ fn resolve_packages<'a>(
}
} else {
// Resolve default (Current Working Directory)
let cwd = env::current_dir().context("Failed to get CWD")?;
let cwd = env::current_dir()
.context("Failed to get CWD")?
.canonicalize()
.context("Failed to canonicalize CWD")?;

// Find the package whose manifest directory is an ancestor of CWD
let current_pkg = metadata.packages.iter().find(|p| {
Expand Down
Loading
Loading