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 #70653

Merged
merged 39 commits into from
Apr 1, 2020
Merged

Rollup of 6 pull requests #70653

merged 39 commits into from
Apr 1, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 1, 2020

Successful merges:

Failed merges:

r? @ghost

rcoh and others added 30 commits March 27, 2020 22:02
This diff improves error messages around raw strings in a few ways:
- Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test)
- Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings
- Detect potentially intended terminators (longest sequence of "#*" is suggested)
This is a pure refactoring with no behavior changes.
This is a follow-up to rust-lang#70123, which added `llvm-config --libdir` to the
`LIBRARY_PATH` for rustc tools. We need the same for "run-make-fulldeps"
and "ui-fulldeps" tests which depend on compiler libraries, implicitly
needing to link to `-lLLVM` as well.
@Centril Centril added the rollup A PR which is a rollup label Apr 1, 2020
@bors
Copy link
Contributor

bors commented Apr 1, 2020

⌛ Testing commit c1419b4 with merge 5ab42ba86a9f77a7c961bfd7e362e9647471c5da...

@Centril
Copy link
Contributor Author

Centril commented Apr 1, 2020

@bors treeclosed=500

@bors
Copy link
Contributor

bors commented Apr 1, 2020

💔 Test failed - checks-azure

@bors 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 Apr 1, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 1, 2020

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 1, 2020

@bors p=1000

@bors
Copy link
Contributor

bors commented Apr 1, 2020

⌛ Testing commit c1419b4 with merge cd9540e58384763651b11f178fcbfad1d258e488...

@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.
2020-04-01T12:33:00.3587852Z ========================== Starting Command Output ===========================
2020-04-01T12:33:00.3590201Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/673fa107-69ae-44bf-96df-54a165936421.sh
2020-04-01T12:33:00.3590433Z 
2020-04-01T12:33:00.3593447Z ##[section]Finishing: Disable git automatic line ending conversion
2020-04-01T12:33:00.3611291Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70653/merge to s
2020-04-01T12:33:00.3614534Z Task         : Get sources
2020-04-01T12:33:00.3614800Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-04-01T12:33:00.3615057Z Version      : 1.0.0
2020-04-01T12:33:00.3615231Z Author       : Microsoft
---
2020-04-01T12:33:01.5570746Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-04-01T12:33:01.5583641Z ##[command]git config gc.auto 0
2020-04-01T12:33:01.5590966Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-04-01T12:33:01.5596435Z ##[command]git config --get-all http.proxy
2020-04-01T12:33:01.5613315Z ##[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/70653/merge:refs/remotes/pull/70653/merge
---
2020-04-01T12:34:20.8748255Z E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?
2020-04-01T12:34:20.8791433Z 
2020-04-01T12:34:20.8874137Z ##[error]Bash exited with code '100'.
2020-04-01T12:34:20.8888282Z ##[section]Finishing: Install awscli
2020-04-01T12:34:20.8954770Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70653/merge to s
2020-04-01T12:34:20.8959599Z Task         : Get sources
2020-04-01T12:34:20.8959963Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-04-01T12:34:20.8960277Z Version      : 1.0.0
2020-04-01T12:34:20.8960499Z Author       : Microsoft
2020-04-01T12:34:20.8960499Z Author       : Microsoft
2020-04-01T12:34:20.8960874Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-04-01T12:34:20.8961282Z ==============================================================================
2020-04-01T12:34:21.2452384Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-04-01T12:34:21.2514782Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70653/merge to s
2020-04-01T12:34:21.2616437Z Cleaning up task key
2020-04-01T12:34:21.2617718Z Start cleaning up orphan processes.
2020-04-01T12:34:21.2804140Z Terminate orphan process: pid (3672) (python)
2020-04-01T12:34:21.3017358Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Apr 1, 2020

💔 Test failed - checks-azure

@bors 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 Apr 1, 2020
@Centril
Copy link
Contributor Author

Centril commented Apr 1, 2020

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2020
@bors
Copy link
Contributor

bors commented Apr 1, 2020

⌛ Testing commit c1419b4 with merge 235938d...

@bors
Copy link
Contributor

bors commented Apr 1, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 235938d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 1, 2020
@bors bors merged commit 235938d into rust-lang:master Apr 1, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #70653!

Tested on commit 235938d.
Direct link to PR: #70653

💔 clippy-driver on windows: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 1, 2020
Tested on commit rust-lang/rust@235938d.
Direct link to PR: <rust-lang/rust#70653>

💔 clippy-driver on windows: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-fail → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
@Centril Centril deleted the rollup-vh5x5e5 branch April 1, 2020 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants