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

Closed
wants to merge 17 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 27, 2019

Successful merges:

Failed merges:

r? @ghost

rinon and others added 17 commits September 25, 2019 17:45
New Exprs generated as part of the format macro expansion should get the macro
expansion span which has an expansion context, not the span of the format string
which does not.
update rtpSpawn's parameters type(It's prototype has been updated in …
When the panic handler is run, the existing Handler may be in a weird
state if it was responsible for triggering the panic. By using a freshly
created Handler, we avoid trying to re-entrantly lock a HandlerInner,
which was causing a double panic on ICEs.
The non-global context was removed; there's only one context now. This
is a noop method that only serves to confuse readers -- remove it.
There's no longer two distinct gcx and tcx lifetimes which made this
necessary (or, at least, the code compiles -- it's possible we got
better at normalizing, but that seems unlikely).
…varkor

Include message on tests that should panic but do not

As per issue rust-lang#60790 includes a message for tests marked `#[should_panic]` that do not panic as expected.

Fixes rust-lang#60790.
Remove stray references to the old global tcx
Fix format macro expansions spans to be macro-generated

New Exprs generated as part of the format macro expansion should get the macro
expansion span with an expansion context, rather than the span of the format string
which does not.
…Simulacrum

Fix double panic when printing query stack during an ICE

On the latest nightly, any call to `bug` or `span_bug` will result in two panics - the first one as a normal result of calling `bug` / `span_bug`, and the second as a result of trying to print the query stack from the panic handler. This is caused by the query-printing code attempting to acquire a lock on `HandlerInnder`, which is still being held by `bug`.

This PR moves the actual panic out of `HandlerInner`, into `Handler`. This allows us to release the lock on `HandlerInner` before triggering the panic, ensuring that the panic handler will be able to acquire the lock if necessary.
Fix div_duration() marked as stable by mistake
update rtpSpawn's parameters type(It's prototype has been updated in libc)

r? @alexcrichton
@Centril Centril closed this Sep 27, 2019
@Centril Centril deleted the rollup-9s1jdbm branch September 27, 2019 06:07
@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-09-27T06:08:14.4315029Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-27T06:08:14.4532957Z ##[command]git config gc.auto 0
2019-09-27T06:08:14.4619167Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-27T06:08:14.4679281Z ##[command]git config --get-all http.proxy
2019-09-27T06:08:14.4826324Z ##[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/64831/merge:refs/remotes/pull/64831/merge
2019-09-27T06:08:15.2725034Z fatal: couldn't find remote ref refs/pull/64831/merge
2019-09-27T06:08:15.3984228Z ##[warning]Git fetch failed with exit code 128, back off 8.481 seconds before retry.
2019-09-27T06:08:23.7890099Z ##[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/64831/merge:refs/remotes/pull/64831/merge
2019-09-27T06:08:24.3896457Z fatal: couldn't find remote ref refs/pull/64831/merge
2019-09-27T06:08:24.4398297Z ##[warning]Git fetch failed with exit code 128, back off 7.054 seconds before retry.
2019-09-27T06:08:31.4461462Z ##[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/64831/merge:refs/remotes/pull/64831/merge
2019-09-27T06:08:32.0419097Z fatal: couldn't find remote ref refs/pull/64831/merge
2019-09-27T06:08:32.1018502Z ##[error]Git fetch failed with exit code: 128
2019-09-27T06:08:32.1319493Z ##[section]Starting: Checkout
2019-09-27T06:08:32.1321092Z ==============================================================================
2019-09-27T06:08:32.1321155Z Task         : Get sources
2019-09-27T06:08:32.1321193Z 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
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.

9 participants