Canonicalize include paths before emitting #258
Merged
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
This allows `CARGO_MANIFEST_DIR` to be a relative path, which can be useful in non-cargo build systems.
Kijewski
force-pushed
the
pr-canon-paths
branch
from
c9f8191 to
0a04195
Compare
GuillaumeGomez
previously approved these changes
Nov 19, 2024
|
Drawback: Before this PR, the crate root could reside in a non-UTF-8 path without issues, and only everything inside it had to have a sane encoding. With the PR, the whole path has to be sane. But I guess that's okay. As a user, I don't think I would expect things to be working if my path was broken. |
rinja_derive/src/generator.rs
Outdated
| @@ -172,10 +172,11 @@ impl<'a> Generator<'a> { | |||
| Source::Source(_) => path != &*self.input.path, | |||
| }; | |||
| if path_is_valid { | |||
| let path = path.to_str().unwrap(); | |||
| let canonical_path = path.canonicalize().unwrap(); | |||
| let include_path = canonical_path.to_str().unwrap(); | |||
There was a problem hiding this comment.
Do we actually need to convert it to string? Can't we just use its Debug impl?
There was a problem hiding this comment.
Good idea! No, it seems to work just fine without it. And instead of panicking if the path could not be resolved, we can simply use the relative path. I think that's quite elegant. :)
GuillaumeGomez
approved these changes
Nov 19, 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.
This allows
CARGO_MANIFEST_DIRto be a relative path, which can be useful in non-cargo build systems.Cherry-picked from https://github.com/djc/askama/pull/1107.