Cleanup download-related code in the rustup_dist crate #1131
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
The actual code for handling downloads for rustup-dist is in `dist`, which in turn hands off to `rustup-utils` and `download` (the crate). Hopefully this clean-up makes it a little easier to figure out what's going on with downloads for future work.
The idea here is to reduce the API surface of `dist`, while consolidating download-related code into a single place. Was also able to remove a number of pointless pass-arounds of the `notification_handler` attached to DownloadCfg (haven't caught them all yet).
Diggsey
reviewed
May 22, 2017
| target_file.with_file_name( | ||
| target_file.file_name().map(|s| { | ||
| s.to_str().unwrap_or("_")}) | ||
| .unwrap_or("_") |
There was a problem hiding this comment.
Hm, I know you didn't add this, but falling back to underscore seems like a bad idea, and the filename is supposed to be the hash anyway, so this should be an expect instead.
|
This LGTM, thanks! The underscore thing I commented on should probably be fixed separately. @bors r+ |
|
📌 Commit 61f641a has been approved by |
bors
added a commit
that referenced
this pull request
May 22, 2017
Cleanup download-related code in the rustup_dist crate This PR is probably easiest to read if you do it commit-wise: the first commit just removes the old, unused `download` module from rustup_dist. The second commit pulls `DownloadCfg` (and friends) out into a _new_ `download` module. The only other change in there is that I've tried to kill some of the instances where the `notify_handler` gets needlessly passed around by moving functions to be methods on `DownloadCfg` + using the field it's already got. I suspect the only reason these weren't done before is that it was difficult to reason about the code, so hopefully this is an improvement. There aren't any (intentional) functional changes in this, so I haven't made any changes to the tests (aside from those required to get it to compile). No rush to get this merged for the same reason.
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced May 23, 2017
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 is probably easiest to read if you do it commit-wise: the first commit just removes the old, unused
downloadmodule from rustup_dist. The second commit pullsDownloadCfg(and friends) out into a newdownloadmodule.The only other change in there is that I've tried to kill some of the instances where the
notify_handlergets needlessly passed around by moving functions to be methods onDownloadCfg+ using the field it's already got. I suspect the only reason these weren't done before is that it was difficult to reason about the code, so hopefully this is an improvement.There aren't any (intentional) functional changes in this, so I haven't made any changes to the tests (aside from those required to get it to compile). No rush to get this merged for the same reason.