Skip to content

Commit 9bdbefb

Browse files
committed
Rebase on main with pepsi max
1 parent f521262 commit 9bdbefb

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

tools/pepsi/src/cargo.rs

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ async fn resolve_manifest_path(
187187
Some("parameter_tester") => repository.root.join("tools/parameter_tester/Cargo.toml"),
188188
Some("pepsi") => repository.root.join("tools/pepsi/Cargo.toml"),
189189
Some("twix") => repository.root.join("tools/twix/Cargo.toml"),
190+
Some("vista") => repository.root.join("tools/vista/Cargo.toml"),
190191
Some("widget_gallery") => repository.root.join("tools/widget_gallery/Cargo.toml"),
191192

192193
_ => compose_manifest_path(manifest).await.wrap_err_with(|| {

tools/vista/src/app.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct DependencyInspector {
2020

2121
impl DependencyInspector {
2222
pub fn new(_creation_context: &CreationContext, repository: Repository) -> Self {
23-
let cyclers = collect_hulk_cyclers(repository.crates_directory()).unwrap();
23+
let cyclers = collect_hulk_cyclers(repository.root.join("crates")).unwrap();
2424
Self {
2525
cyclers,
2626
selected_cycler: 0,

tools/vista/src/main.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
use app::DependencyInspector;
1+
use std::env::current_dir;
2+
23
use eframe::{run_native, NativeOptions};
3-
use repository::{get_repository_root, Repository};
4-
use tokio::runtime::Runtime;
4+
use repository::Repository;
5+
6+
use app::DependencyInspector;
57

68
mod app;
79

810
fn main() -> Result<(), eframe::Error> {
9-
let runtime = Runtime::new().unwrap();
10-
let repository = Repository::new(runtime.block_on(get_repository_root()).unwrap());
11+
let current_directory = current_dir().expect("failed to get current directory");
12+
let repository =
13+
Repository::find_root(current_directory).expect("failed to find repository root");
1114

1215
run_native(
13-
"DependencyInspector",
16+
"Vista",
1417
NativeOptions::default(),
1518
Box::new(|creation_context| {
1619
Ok(Box::new(DependencyInspector::new(

0 commit comments

Comments
 (0)