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

Closed
wants to merge 18 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 8, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 18 commits October 31, 2019 10:22
This doesn't migrate the pretty-printing everybody loops, which will be
done in the next few commits.
This allows us to query whether PpmEveryBodyLoops is set during
expansion and run the everybody loops pass.
This function was only ever called with 1 so there's little point in it;
this isn't an expensive operation (essentially a checked add) so we're
not really "reserving" anything either.
When a formatting string contains an invalid descriptor, point at it
instead of the argument:

```
error: unknown format trait `foo`
  --> $DIR/ifmt-bad-arg.rs:86:17
   |
LL |     println!("{:foo}", 1);
   |                 ^^^
   |
   = note: the only appropriate formatting traits are:
           - ``, which uses the `Display` trait
           - `?`, which uses the `Debug` trait
           - `e`, which uses the `LowerExp` trait
           - `E`, which uses the `UpperExp` trait
           - `o`, which uses the `Octal` trait
           - `p`, which uses the `Pointer` trait
           - `b`, which uses the `Binary` trait
           - `x`, which uses the `LowerHex` trait
           - `X`, which uses the `UpperHex` trait
```
Suggest to add lifetime constraint at explicit ouput of functions

Closes rust-lang#62097
Point at where clauses where the associated item was restricted

CC rust-lang#57663.
r? @nikomatsakis
…omatsakis

Move next node ID to Resolver

This moves the `next_node_id` method(s) and related tracking information to the resolver. By doing so, we also remove the OneThread and Cell on next_node_id in Session in this move, which means that the new code is simpler and less "interesting" as it doesn't tie itself to a single thread.

This required moving some of the pretty-printing logic around, but this was just copying the code without any semantic changes, so it's just a second commit instead of a separate PR; I can polish it up a bit more if desired.
…r=nikomatsakis

Point at formatting descriptor string when it is invalid

When a formatting string contains an invalid descriptor, point at it
instead of the argument:

```
error: unknown format trait `foo`
  --> $DIR/ifmt-bad-arg.rs:86:17
   |
LL |     println!("{:foo}", 1);
   |                 ^^^
   |
   = note: the only appropriate formatting traits are:
           - ``, which uses the `Display` trait
           - `?`, which uses the `Debug` trait
           - `e`, which uses the `LowerExp` trait
           - `E`, which uses the `UpperExp` trait
           - `o`, which uses the `Octal` trait
           - `p`, which uses the `Pointer` trait
           - `b`, which uses the `Binary` trait
           - `x`, which uses the `LowerHex` trait
           - `X`, which uses the `UpperHex` trait
```
@Centril
Copy link
Contributor Author

Centril commented Nov 8, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Nov 8, 2019

📌 Commit 3cb884a has been approved by Centril

@bors 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 8, 2019
@Centril Centril added the rollup A PR which is a rollup label Nov 8, 2019
@bors
Copy link
Contributor

bors commented Nov 8, 2019

⌛ Testing commit 3cb884a with merge 6c44f6e47bf89834527a0bf53e26b5ee340977ca...

@Centril
Copy link
Contributor Author

Centril commented Nov 8, 2019

@bors retry yielding to timed out PR.

@rust-highfive

This comment has been minimized.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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-08T23:22:22.7799585Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-08T23:22:22.7998520Z ##[command]git config gc.auto 0
2019-11-08T23:22:22.8080262Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-08T23:22:22.8155466Z ##[command]git config --get-all http.proxy
2019-11-08T23:22:22.8358653Z ##[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/66231/merge:refs/remotes/pull/66231/merge
---
2019-11-08T23:49:38.5212920Z    Compiling rustc_plugin v0.0.0 (/checkout/src/librustc_plugin/deprecated)
2019-11-08T23:49:39.5840989Z error: lifetime may not live long enough
2019-11-08T23:49:39.5841421Z    --> src/librustc_interface/util.rs:791:63
2019-11-08T23:49:39.5841688Z     |
2019-11-08T23:49:39.5842046Z 724 | impl<'a, 'b> ReplaceBodyWithLoop<'a, 'b> {
2019-11-08T23:49:39.5842825Z     |      |
2019-11-08T23:49:39.5843182Z     |      lifetime `'a` defined here
2019-11-08T23:49:39.5843427Z ...
2019-11-08T23:49:39.5843427Z ...
2019-11-08T23:49:39.5843826Z 791 |         sig.header.constness.node == ast::Constness::Const || Self::should_ignore_fn(&sig.decl)
2019-11-08T23:49:39.5844649Z     |                                                               ^^^^^^^^^^^^^^^^^^^^^^ requires that `'b` must outlive `'a`
2019-11-08T23:49:39.6136299Z error: aborting due to previous error
2019-11-08T23:49:39.6142135Z 
2019-11-08T23:49:39.6371716Z error: could not compile `rustc_interface`.
2019-11-08T23:49:39.6387322Z warning: build failed, waiting for other jobs to finish...
---
2019-11-08T23:49:56.8487755Z   local time: Fri Nov  8 23:49:56 UTC 2019
2019-11-08T23:49:57.1277906Z   network time: Fri, 08 Nov 2019 23:49:57 GMT
2019-11-08T23:49:57.1280897Z == end clock drift check ==
2019-11-08T23:49:58.2073453Z 
2019-11-08T23:49:58.2197858Z ##[error]Bash exited with code '1'.
2019-11-08T23:49:58.2237651Z ##[section]Starting: Checkout
2019-11-08T23:49:58.2240035Z ==============================================================================
2019-11-08T23:49:58.2240101Z Task         : Get sources
2019-11-08T23:49:58.2240175Z 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 closed this Nov 9, 2019
@Centril Centril deleted the rollup-f9ix0r5 branch November 9, 2019 00:13
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 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.

None yet

8 participants