Canonicalize paths to fix path matching #143
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
cjpearce
changed the title
cjpearce
changed the title
cjpearce
force-pushed
the
fix-exercise-path-matching
branch
from
848922a to
d01a71f
Compare
|
After doing some more testing, I've discovered that I've created a panic when an incorrect filename is supplied. I'll tidy up the error handling to avoid this. |
komaeda
reviewed
Apr 12, 2019
src/exercise.rs
Outdated
|
|
||
| #[test] | ||
| fn test_clean() { | ||
| std::fs::File::create(&temp_file()).unwrap(); |
There was a problem hiding this comment.
I think it's fine to use this
There was a problem hiding this comment.
I've tried to clean that up a bit by adding a use declaration in a test module. Putting the use at the top gives 'unused' warnings when doing a normal build. I couldn't spot a clear convention for this situation online but I'm open to suggestions if you have any ideas. I'm mainly trying to keep that test alive since it was in the original utilities.rs file.
src/exercise.rs
Outdated
| mode: Mode::Test, | ||
| }; | ||
| exercise.clean(); | ||
| assert!(!std::path::Path::new(&temp_file()).exists()); |
komaeda
approved these changes
Apr 13, 2019
|
@bors r+ |
|
📌 Commit 77de6e5 has been approved by |
bors
added a commit
that referenced
this pull request
Apr 13, 2019
Canonicalize paths to fix path matching This PR should fix #126. The main solution to the issue was using `canonicalize()` on the paths we create for the exercises from `info.toml` and any user-specified paths, so that path `ends_with` matching will work correctly. As adding calls to the canonicalize function everywhere requires unwrapping, I also decided to extract a struct representing an exercise and use serde to deserialize the paths from the `info.toml` file up front. I also tried to move the path handling out into the `exercise.rs` file and down into `main.rs` so that it doesn't create as much clutter. There was already a lot of unwrapping and path handling in the other files and I felt like it was getting a bit too repetitive. If the approach is going too far (too many changes etc.) I'm happy to try to produce a smaller PR that fixes the bug without any refactoring.
|
☀️ Test successful - checks-travis |
pedantic79
pushed a commit
to pedantic79/rustlings
that referenced
this pull request
Apr 11, 2020
…komaeda Canonicalize paths to fix path matching This PR should fix rust-lang#126. The main solution to the issue was using `canonicalize()` on the paths we create for the exercises from `info.toml` and any user-specified paths, so that path `ends_with` matching will work correctly. As adding calls to the canonicalize function everywhere requires unwrapping, I also decided to extract a struct representing an exercise and use serde to deserialize the paths from the `info.toml` file up front. I also tried to move the path handling out into the `exercise.rs` file and down into `main.rs` so that it doesn't create as much clutter. There was already a lot of unwrapping and path handling in the other files and I felt like it was getting a bit too repetitive. If the approach is going too far (too many changes etc.) I'm happy to try to produce a smaller PR that fixes the bug without any refactoring.
ppp3
pushed a commit
to ppp3/rustlings
that referenced
this pull request
May 23, 2022
…komaeda Canonicalize paths to fix path matching This PR should fix rust-lang#126. The main solution to the issue was using `canonicalize()` on the paths we create for the exercises from `info.toml` and any user-specified paths, so that path `ends_with` matching will work correctly. As adding calls to the canonicalize function everywhere requires unwrapping, I also decided to extract a struct representing an exercise and use serde to deserialize the paths from the `info.toml` file up front. I also tried to move the path handling out into the `exercise.rs` file and down into `main.rs` so that it doesn't create as much clutter. There was already a lot of unwrapping and path handling in the other files and I felt like it was getting a bit too repetitive. If the approach is going too far (too many changes etc.) I'm happy to try to produce a smaller PR that fixes the bug without any refactoring.
dmoore04
pushed a commit
to dmoore04/rustlings
that referenced
this pull request
Sep 11, 2022
…komaeda Canonicalize paths to fix path matching This PR should fix rust-lang#126. The main solution to the issue was using `canonicalize()` on the paths we create for the exercises from `info.toml` and any user-specified paths, so that path `ends_with` matching will work correctly. As adding calls to the canonicalize function everywhere requires unwrapping, I also decided to extract a struct representing an exercise and use serde to deserialize the paths from the `info.toml` file up front. I also tried to move the path handling out into the `exercise.rs` file and down into `main.rs` so that it doesn't create as much clutter. There was already a lot of unwrapping and path handling in the other files and I felt like it was getting a bit too repetitive. If the approach is going too far (too many changes etc.) I'm happy to try to produce a smaller PR that fixes the bug without any refactoring.
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 PR should fix #126. The main solution to the issue was using
canonicalize()on the paths we create for the exercises frominfo.tomland any user-specified paths, so that pathends_withmatching will work correctly.As adding calls to the canonicalize function everywhere requires unwrapping, I also decided to extract a struct representing an exercise and use serde to deserialize the paths from the
info.tomlfile up front. I also tried to move the path handling out into theexercise.rsfile and down intomain.rsso that it doesn't create as much clutter. There was already a lot of unwrapping and path handling in the other files and I felt like it was getting a bit too repetitive.If the approach is going too far (too many changes etc.) I'm happy to try to produce a smaller PR that fixes the bug without any refactoring.