Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UNC prefix stripping inconsistency (Fixes #561) #562

Merged
merged 3 commits into from
Jun 13, 2021

Conversation

WilliamVenner
Copy link
Contributor

No description provided.

@sagiegurari
Copy link
Owner

@WilliamVenner this is great, thanks a lot!
i'll check it out a bit more tomorrow and merge it. but from quick glance of the code, it looks good.

@codecov-commenter
Copy link

codecov-commenter commented Jun 4, 2021

Codecov Report

Merging #562 (e06a222) into master (1f18941) will decrease coverage by 0.02%.
The diff coverage is 60.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #562      +/-   ##
==========================================
- Coverage   92.78%   92.76%   -0.03%     
==========================================
  Files          98       98              
  Lines       19260    19246      -14     
==========================================
- Hits        17871    17854      -17     
- Misses       1389     1392       +3     
Impacted Files Coverage Δ
src/lib/environment/mod_test.rs 95.49% <ø> (-0.04%) ⬇️
src/lib/descriptor/mod.rs 85.16% <50.00%> (-0.41%) ⬇️
src/lib/environment/mod.rs 90.00% <100.00%> (-0.19%) ⬇️
src/lib/scriptengine/shebang_script_test.rs 98.38% <0.00%> (-1.62%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1f18941...e06a222. Read the comment docs.

@sagiegurari
Copy link
Owner

@WilliamVenner code looks really great.
can you verify on windows that all these env vars look good and if not, maybe use your fix?
if needed, maybe create some util function so it can be easily reused?

CARGO_MAKE_CURRENT_TASK_INITIAL_MAKEFILE
CARGO_MAKE_CURRENT_TASK_INITIAL_MAKEFILE_DIRECTORY
CARGO_MAKE_WORKING_DIRECTORY
CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY
CARGO_MAKE_CRATE_TARGET_DIRECTORY
CARGO_MAKE_CRATE_CUSTOM_TRIPLE_TARGET_DIRECTORY
CARGO_MAKE_CARGO_HOME

@sagiegurari
Copy link
Owner

@WilliamVenner just making sure you saw my comment :)

@WilliamVenner
Copy link
Contributor Author

Sorry! I have been really busy over the past week. Btw, edits are open to maintainers for my PR if there's anything you want to clean up before merge.

I did a quick test of those environment variables:

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\$BLACKHOLE\adwdaw\Makefile.toml
C:\Users\billy\$BLACKHOLE\adwdaw\Makefile.toml

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\$BLACKHOLE\adwdaw
C:\Users\billy\$BLACKHOLE\adwdaw

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\$BLACKHOLE\adwdaw
C:\Users\billy\$BLACKHOLE\adwdaw

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\$BLACKHOLE\adwdaw
C:\Users\billy\$BLACKHOLE\adwdaw

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\$BLACKHOLE\adwdaw\target
C:\Users\billy\$BLACKHOLE\adwdaw\target

C:\Users\billy\$BLACKHOLE\adwdaw>echo
ECHO is on.

C:\Users\billy\$BLACKHOLE\adwdaw>echo C:\Users\billy\.cargo
C:\Users\billy\.cargo

@sagiegurari
Copy link
Owner

thanks a lot. I'll be merging it soon.

@sagiegurari sagiegurari changed the base branch from master to 0.34.0 June 13, 2021 16:35
@sagiegurari
Copy link
Owner

merging it to a new dev branch. thanks a lot for the PR!!!
i'll probably test few things more myself before publishing it.

@sagiegurari sagiegurari merged commit 81c90ce into sagiegurari:0.34.0 Jun 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants