Rollup of 7 pull requests by emilyalbini · Pull Request #66739 · rust-lang/rust

emilyalbini · 2019-11-25T14:05:29Z

Successful merges:

Preserve whitespace inside one-backtick codeblocks #65613 (Preserve whitespace inside one-backtick codeblocks)
Add unix::process::CommandExt::arg0 #66512 (Add unix::process::CommandExt::arg0)
GitHub Actions: preparations, part 1 #66569 (GitHub Actions: preparations, part 1)
Remove useless line for error index generation #66678 (Remove useless line for error index generation)
Drive-by cleanup in region naming #66684 (Drive-by cleanup in region naming)
Add some comments to panic runtime #66694 (Add some comments to panic runtime)
tidy: Remove unused import #66698 (tidy: Remove unused import)

Failed merges:

Previously this was only done inside short docblocks (e.g., summary lines), but we should also do so in general.

This allows argv[0] to be overridden on the executable's command-line. This also makes the program executed independent of argv[0]. Does Fuchsia have the same semantics? Addresses: rust-lang#66510

Some environment variables (like DEPLOY or DEPLOY_ALT for dist builders, or IMAGE on Linux builders) are set on a lot of builders, and whether they should be present or not can be detected automatically based on the builder name and the platform. This commit simplifies the CI configuration by automatically setting those environment variables.

…, r=GuillaumeGomez Preserve whitespace inside one-backtick codeblocks Previously this was only done inside short docblocks (e.g., summary lines), but we should also do so in general. Fixesrust-lang#65555

Add unix::process::CommandExt::arg0 This allows argv[0] to be overridden on the executable's command-line. This also makes the program executed independent of argv[0]. Does Fuchsia have the same semantics? I'm assuming so. Addresses: rust-lang#66510

@alexcrichton

GitHub Actions: preparations, part 1 This PR adds the first batch of commits in preparation for GitHub Actions: * Added GitHub Actions support in `src/ci/shared.sh` and bootstrap. * Addded a `setup-environment.sh` script which guesses and sets the `DEPLOY`, `DEPLOY_ALT` and `IMAGE` environment variables automatically, to reduce the verbosity of the CI configuration. This PR does **not** yet add any builders on GitHub Actions. r? @alexcrichton

@Dylan-DPC

…-index-line, r=Dylan-DPC Remove useless line for error index generation As you can see here: https://github.com/rust-lang/rust/blob/master/src/librustc_error_codes/error_codes.rs#L10, this replacement is now completely useless. r? @Dylan-DPC

…=davidtwco Drive-by cleanup in region naming

Add some comments to panic runtime

…acrum tidy: Remove unused import It produces annoying warnings on `x.py` runs.

emilyalbini · 2019-11-25T14:06:37Z

@bors r+ p=7 rollup=never

bors · 2019-11-25T14:06:39Z

📌 Commit 43d7732 has been approved by pietroalbini

bors · 2019-11-25T16:02:54Z

⌛ Testing commit 43d7732 with merge 61a070b013c0982267542ba3a2867b30894fdfea...

bors · 2019-11-25T16:23:02Z

💔 Test failed - checks-azure

rust-highfive · 2019-11-25T16:23:03Z

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-11-25T16:20:24.4880850Z + /scripts/validate-toolstate.sh
2019-11-25T16:20:24.4929025Z Cloning into 'rust-toolstate'...
2019-11-25T16:20:25.1810062Z <Nothing changed>
2019-11-25T16:20:28.2377616Z Traceback (most recent call last):
2019-11-25T16:20:28.2377938Z File "../../src/tools/publish_toolstate.py", line 267, in <module>
2019-11-25T16:20:28.2378253Z validate_maintainers(repo, github_token)
2019-11-25T16:20:28.2378370Z File "../../src/tools/publish_toolstate.py", line 75, in validate_maintainers
2019-11-25T16:20:28.2379138Z assignable.extend(user['login'] for user in json.load(response))
2019-11-25T16:20:28.2379259Z File "/usr/lib/python2.7/json/__init__.py", line 287, in load
2019-11-25T16:20:28.2379375Z return loads(fp.read(),
2019-11-25T16:20:28.2379476Z File "/usr/lib/python2.7/socket.py", line 355, in read
2019-11-25T16:20:28.2379554Z data = self._sock.recv(rbufsize)
2019-11-25T16:20:28.2379653Z File "/usr/lib/python2.7/httplib.py", line 622, in read
2019-11-25T16:20:28.2379747Z s = self.fp.read(amt)
2019-11-25T16:20:28.2379823Z File "/usr/lib/python2.7/socket.py", line 384, in read
2019-11-25T16:20:28.2380125Z data = self._sock.recv(left)
2019-11-25T16:20:28.2380218Z File "/usr/lib/python2.7/ssl.py", line 756, in recv
2019-11-25T16:20:28.2380314Z return self.read(buflen)
2019-11-25T16:20:28.2380390Z File "/usr/lib/python2.7/ssl.py", line 643, in read
2019-11-25T16:20:28.2380483Z v = self._sslobj.read(len)
2019-11-25T16:20:28.2380599Z ssl.SSLError: [SSL: DECRYPTION_FAILED_OR_BAD_RECORD_MAC] decryption failed or bad record mac (_ssl.c:1758)
2019-11-25T16:20:28.2430280Z local time: Mon Nov 25 16:20:28 UTC 2019
2019-11-25T16:20:28.5135812Z network time: Mon, 25 Nov 2019 16:20:28 GMT
2019-11-25T16:20:28.5137163Z == end clock drift check ==
2019-11-25T16:20:30.6456890Z 2019-11-25T16:20:30.6456890Z 2019-11-25T16:20:30.6513574Z ##[error]Bash exited with code '1'.
2019-11-25T16:20:30.6543369Z ##[section]Starting: Checkout
2019-11-25T16:20:30.6545653Z ==============================================================================
2019-11-25T16:20:30.6545737Z Task : Get sources
2019-11-25T16:20:30.6545835Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

emilyalbini · 2019-11-25T16:23:42Z

Wtf.

@bors retry

bors · 2019-11-25T19:37:59Z

⌛ Testing commit 43d7732 with merge a44774c...

@ghost

Rollup of 7 pull requests Successful merges: - #65613 (Preserve whitespace inside one-backtick codeblocks) - #66512 (Add unix::process::CommandExt::arg0) - #66569 (GitHub Actions: preparations, part 1) - #66678 (Remove useless line for error index generation) - #66684 (Drive-by cleanup in region naming) - #66694 (Add some comments to panic runtime) - #66698 (tidy: Remove unused import) Failed merges: r? @ghost

bors · 2019-11-25T22:45:45Z

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing a44774c to master...

Mark-Simulacrumand others added 18 commits October 19, 2019 19:21

Preserve whitespace inside one-backtick codeblocks
bc3ed32
Previously this was only done inside short docblocks (e.g., summary lines), but we should also do so in general.

Add unix::process::CommandExt::arg0
6dee1a5
This allows argv[0] to be overridden on the executable's command-line. This also makes the program executed independent of argv[0]. Does Fuchsia have the same semantics? Addresses: rust-lang#66510

ci: add support for GitHub Actions in the CI scripts
262ce31

DO NOT MERGE: enable windows try builder
90a37bc

Remove useless line for error index generation
347575a

drive-by cleanup in region naming
135c8b9

panicking comments
35ee6bd

expand type info on __rust_start_panic
80f5213

make comment compile
6440b94

tidy: Remove unused import
2e41ce9

Rollup merge ofrust-lang#65613- Mark-Simulacrum:rustdoc-preserve-ws…
7520f6d
…, r=GuillaumeGomez Preserve whitespace inside one-backtick codeblocks Previously this was only done inside short docblocks (e.g., summary lines), but we should also do so in general. Fixesrust-lang#65555

Rollup merge ofrust-lang#66684- mark-i-m:error-reporting-cleanup, r…
11b8e16
…=davidtwco Drive-by cleanup in region naming

Rollup merge ofrust-lang#66694- RalfJung:panic-comments, r=Dylan-DPC
30599d7
Add some comments to panic runtime

Rollup merge ofrust-lang#66698- petrochenkov:tidywarn, r=Mark-Simul…
43d7732
…acrum tidy: Remove unused import It produces annoying warnings on `x.py` runs.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 25, 2019

emilyalbini added the rollup A PR which is a rollup label Nov 25, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 25, 2019

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 25, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2019

bors merged commit 43d7732 into rust-lang:masterNov 25, 2019

This was referenced Nov 25, 2019
Stop explicitly depending on python 2 #66605
Merged
Move toolstate checking into bootstrap #66681
Merged
Format libcore with rustfmt #66691
Merged

emilyalbini deleted the rollup-2t2pd4a branch December 23, 2020 23:00

Navigation Menu

Uh oh!

Uh oh!

Rollup of 7 pull requests - #66739

Rollup of 7 pull requests#66739
bors merged 18 commits into
rust-lang:masterfrom
emilyalbini:rollup-2t2pd4a

emilyalbini commented Nov 25, 2019

Uh oh!

emilyalbini commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

rust-highfive commented Nov 25, 2019

Uh oh!

emilyalbini commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

emilyalbini commented Nov 25, 2019

Uh oh!

emilyalbini commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

rust-highfive commented Nov 25, 2019

Uh oh!

emilyalbini commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

bors commented Nov 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants