8000 Rollup of 8 pull requests by Mark-Simulacrum · Pull Request #52857 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 8 pull requests #52857

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.

Sign up for GitHub

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

Closed
wants to merge 18 commits into from
Closed

Rollup of 8 pull requests #52857

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7fb0a52
Update clippy to latest master
cmdln Jul 26, 2018
922bf1d
Clarify thread::park semantics
matklad Jul 27, 2018
5f87f78
Fix ws
matklad Jul 27, 2018
b6d3143
pretty print for std::collections::vecdeque
fukatani Jul 29, 2018
ea25cf1
Fix From<LocalWaker>
MajorBreakfast Jul 29, 2018
9ccd7ee
Fix -Wpessimizing-move warnings in rustllvm/PassWrapper
varkor Jul 29, 2018
90165b8
Make sure #47772 does not regress
RalfJung Jul 29, 2018
9845ee0
fix coding style
fukatani Jul 29, 2018
2b25ee0
update comment
toidiu Jul 30, 2018
2994b27
Add timeout to use of `curl` in bootstrap.py.
kennytm Jul 30, 2018
7eb7175
Rollup merge of #52745 - commandline:master, r=oli-obk
Mark-Simulacrum Jul 30, 2018
9ad3754
Rollup merge of #52771 - matklad:patch-1, r=kennytm
Mark-Simulacrum Jul 30, 2018
fa86a46
Rollup merge of #52821 - fukatani:gdb-vecdeque-print, r=michaelwoerister
Mark-Simulacrum Jul 30, 2018
86e14d8
Rollup merge of #52822 - MajorBreakfast:fix-from-local-waker, r=cramertj
Mark-Simulacrum Jul 30, 2018
43d9c33
Rollup merge of #52824 - varkor:fix-llvm-ret-move-warnings, r=rkruppe
Mark-Simulacrum Jul 30, 2018
5739542
Rollup merge of #52825 - RalfJung:codegen, r=alexcrichton
Mark-Simulacrum Jul 30, 2018
ea49a74
Rollup merge of #52842 - toidiu:ak-commentUpdate, r=estebank
Mark-Simulacrum Jul 30, 2018
051df15
Rollup merge of #52846 - kennytm:bootstrap-curl-timeout, r=Mark-Simul…
Mark-Simulacrum Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add timeout to use of curl in bootstrap.py.
  • Loading branch information
@kennytm
kennytm committed Jul 30, 2018
commit 2994b27e4033c2a0b77ab90f5a896ce09a122992
5 changes: 4 additions & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ def _download(path, url, probably_big, verbose, exception):
option = "-#"
else:
option = "-s"
run(["curl", option, "--retry", "3", "-Sf", "-o", path, url],
run(["curl", option,
"-y", "30", "-Y", "10", # timeout if speed is < 10 bytes/sec for > 30 seconds
"--connect-timeout", "30", # timeout if cannot connect within 30 seconds
"--retry", "3", "-Sf", "-o", path, url],
verbose=verbose,
exception=exception)

Expand Down
0