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

Support relative paths for registries #6873

Merged
merged 5 commits into from Apr 29, 2019

Conversation

Projects
None yet
4 participants
@fluffysquirrels
Copy link
Contributor

commented Apr 24, 2019

Closes #2252

I haven't finished the tests for this yet as I wasn't sure what was necessary. Is it OK to just test through registry_configuration() in src/cargo/ops/registry.rs or are integration tests required? If integration tests then I'm not sure what cargo sub-command I can run without a real remote registry to play with; any thoughts?

@rust-highfive

This comment has been minimized.

Copy link

commented Apr 24, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@fluffysquirrels

This comment has been minimized.

Copy link
Contributor Author

commented Apr 27, 2019

I wrote a few integration tests for this that pull dependencies from a registry with a relative path.

@ehuss

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

I'm a little concerned about changing the definition of registry.index to a URL or file path. Can we keep it strictly URLs only? I think file: URLs should work with relative paths (for example file:alternative-registry, which seems to work as-is in this PR). Perhaps just do Url::parse() on the value just to verify that it is a url before passing it to Url::options().

@fluffysquirrels

This comment has been minimized.

Copy link
Contributor Author

commented Apr 29, 2019

@ehuss ,

OK, makes sense to me, I'll push an update.

Today I learned about relative URLs with a file: protocol prefix!

@fluffysquirrels

This comment has been minimized.

Copy link
Contributor Author

commented Apr 29, 2019

@ehuss, I've pushed a new version with your suggestions.

@ehuss

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

Thanks!
@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

📌 Commit 987f19d has been approved by ehuss

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

⌛️ Testing commit 987f19d with merge 6f39916...

bors added a commit that referenced this pull request Apr 29, 2019

Auto merge of #6873 - fluffysquirrels:rel-registry-url, r=ehuss
Support relative paths for registries

Closes #2252

I haven't finished the tests for this yet as I wasn't sure what was necessary. Is it OK to just test through `registry_configuration()` in `src/cargo/ops/registry.rs` or are integration tests required? If integration tests then I'm not sure what cargo sub-command I can run without a real remote registry to play with; any thoughts?
@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing 6f39916 to master...

@bors bors merged commit 987f19d into rust-lang:master Apr 29, 2019

3 checks passed

Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.