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

Rollup of 6 pull requests #65631

Closed
wants to merge 32 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

sinkuu and others added 30 commits October 16, 2019 13:46
`expand_pattern()` has two callsites. One of them needs arena
allocation, but the other does not.

This commit moves the arena allocation out of the function. This avoids
the allocation of many 4 KiB page arena chunks that only hold a single
small allocation. It reduces the number of bytes allocated by up to 2%
for various benchmarks, albeit without only a very small improvement in
runtime.
resolve_vars_with_obligations, as it now also resolves const variables.
…=alexcrichton

ci: move most of the prepare config into scripts

This PR moves most of the configuration from the CI yamls into bash scripts, driven by a small Python script (which understands and emulates the two `##vso[` commands we use).

There are two reasons why we'd want to do this:

* Being able to prepare the build environment locally by just running `src/ci/prepare.py` simplifies a lot setting up a local VM similar to CI (software pre-installed in the CI images won't be prepared, but it's a start anyway).
* When we'll switch to GitHub Actions we'll need to either duplicate code in multiple workflows or write a preprocessor. Having all the prepare steps in a single one is going to simplify the implementation of both options.

Along with the move I did a few changes to the actual scripts:

* Mirrored all the remaining external URLs we download (except chocolatey) to the `rust-lang-ci-mirrors` bucket, to increase reliability and reduce the chance of supply chain attacks. I didn't audit and mirror the CI scripts outside this PR though.
* Extracted CI-specific behavior (like issuing `##vso[` commands and detecting the host platform) into `shared.sh` and included it in most of the scripts. This way a switch to another CI provider will be less painful.

It's possible (and easier) to review this commit-by-commit.
r? @alexcrichton
cc @rust-lang/infra
Clean up `contains()` `insert()` chains on HashSet

They can be merged to a single `insert()` call, which may avoid double-hashing/lookup of the value.
…m-expand_pattern, r=varkor

Avoid unnecessary arena allocations in `expand_pattern()`.

`expand_pattern()` has two callsites. One of them needs arena
allocation, but the other does not.

This commit moves the arena allocation out of the function. This avoids
the allocation of many 4 KiB page arena chunks that only hold a single
small allocation. It reduces the number of bytes allocated by up to 2%
for various benchmarks, albeit without only a very small improvement in
runtime.
Changed `resolve_type_vars_with_obligations` to also resolve const inference variables

Fixes rust-lang#65380
r? @varkor
Remove unreachable unit tuple compare binop codegen

Closes rust-lang#63906
Fixes rust-lang#63551

This is based on rust-lang#63906 by @luigisHat, who had trouble with rebasing his PR.
@JohnTitor JohnTitor closed this Oct 20, 2019
@rust-highfive
Copy link
Collaborator

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-10-20T18:13:47.7468583Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-20T18:13:47.7672878Z ##[command]git config gc.auto 0
2019-10-20T18:13:47.7756783Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-20T18:13:47.7819491Z ##[command]git config --get-all http.proxy
2019-10-20T18:13:47.7968228Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65631/merge:refs/remotes/pull/65631/merge
2019-10-20T18:13:48.8101952Z fatal: couldn't find remote ref refs/pull/65631/merge
2019-10-20T18:13:48.8780229Z ##[warning]Git fetch failed with exit code 128, back off 1.235 seconds before retry.
2019-10-20T18:13:49.8622337Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65631/merge:refs/remotes/pull/65631/merge
2019-10-20T18:13:50.4830707Z fatal: couldn't find remote ref refs/pull/65631/merge
2019-10-20T18:13:50.5545562Z ##[warning]Git fetch failed with exit code 128, back off 8.424 seconds before retry.
2019-10-20T18:13:58.9118531Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65631/merge:refs/remotes/pull/65631/merge
2019-10-20T18:13:59.5041379Z fatal: couldn't find remote ref refs/pull/65631/merge
2019-10-20T18:13:59.5517551Z ##[error]Git fetch failed with exit code: 128
2019-10-20T18:13:59.5794567Z ##[section]Starting: Checkout
2019-10-20T18:13:59.5796017Z ==============================================================================
2019-10-20T18:13:59.5796063Z Task         : Get sources
2019-10-20T18:13:59.5796099Z 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)

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
@JohnTitor JohnTitor deleted the rollup-0p7hqds branch November 8, 2019 05:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants