Rollup of 8 pull requests #91664

matthiaskrgr · 2021-12-08T14:39:08Z

Successful merges:

Lock bootstrap (x.py) build directory #88310 (Lock bootstrap (x.py) build directory)
Only shown relevant type params in E0283 label #90709 (Only shown relevant type params in E0283 label)
Allow for failure of subst_normalize_erasing_regions in const_eval #91551 (Allow for failure of subst_normalize_erasing_regions in const_eval)
Evaluate inline const pat early and report error if too generic #91570 (Evaluate inline const pat early and report error if too generic)
Remove unneeded access to pretty printer's s field in favor of deref #91571 (Remove unneeded access to pretty printer's s field in favor of deref)
Link to rustdoc_json_types docs instead of rustdoc-json RFC #91610 (Link to rustdoc_json_types docs instead of rustdoc-json RFC)
Update cargo #91619 (Update cargo)
Add missing whitespace before disabled HTML attribute #91630 (Add missing whitespace before disabled HTML attribute)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

When we point at a binding to suggest giving it a type, erase all the type for ADTs that have been resolved, leaving only the ones that could not be inferred. For small shallow types this is not a problem, but for big nested types with lots of params, this can otherwise cause a lot of unnecessary visual output.

When the value of a const param isn't inferred, replace it with the param name from the definition.

Prevent spurious build failures and other bugs caused by parallel runs of x.py. We back the lock with sqlite, so that we have a cross-platform locking strategy, and which can be done nearly first in the build process (from Python), which helps move the lock as early as possible.

…Simulacrum Lock bootstrap (x.py) build directory Closes rust-lang#76661, closes rust-lang#80849, `x.py` creates a lock file at `project_root/lock.db` r? ``@jyn514`` , because he was one that told me about this~

…=nagisa Only shown relevant type params in E0283 label When we point at a binding to suggest giving it a type, erase all the type for ADTs that have been resolved, leaving only the ones that could not be inferred. For small shallow types this is not a problem, but for big nested types with lots of params, this can otherwise cause a lot of unnecessary visual output.

…e, r=oli-obk Allow for failure of subst_normalize_erasing_regions in const_eval Fixes rust-lang#72845 Using associated types that cannot be normalized previously resulted in an ICE. We now allow for normalization failure and return a "TooGeneric" error in that case. r? ``@RalfJung`` maybe?

Evaluate inline const pat early and report error if too generic Fix rust-lang#90150 ```@rustbot``` label: T-compiler F-inline_const

…crum Remove unneeded access to pretty printer's `s` field in favor of deref I found it taxing in some of my recent PRs touching the pretty printer to maintain consistency with the surrounding code, since the current code is all over the place about whether it uses `self.s.…()` or `self.…()` for invoking methods of `rustc_ast_pretty::pp::Printer`. This PR standardizes on `self.…()` — relying on the `Deref` and `DerefMut` impls introduced by [rust-lang#62532](rust-lang@cab4532).

…omez Link to rustdoc_json_types docs instead of rustdoc-json RFC The JSON format has had [many changes](https://github.com/rust-lang/rust/commits/master/src/rustdoc-json-types) since the RFC, so the rustdoc output is the only up to date reference ``@rustdoc`` modify labels: +A-rustdoc-json +A-docs

Update cargo 8 commits in 294967c53f0c70d598fc54ca189313c86c576ea7..40dc281755137ee804bc9b3b08e782773b726e44 2021-11-29 19:04:22 +0000 to 2021-12-06 21:54:44 +0000 - Unify the description of quiet flag (rust-lang/cargo#10168) - Stabilize future-incompat-report (rust-lang/cargo#10165) - Support abbreviating `--release` as `-r` (rust-lang/cargo#10133) - doc: nudge towards simple version requirements (rust-lang/cargo#10158) - Upgrade clap to 2.34.0 (rust-lang/cargo#10164) - Treat EOPNOTSUPP the same as ENOTSUP when ignoring failed flock calls. (rust-lang/cargo#10157) - Add note about RUSTFLAGS removal from build scripts. (rust-lang/cargo#10141) - Make clippy happy (rust-lang/cargo#10139)

…r=notriddle Add missing whitespace before disabled HTML attribute On the [w3c HTML checker](https://validator.w3.org/nu/#textarea), with the current generated HTML we get: ![Screenshot from 2021-12-07 15-10-38](https://user-images.githubusercontent.com/3050060/145044653-b38fb679-da76-4890-853f-b696d8fdc06e.png) The problem was that we were telling tera to remove too many whitespace. r? ```@notriddle```

matthiaskrgr · 2021-12-08T14:39:29Z

@bors r+ rollup=never p=8

bors · 2021-12-08T14:39:30Z

📌 Commit 8007601 has been approved by matthiaskrgr

bors · 2021-12-08T14:54:46Z

⌛ Testing commit 8007601 with merge 0476af45cf9a2a7c973676ac6df4762ecca3da7c...

bors · 2021-12-08T14:58:45Z

💔 Test failed - checks-actions

matthiaskrgr · 2021-12-08T15:02:47Z

 == end clock drift check ==
sccache: Starting the server...
Traceback (most recent call last):
  File "/checkout/src/bootstrap/configure.py", line 12, in <module>
    import bootstrap
  File "/checkout/src/bootstrap/bootstrap.py", line 15, in <module>
    import sqlite3
  File "/rustroot/lib/python3.9/sqlite3/__init__.py", line 23, in <module>
    from sqlite3.dbapi2 import *
  File "/rustroot/lib/python3.9/sqlite3/dbapi2.py", line 27, in <module>
    from _sqlite3 import *
ModuleNotFoundError: No module named '_sqlite3'
== clock drift check ==

ouff

rust-log-analyzer · 2021-12-08T15:15:29Z

The job dist-i686-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  network time: Wed, 08 Dec 2021 14:57:33 GMT
== end clock drift check ==
sccache: Starting the server...
Traceback (most recent call last):
  File "/checkout/src/bootstrap/configure.py", line 12, in <module>
    import bootstrap
  File "/checkout/src/bootstrap/bootstrap.py", line 15, in <module>
    import sqlite3
  File "/rustroot/lib/python3.9/sqlite3/__init__.py", line 23, in <module>
    from sqlite3.dbapi2 import *
  File "/rustroot/lib/python3.9/sqlite3/dbapi2.py", line 27, in <module>
    from _sqlite3 import *
ModuleNotFoundError: No module named '_sqlite3'

b-naber and others added 20 commits December 5, 2021 12:43

allow for failure of subst_normalize_erasing_regions in const_eval

61cab77

add test and bless existing ones

3f831c6

Evaluate inline const pat early and report error if too generic

2a95958

Link to rustdoc_json_types docs instead of rustdoc-json RFC

97952f4

Refer to uninferred const params by their name, instead of { _: _ }

3fd15c8

When the value of a const param isn't inferred, replace it with the param name from the definition.

Refer to const params as "const params" and not "type params"

6a691b1

Add test with multiple type params failing inference

7271d1f

Update cargo

4aceaed

Add missing whitespace before disabled HTML attribute

4dd3f4e

Remove unneeded access to pretty printer's s field in favor of deref

a79b702

Rollup merge of rust-lang#88310 - worldeva:bootstrap-locking, r=Mark-…

4d93b4e

…Simulacrum Lock bootstrap (x.py) build directory Closes rust-lang#76661, closes rust-lang#80849, `x.py` creates a lock file at `project_root/lock.db` r? ``@jyn514`` , because he was one that told me about this~

Rollup merge of rust-lang#91570 - nbdd0121:const_typeck, r=oli-obk

36fc307

Evaluate inline const pat early and report error if too generic Fix rust-lang#90150 ```@rustbot``` label: T-compiler F-inline_const

rustbot added the rollup A PR which is a rollup label Dec 8, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 8, 2021

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 Dec 8, 2021

matthiaskrgr closed this Dec 8, 2021

matthiaskrgr mentioned this pull request Dec 8, 2021

Lock bootstrap (x.py) build directory #88310

Merged

matthiaskrgr deleted the rollup-aleb68f branch December 12, 2021 09:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #91664

Rollup of 8 pull requests #91664

matthiaskrgr commented Dec 8, 2021

matthiaskrgr commented Dec 8, 2021

bors commented Dec 8, 2021

bors commented Dec 8, 2021

bors commented Dec 8, 2021

matthiaskrgr commented Dec 8, 2021

rust-log-analyzer commented Dec 8, 2021

Rollup of 8 pull requests #91664

Rollup of 8 pull requests #91664

Conversation

matthiaskrgr commented Dec 8, 2021

matthiaskrgr commented Dec 8, 2021

bors commented Dec 8, 2021

bors commented Dec 8, 2021

bors commented Dec 8, 2021

matthiaskrgr commented Dec 8, 2021

rust-log-analyzer commented Dec 8, 2021