fix(remappings): ignore remappings of root proj dirs when merging #9258
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grandizzy
changed the title
grandizzy
commented
Nov 4, 2024
crates/cli/src/opts/build/core.rs
Outdated
| if !config_path.exists() { | ||
| panic!("error: config-path `{}` does not exist", config_path.display()) | ||
| } | ||
| if !config_path.ends_with(Config::FILE_NAME) { | ||
| panic!("error: the config-path must be a path to a foundry.toml file") | ||
| } | ||
| let config_path = canonicalized(config_path); | ||
| Config::figment_with_root(config_path.parent().unwrap()) | ||
| let root_path = config_path.parent().unwrap(); | ||
| (Config::figment_with_root(root_path), Config::load_with_root(root_path)) |
There was a problem hiding this comment.
not sure if this could be an issue for different profile (than the default one) specific paths
There was a problem hiding this comment.
this is very expensive and now does Config::figment_with_root(root_path) twice under the hood.
especially because this is only used to apply smth to arguments?
feels like the wrong location to do this
There was a problem hiding this comment.
looks like we only need the project paths and not the entire config to modify the remappings?
There was a problem hiding this comment.
yep, good point, I changed this in 8b2d7b0 to load them from figment, this also correctly loads the current profile src/script/test dirs.
Hope this makes sense, pls check. thanks!
grandizzy
requested review from
DaniPopes,
klkvr,
mattsse,
yash-atreya and
zerosnacks
as code owners
mattsse
approved these changes
Nov 7, 2024
rplusq
pushed a commit
to rplusq/foundry
that referenced
this pull request
Nov 29, 2024
…undry-rs#9258) * fix(remappings): ignore remappings of root proj dir when merging * Remove unused code * Add test * Update * Load project paths from figment --------- Co-authored-by: zerosnacks <95942363+zerosnacks@users.noreply.github.com>
This was referenced Dec 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Closes #3440
Solution