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 9 pull requests #60859

Closed
wants to merge 27 commits into from

Conversation

Projects
None yet
@Centril
Copy link
Member

commented May 15, 2019

Successful merges:

  • #59825 (string: implement From<&String> for String)
  • #59923 (Fix convert module's documentation links)
  • #60691 (Include expression to wait for to the span of Await)
  • #60763 (Move token tree related lexer state to a separate struct)
  • #60769 (Update rustc book CLI docs.)
  • #60811 (Bump measureme dependency to 0.3)
  • #60816 (README.md: Mention MSVC 2017+, not 2013(!))
  • #60827 (Use Symbol more in lint APIs)
  • #60851 (Move box from the stable keyword to unstable keywords list)

Failed merges:

r? @ghost

jsgf and others added some commits Apr 9, 2019

string: implement From<&String> for String
Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing &String to an `impl Into<String>`
parameter frictionless.
Move token tree related lexer state to a separate struct
We only used a bunch of fields when tokenizing into a token tree,
so let's move them out of the base lexer
move raw span to tt reader
See https://github.com/rust-lang/rust/pull/50838/files#r283296243 for
explanation how jointness checking works with *next* pair
Bump measureme dependency to 0.3
measureme@0.3 adds a version header to the binary file format which will
help reduce tool breakage in the future.
README: Mention MSVC 2017+, not 2013(!)
LLVM will soon require 2017+ [1] (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.

[1]: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
Rollup merge of #59825 - jsgf:from-ref-string, r=sfackler
string: implement From<&String> for String

Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing `&String` to an `impl Into<String>`
parameter frictionless.

Fixes #59827.
Rollup merge of #60691 - topecongiro:await-macro-span, r=Centril
Include expression to wait for to the span of Await

Currently the span of `await!` only includes itself:

```rust
    await!(3);
//  ^^^^^
```

This PR changes it so that the span holds the whole `await!` expression:

```rust
    await!(3);
//  ^^^^^^^^^
Rollup merge of #60763 - matklad:tt-parser, r=petrochenkov
Move token tree related lexer state to a separate struct

Just a types-based refactoring.

We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer
Rollup merge of #60769 - ehuss:rustc-cli-docs, r=steveklabnik
Update rustc book CLI docs.

This adds a little detail (and missing flags) to the rustc book. There is still a lot of information missing, but this seemed like a good step to expanding it.
Rollup merge of #60811 - wesleywiser:bump_measureme, r=varkor
Bump measureme dependency to 0.3

measureme@0.3 adds a version header to the binary file format which will
help reduce tool breakage in the future.
Rollup merge of #60816 - scottmcm:vcpp-download-link, r=alexcrichton
README.md: Mention MSVC 2017+, not 2013(!)

LLVM will soon require 2017+ (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.

Ref: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
Rollup merge of #60827 - oli-obk:late_symbol, r=nnethercote
Use `Symbol` more in lint APIs

r? @nnethercote

This will cause clippy breakage, but super trivial to fix since we can then remove the hacky `match_def_path` function that I added and go back to calling rustc's `match_def_path` method.
Rollup merge of #60851 - Pulkit07:issue60849, r=Centril
Move `box` from the stable keyword to unstable keywords list

Fixes #60849
@Centril

This comment has been minimized.

Copy link
Member Author

commented May 15, 2019

@bors r+ p=9 rollup=never

@bors

This comment has been minimized.

Copy link
Contributor

commented May 15, 2019

📌 Commit 9ad3d8f has been approved by Centril

bors added a commit that referenced this pull request May 15, 2019

Auto merge of #60859 - Centril:rollup-x7rcz9c, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #59825 (string: implement From<&String> for String)
 - #59923 (Fix convert module's documentation links)
 - #60691 (Include expression to wait for to the span of Await)
 - #60763 (Move token tree related lexer state to a separate struct)
 - #60769 (Update rustc book CLI docs.)
 - #60811 (Bump measureme dependency to 0.3)
 - #60816 (README.md: Mention MSVC 2017+, not 2013(!))
 - #60827 (Use `Symbol` more in lint APIs)
 - #60851 (Move `box` from the stable keyword to unstable keywords list)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented May 15, 2019

⌛️ Testing commit 9ad3d8f with merge 9620ab7...

@bors

This comment has been minimized.

Copy link
Contributor

commented May 15, 2019

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 15, 2019

The job x86_64-gnu-tools of your PR failed on Travis (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.
[01:24:15]     |
[01:24:15] 255 |                         .map(LocalInternedString::get)
[01:24:15]     |                          ^^^
[01:24:15]     |                          |
[01:24:15]     |                          expected signature of `fn(&syntax_pos::Symbol) -> _`
[01:24:15]     |                          found signature of `for<'r> fn(&'r syntax::symbol::LocalInternedString) -> _`
[01:24:15] 
[01:24:15] error[E0599]: no method named `collect` found for type `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}>` in the current scope
[01:24:15]     |
[01:24:15] 256 |                         .collect::<Vec<_>>();
[01:24:15]     |                          ^^^^^^^
[01:24:15]     |
[01:24:15]     |
[01:24:15]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:24:15]             `&mut std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:24:15]             `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:24:15] error[E0308]: mismatched types
[01:24:15]     --> src/tools/clippy/clippy_lints/src/utils/mod.rs:1124:28
[01:24:15]      |
[01:24:15]      |
[01:24:15] 1124 |     cx.match_def_path(did, &syms)
[01:24:15]      |
[01:24:15]      |
[01:24:15]      = note: expected type `&[syntax_pos::Symbol]`
[01:24:15]                 found type `&std::vec::Vec<&str>`
[01:24:17] error[E0631]: type mismatch in function arguments
[01:24:17]    --> src/tools/clippy/clippy_lints/src/consts.rs:255:26
[01:24:17]     |
[01:24:17] 255 |                         .map(LocalInternedString::get)
[01:24:17] 255 |                         .map(LocalInternedString::get)
[01:24:17]     |                          ^^^
[01:24:17]     |                          |
[01:24:17]     |                          expected signature of `fn(&syntax_pos::Symbol) -> _`
[01:24:17]     |                          found signature of `for<'r> fn(&'r syntax::symbol::LocalInternedString) -> _`
[01:24:17] 
[01:24:17] error[E0599]: no method named `collect` found for type `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}>` in the current scope
[01:24:17]     |
[01:24:17] 256 |                         .collect::<Vec<_>>();
[01:24:17]     |                          ^^^^^^^
[01:24:17]     |
[01:24:17]     |
[01:24:17]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:24:17]             `&mut std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:24:17]             `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:24:17] error[E0308]: mismatched types
[01:24:17]     --> src/tools/clippy/clippy_lints/src/utils/mod.rs:1124:28
[01:24:17]      |
[01:24:17]      |
[01:24:17] 1124 |     cx.match_def_path(did, &syms)
[01:24:17]      |
[01:24:17]      |
[01:24:17]      = note: expected type `&[syntax_pos::Symbol]`
[01:24:17]                 found type `&std::vec::Vec<&str>`
[01:24:18] error[E0308]: mismatched types
[01:24:18]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:24
[01:24:18]      |
[01:24:18]      |
[01:24:18] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:18]      |
[01:24:18]      = note: expected type `syntax_pos::Symbol`
[01:24:18]                 found type `&'static str`
[01:24:18] 
[01:24:18] 
[01:24:18] error[E0308]: mismatched types
[01:24:18]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:46
[01:24:18]      |
[01:24:18] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:18]      |
[01:24:18]      = note: expected type `syntax_pos::Symbol`
[01:24:18]                 found type `&'static str`
[01:24:18] 
[01:24:18] 
[01:24:19] error[E0308]: mismatched types
[01:24:19]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:82
[01:24:19]      |
[01:24:19] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:19]      |
[01:24:19]      = note: expected type `syntax_pos::Symbol`
[01:24:19]                 found type `&'static str`
[01:24:19] 
---
[01:24:19] warning: build failed, waiting for other jobs to finish...
[01:24:20] error[E0308]: mismatched types
[01:24:20]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:24
[01:24:20]      |
[01:24:20] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:20]      |
[01:24:20]      = note: expected type `syntax_pos::Symbol`
[01:24:20]                 found type `&'static str`
[01:24:20] 
[01:24:20] 
[01:24:20] error[E0308]: mismatched types
[01:24:20]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:46
[01:24:20]      |
[01:24:20] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:20]      |
[01:24:20]      = note: expected type `syntax_pos::Symbol`
[01:24:20]                 found type `&'static str`
[01:24:20] 
[01:24:20] 
[01:24:20] error[E0308]: mismatched types
[01:24:20]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:82
[01:24:20]      |
[01:24:20] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:24:20]      |
[01:24:20]      = note: expected type `syntax_pos::Symbol`
[01:24:20]                 found type `&'static str`
[01:24:20] 
---
[01:27:50]     |
[01:27:50] 255 |                         .map(LocalInternedString::get)
[01:27:50]     |                          ^^^
[01:27:50]     |                          |
[01:27:50]     |                          expected signature of `fn(&syntax_pos::Symbol) -> _`
[01:27:50]     |                          found signature of `for<'r> fn(&'r syntax::symbol::LocalInternedString) -> _`
[01:27:50] 
[01:27:50] error[E0599]: no method named `collect` found for type `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}>` in the current scope
[01:27:50]     |
[01:27:50] 256 |                         .collect::<Vec<_>>();
[01:27:50]     |                          ^^^^^^^
[01:27:50]     |
[01:27:50]     |
[01:27:50]     = note: the method `collect` exists but the following trait bounds were not satisfied:
[01:27:50]             `&mut std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:27:50]             `std::iter::Map<std::slice::Iter<'_, syntax_pos::Symbol>, for<'r> fn(&'r syntax::symbol::LocalInternedString) -> &'r str {syntax::symbol::LocalInternedString::get}> : std::iter::Iterator`
[01:27:50]    Compiling im-rc v12.3.0
[01:27:50] error[E0308]: mismatched types
[01:27:50]     --> src/tools/clippy/clippy_lints/src/utils/mod.rs:1124:28
[01:27:50]      |
[01:27:50]      |
[01:27:50] 1124 |     cx.match_def_path(did, &syms)
[01:27:50]      |
[01:27:50]      |
[01:27:50]      = note: expected type `&[syntax_pos::Symbol]`
[01:27:50]                 found type `&std::vec::Vec<&str>`
[01:27:52]    Compiling rls-analysis v0.17.0
[01:27:55] error[E0308]: mismatched types
[01:27:55]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:24
[01:27:55]      |
[01:27:55]      |
[01:27:55] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:27:55]      |
[01:27:55]      = note: expected type `syntax_pos::Symbol`
[01:27:55]                 found type `&'static str`
[01:27:55] 
[01:27:55] 
[01:27:55] error[E0308]: mismatched types
[01:27:55]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:46
[01:27:55]      |
[01:27:55] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:27:55]      |
[01:27:55]      = note: expected type `syntax_pos::Symbol`
[01:27:55]                 found type `&'static str`
[01:27:55] 
[01:27:55] 
[01:27:56] error[E0308]: mismatched types
[01:27:56]     --> src/tools/clippy/clippy_lints/src/types.rs:1096:82
[01:27:56]      |
[01:27:56] 1096 |         if names[0] == "libc" || names[0] == "core" && *names.last().unwrap() == "c_void" {
[01:27:56]      |
[01:27:56]      = note: expected type `syntax_pos::Symbol`
[01:27:56]                 found type `&'static str`
[01:27:56] 
---
travis_time:end:0bf6c008:start=1557952232329558052,finish=1557952232350635646,duration=21077594
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:06fbc065
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:12a2f3f0
travis_time:start:12a2f3f0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1f102455
$ dmesg | grep -i kill

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 May 15, 2019

@Centril Centril deleted the Centril:rollup-x7rcz9c branch May 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.