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
Non broken fetchcargo #46362
Merged
Merged
Non broken fetchcargo #46362
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b66ef28
buildRustPackage, fetchcargo: optionally use vendor config from cargo…
erictapen ccf72b8
fetchcargo: normalise cargo config to ensure determinism
symphorien f20b229
fectchcargo: don't break old sha256
symphorien 7bfa201
fetchcargo: add type checking to cargo-vendor-normalise.py
Mic92 33dab23
alacritty: switch back to upstream source
Mic92 a3e1da1
cargo-vendor-normalise: add a small install check
symphorien 50578ab
fetchcargo: Fix cargo-vendor-normalise for darwin
infinisil File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
#!/usr/bin/env python | ||
|
||
import sys | ||
|
||
import toml | ||
|
||
|
||
def quote(s: str) -> str: | ||
escaped = s.replace('"', r"\"").replace("\n", r"\n").replace("\\", "\\\\") | ||
return '"{}"'.format(escaped) | ||
|
||
|
||
def main() -> None: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added type checking here and reformatted the code with |
||
data = toml.load(sys.stdin) | ||
|
||
assert list(data.keys()) == ["source"] | ||
|
||
# this value is non deterministic | ||
data["source"]["vendored-sources"]["directory"] = "@vendor@" | ||
|
||
lines = [] | ||
inner = data["source"] | ||
for source, attrs in sorted(inner.items()): | ||
lines.append("[source.{}]".format(quote(source))) | ||
if source == "vendored-sources": | ||
lines.append('"directory" = "@vendor@"\n') | ||
else: | ||
for key, value in sorted(attrs.items()): | ||
attr = "{} = {}".format(quote(key), quote(value)) | ||
lines.append(attr) | ||
lines.append("") | ||
|
||
result = "\n".join(lines) | ||
real = toml.loads(result) | ||
assert real == data, "output = {} while input = {}".format(real, data) | ||
|
||
print(result) | ||
|
||
|
||
if __name__ == "__main__": | ||
main() |
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[source."crates-io"] | ||
"replace-with" = "vendored-sources" | ||
|
||
[source."vendored-sources"] | ||
"directory" = "@vendor@" | ||
|
||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added this as a test, because it makes use of the new
.cargo/config