Merge rust-lang#11096

11096: Code: Use the same `displayName` for pre-release versions r=lnicola a=lnicola

Otherwise the Marketplace shows `(nightly)` for the stable version.

bors r+

Co-authored-by: Laurențiu Nicola <[email protected]>

Merge rust-lang#11060

11060: minor: Bump deps r=lnicola a=lnicola



Co-authored-by: Laurențiu Nicola <[email protected]>

Merge rust-lang#10995

10995: internal: switch from trait-based TokenSource to simple struct of arrays r=matklad a=matklad

cc rust-lang#10765 

The idea here is to try to simplify the interface as best as we can. The original trait-based approach is a bit over-engineered and hard to debug. Here, we replace callback with just data. The next PR in series will replace the output `TreeSink` trait with data as well. 


The biggest drawback here is that we now require to materialize all parser's input up-front. This is a bad fit for macro by example: when you parse `$e:expr`, you might consume only part of the input. However, today's trait-based solution doesn't really help -- we were already materializing the whole thing! So, let's keep it simple!

Co-authored-by: Aleksey Kladov <[email protected]>

Merge rust-lang#10944

10944: internal: Prefer resolution of inert attributes r=Veykril a=Veykril

Fixes rust-lang#10942
bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Merge rust-lang#10876

10876: fix: Show parameter hints unconditionally for logical not expressions r=Veykril a=Veykril

Closes rust-lang#8491
bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Merge rust-lang#10823

10823: fix: better `Fn` traits formatting r=jonas-schievink a=veber-alex

This makes it so formatting `Fn` traits properly handles:

1. An `Fn` trait with only a single argument -> removes the trailing comma.
2. An `Fn` trait which returns nothing (an empty tuple) -> don't show `-> ()` as the return type.

before:
![before](https://user-images.githubusercontent.com/29788806/142745038-44ac68ce-de42-4396-a809-ffdb883be699.png)

after:
![after](https://user-images.githubusercontent.com/29788806/142745040-485feaa2-cc21-4a05-9576-5410ea355029.png)




Co-authored-by: Alex Veber <[email protected]>

Merge rust-lang#10767

10767: minor: Rename intern_macro -> intern_macro_call r=Veykril a=Veykril

We potentially want to intern macro definitions so the names would probably collide
bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Merge rust-lang#10699

10699: internal: Make CompletionItem `label` and `lookup` fields `SmolStr`s r=Veykril a=Veykril

This replaces a bunch of String clones with SmolStr clones, though also makes a few parts a bit more expensive(mainly things involving `format!`ted strings as labels).


Co-authored-by: Lukas Wirth <[email protected]>

Merge rust-lang#10672

10672: feat: upgrade ubuntu builders r=matklad a=matklad

For `-gnu` triples, use 20.04, the current LTS. This upgrades the
required version of glibc. For musl, just use `latest` as, presumably,
we don't care about glibc version in that case.

Hopefully, this unbreaks nightly publishing!

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

Merge rust-lang#10624

10624: minor: revert edition change in test r=lnicola a=lnicola

Fixes rust-lang#10607 (comment)

Co-authored-by: Laurențiu Nicola <[email protected]>