Skip to content

Commit d029725

Browse files
milosdjuricamilosdjurica
authored
fix: replace Some(URL) with URL during installation output (foundry-rs#12024)
1 parent 2e723df commit d029725

File tree

7 files changed

+39
-35
lines changed

7 files changed

+39
-35
lines changed

‎crates/forge/src/cmd/install.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ impl DependencyInstallOpts {
162162
.strip_prefix(git.root)
163163
.wrap_err("Library directory is not relative to the repository root")?;
164164
sh_println!(
165-
"Installing {} in {} (url: {:?}, tag: {:?})",
165+
"Installing {} in {} (url: {}, tag: {})",
166166
dep.name,
167167
path.display(),
168-
dep.url,
169-
dep.tag
168+
dep.url.as_deref().unwrap_or("None"),
169+
dep.tag.as_deref().unwrap_or("None")
170170
)?;
171171

172172
// this tracks the actual installed tag

‎crates/forge/src/cmd/remove.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ impl RemoveArgs {
4444
for (Dependency { name, tag, .. }, path) in self.dependencies.iter().zip(&paths) {
4545
// Get the URL from git submodule config instead of using the parsed dependency URL
4646
let url = git.submodule_url(path).unwrap_or(None);
47-
sh_println!("Removing '{name}' in {}, (url: {url:?}, tag: {tag:?})", path.display())?;
47+
sh_println!(
48+
"Removing '{name}' in {}, (url: {}, tag: {})",
49+
path.display(),
50+
url.as_deref().unwrap_or("None"),
51+
tag.as_deref().unwrap_or("None")
52+
)?;
4853
let _ = lockfile.remove(path);
4954
std::fs::remove_dir_all(git_modules.join(path))?;
5055
}

‎crates/forge/tests/cli/cmd.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ forgetest!(can_init_repo_with_config, |prj, cmd| {
304304
.assert_success()
305305
.stdout_eq(str![[r#"
306306
Initializing [..]...
307-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
307+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
308308
Installed forge-std[..]
309309
Initialized forge project
310310
@@ -353,7 +353,7 @@ forgetest!(can_init_no_git, |prj, cmd| {
353353

354354
cmd.arg("init").arg(prj.root()).arg("--no-git").assert_success().stdout_eq(str![[r#"
355355
Initializing [..]...
356-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
356+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
357357
Installed forge-std[..]
358358
Initialized forge project
359359
@@ -438,7 +438,7 @@ Run with the `--force` flag to initialize regardless.
438438
.assert_success()
439439
.stdout_eq(str![[r#"
440440
Initializing [..]...
441-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
441+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
442442
Installed forge-std[..]
443443
Initialized forge project
444444
@@ -478,7 +478,7 @@ Run with the `--force` flag to initialize regardless.
478478
.assert_success()
479479
.stdout_eq(str![[r#"
480480
Initializing [..]...
481-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
481+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
482482
Installed forge-std[..]
483483
Initialized forge project
484484
@@ -520,7 +520,7 @@ Run with the `--force` flag to initialize regardless.
520520
.assert_success()
521521
.stdout_eq(str![[r#"
522522
Initializing [..]...
523-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
523+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
524524
Installed forge-std[..]
525525
Initialized forge project
526526
@@ -561,7 +561,7 @@ forgetest!(can_init_using_parent_repo, |prj, cmd| {
561561
cmd.arg("init").arg(folder).arg("--force").arg("--use-parent-git").assert_success().stdout_eq(
562562
str![[r#"
563563
Initializing [..]...
564-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
564+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
565565
Installed forge-std[..]
566566
Initialized forge project
567567
@@ -592,7 +592,7 @@ forgetest!(can_init_vscode, |prj, cmd| {
592592

593593
cmd.arg("init").arg(prj.root()).arg("--vscode").assert_success().stdout_eq(str![[r#"
594594
Initializing [..]...
595-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
595+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
596596
Installed forge-std[..]
597597
Initialized forge project
598598
@@ -712,7 +712,7 @@ forgetest!(can_clone, |prj, cmd| {
712712
.stdout_eq(str![[r#"
713713
Downloading the source code of 0x044b75f554b886A065b9567891e45c79542d7357 from Etherscan...
714714
Initializing [..]...
715-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
715+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
716716
Installed forge-std[..]
717717
Initialized forge project
718718
Collecting the creation information of 0x044b75f554b886A065b9567891e45c79542d7357 from Etherscan...
@@ -760,7 +760,7 @@ forgetest!(can_clone_no_remappings_txt, |prj, cmd| {
760760
.stdout_eq(str![[r#"
761761
Downloading the source code of 0x33e690aEa97E4Ef25F0d140F1bf044d663091DAf from Etherscan...
762762
Initializing [..]...
763-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
763+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
764764
Installed forge-std[..]
765765
Initialized forge project
766766
Collecting the creation information of 0x33e690aEa97E4Ef25F0d140F1bf044d663091DAf from Etherscan...
@@ -819,7 +819,7 @@ forgetest!(can_init_project, |prj, cmd| {
819819

820820
cmd.args(["init"]).arg(prj.root()).assert_success().stdout_eq(str![[r#"
821821
Initializing [..]...
822-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
822+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
823823
Installed forge-std[..]
824824
Initialized forge project
825825
@@ -847,7 +847,7 @@ forgetest!(can_init_vyper_project, |prj, cmd| {
847847

848848
cmd.args(["init", "--vyper"]).arg(prj.root()).assert_success().stdout_eq(str![[r#"
849849
Initializing [..]...
850-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
850+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
851851
Installed forge-std[..]
852852
Initialized forge project
853853
@@ -889,7 +889,7 @@ forgetest!(can_clone_with_node_modules, |prj, cmd| {
889889
.stdout_eq(str![[r#"
890890
Downloading the source code of 0xA3E217869460bEf59A1CfD0637e2875F9331e823 from Etherscan...
891891
Initializing [..]...
892-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
892+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
893893
Installed forge-std[..]
894894
Initialized forge project
895895
Collecting the creation information of 0xA3E217869460bEf59A1CfD0637e2875F9331e823 from Etherscan...

‎crates/forge/tests/cli/config.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ forgetest_init!(can_parse_remappings_correctly, |prj, cmd| {
458458

459459
let install = |cmd: &mut TestCommand, dep: &str| {
460460
cmd.forge_fuse().args(["install", dep]).assert_success().stdout_eq(str![[r#"
461-
Installing solmate in [..] (url: Some("https://github.com/transmissions11/solmate"), tag: None)
461+
Installing solmate in [..] (url: https://github.com/transmissions11/solmate, tag: None)
462462
Installed solmate[..]
463463
464464
"#]]);
@@ -899,7 +899,7 @@ forgetest!(can_update_libs_section, |prj, cmd| {
899899
prj.update_config(|config| config.libs = vec!["node_modules".into()]);
900900

901901
cmd.args(["install", "foundry-rs/forge-std"]).assert_success().stdout_eq(str![[r#"
902-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
902+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
903903
Installed forge-std[..]
904904
905905
"#]]);
@@ -911,7 +911,7 @@ Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std
911911

912912
// additional install don't edit `libs`
913913
cmd.forge_fuse().args(["install", "dapphub/ds-test"]).assert_success().stdout_eq(str![[r#"
914-
Installing ds-test in [..] (url: Some("https://github.com/dapphub/ds-test"), tag: None)
914+
Installing ds-test in [..] (url: https://github.com/dapphub/ds-test, tag: None)
915915
Installed ds-test
916916
917917
"#]]);
@@ -926,7 +926,7 @@ forgetest!(config_emit_warnings, |prj, cmd| {
926926
cmd.git_init();
927927

928928
cmd.args(["install", "foundry-rs/forge-std"]).assert_success().stdout_eq(str![[r#"
929-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
929+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
930930
Installed forge-std[..]
931931
932932
"#]]);

‎crates/forge/tests/cli/debug.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ forgetest!(
1212
.assert_success()
1313
.stdout_eq(str![[r#"
1414
Initializing [..]...
15-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
15+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
1616
Installed forge-std[..]
1717
Initialized forge project
1818

‎crates/forge/tests/cli/install.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ forgetest!(can_install_and_remove, |prj, cmd| {
9494
let install = |cmd: &mut TestCommand| {
9595
cmd.forge_fuse().args(["install", "foundry-rs/forge-std"]).assert_success().stdout_eq(
9696
str![[r#"
97-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
97+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
9898
Installed forge-std[..]
9999
100100
"#]],
@@ -110,7 +110,7 @@ Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std
110110
let remove = |cmd: &mut TestCommand, target: &str| {
111111
cmd.forge_fuse().args(["remove", "--force", target]).assert_success().stdout_eq(str![[
112112
r#"
113-
Removing 'forge-std' in [..], (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
113+
Removing 'forge-std' in [..], (url: https://github.com/foundry-rs/forge-std, tag: None)
114114
115115
"#
116116
]]);
@@ -164,7 +164,7 @@ forgetest!(can_reinstall_after_manual_remove, |prj, cmd| {
164164
let install = |cmd: &mut TestCommand| {
165165
cmd.forge_fuse().args(["install", "foundry-rs/forge-std"]).assert_success().stdout_eq(
166166
str![[r#"
167-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
167+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
168168
Installed forge-std tag=[..]"#]],
169169
);
170170

@@ -388,14 +388,13 @@ forgetest!(
388388
let package_mod = git_mod.join("forge-5980-test");
389389

390390
// install main dependency
391-
cmd.forge_fuse()
392-
.args(["install", "evalir/forge-5980-test"])
393-
.assert_success()
394-
.stdout_eq(str![[r#"
395-
Installing forge-5980-test in [..] (url: Some("https://github.com/evalir/forge-5980-test"), tag: None)
391+
cmd.forge_fuse().args(["install", "evalir/forge-5980-test"]).assert_success().stdout_eq(
392+
str![[r#"
393+
Installing forge-5980-test in [..] (url: https://github.com/evalir/forge-5980-test, tag: None)
396394
Installed forge-5980-test
397395
398-
"#]]);
396+
"#]],
397+
);
399398

400399
// assert paths exist
401400
assert!(package.exists());

‎crates/forge/tests/cli/script.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ forgetest_async!(can_execute_script_with_arguments, |prj, cmd| {
10941094
.assert_success()
10951095
.stdout_eq(str![[r#"
10961096
Initializing [..]...
1097-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
1097+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
10981098
Installed forge-std[..]
10991099
Initialized forge project
11001100
@@ -1222,7 +1222,7 @@ forgetest_async!(can_execute_script_with_arguments_nested_deploy, |prj, cmd| {
12221222
.assert_success()
12231223
.stdout_eq(str![[r#"
12241224
Initializing [..]...
1225-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
1225+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
12261226
Installed forge-std[..]
12271227
Initialized forge project
12281228
@@ -1392,7 +1392,7 @@ forgetest_async!(assert_tx_origin_is_not_overwritten, |prj, cmd| {
13921392
.assert_success()
13931393
.stdout_eq(str![[r#"
13941394
Initializing [..]...
1395-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
1395+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
13961396
Installed forge-std[..]
13971397
Initialized forge project
13981398
@@ -1478,7 +1478,7 @@ forgetest_async!(assert_can_create_multiple_contracts_with_correct_nonce, |prj,
14781478
.assert_success()
14791479
.stdout_eq(str![[r#"
14801480
Initializing [..]...
1481-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
1481+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
14821482
Installed forge-std[..]
14831483
Initialized forge project
14841484
@@ -1707,7 +1707,7 @@ forgetest_async!(can_decode_custom_errors, |prj, cmd| {
17071707
.assert_success()
17081708
.stdout_eq(str![[r#"
17091709
Initializing [..]...
1710-
Installing forge-std in [..] (url: Some("https://github.com/foundry-rs/forge-std"), tag: None)
1710+
Installing forge-std in [..] (url: https://github.com/foundry-rs/forge-std, tag: None)
17111711
Installed forge-std[..]
17121712
Initialized forge project
17131713

0 commit comments

Comments
 (0)