Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Rollup of 8 pull requests #107498

Merged
merged 18 commits into from
Jan 31, 2023
Merged

Rollup of 8 pull requests #107498

merged 18 commits into from
Jan 31, 2023

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Swatinem and others added 18 commits January 29, 2023 15:20
@Swatinem
Remove GenFuture from core
5372e66 
The handling of async constructs in the compiler does not rely on `GenFuture`
anymore since `1.67`, so this code can now be removed from `core`.
@rustbot
Update books
3e5e387
@notriddle
rustdoc: remove unnecessary wrapper div.item-decl from HTML
7080f80
@GuillaumeGomez
Migrate last part of CSS themes to CSS variables
e9f5630
@compiler-errors
Use ObligationCtxt::new_in_snapshot in satisfied_from_param_env
343a359
@compiler-errors
Implement unsizing in the new trait solver
085a48e
@compiler-errors
Trait upcasting support in new solver
c248440
@compiler-errors
nits
f7fc0b7
@notriddle
rustdoc: remove meta keywords from HTML
f5bac0c 
Discussed in
<https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/.60.3Cmeta.20name.3D.22keywords.22.3E.60>
@lebensterben
fix link in std::path::Path::display()
3c408d8 
The link `Debug` points to should be the trait `Debug`, not the macro `Debug`.
@JohnTitor
Rollup merge of rust-lang#107245 - compiler-errors:new-solver-unsizin…
6eeb981 
…g, r=lcnr

Implement unsizing in the new trait solver

This makes hello world compile! Ignore the first commit, that's just rust-lang#107146 which is waiting on merge.

I'll leave some comments inline about design choices that might be debatable.

r? `@lcnr` (until we have a new trait solver reviewer group...)
@JohnTitor
Rollup merge of rust-lang#107445 - Swatinem:rm-genfuture, r=cuviper
39d2639 
Remove `GenFuture` from core

The handling of async constructs in the compiler does not rely on `GenFuture` anymore since `1.67`, so this code can now be removed from `core`.
@JohnTitor
Rollup merge of rust-lang#107473 - rustbot:docs-update, r=ehuss
401564d 
Update books

## rust-lang/book

2 commits in 2cd1b5593d26dc6a03c20f8619187ad4b2485552..f2a78f64b668f63f581203c6bac509903f7c00ee
2023-01-23 18:19:32 UTC to 2023-01-23 15:15:22 UTC

- Change CamelCase to UpperCamelCase
- Fix broken link to the No Starch Press version (rust-lang/book#3513)

## rust-embedded/book

3 commits in 19f798d448835a4888e3b3eae7fe69f1d61d8681..f1a4614aa41cc544b91b79760a709e113f3451d7
2023-01-26 15:21:58 UTC to 2023-01-18 07:51:06 UTC

- Fix typo in the registers.md (rust-embedded/book#343)
- Macports install instructions (rust-embedded/book#342)
- remove extern crate statements (rust-embedded/book#340)

## rust-lang/nomicon

2 commits in 960d610e7f33889a2577f5f17c26f0d5c82b30df..bd1829d235296952bf72ca55635e360584b8805e
2023-01-18 03:14:58 UTC to 2023-01-17 20:05:07 UTC

- Copyedits to FFI and unwinding section (rust-lang/nomicon#396)
- Fix typo in dropck documentation (rust-lang/nomicon#397)

## rust-lang/reference

2 commits in 2cb0ed9ba56360949f492f9866afe8c293f9f9da..22882fb3f7b4d69fdc0d1731e8b9cfcb6910537d
2023-01-23 13:21:28 UTC to 2023-01-20 18:38:44 UTC

- Fix typo “assigment” (…and more) (rust-lang/reference#1322)
- Syntax correction for trait-bounds.md (rust-lang/reference#1319)

## rust-lang/rust-by-example

1 commits in a9fb7d13eadfcc5f457962731f105b97f9a7474a..134376872e8c387ef369507e0ee9b5a0e3272718
2023-01-25 11:56:37 UTC to 2023-01-25 11:56:37 UTC

- update std_misc/file/create.md: fixed grammar (rust-lang/rust-by-example#1668)

## rust-lang/rustc-dev-guide

12 commits in 7352353..e359ee2
2023-01-30 15:08:16 UTC to 2023-01-17 12:44:19 UTC

- New infcx usage (rust-lang/rustc-dev-guide#1571)
- Create a chapter for AST validation (rust-lang/rustc-dev-guide#1524)
- Use ephemeral PAT for linkcheck (rust-lang/rustc-dev-guide#1569)
- add section for the new trait solver (rust-lang/rustc-dev-guide#1551)
- version 5 is now not supported (rust-lang/rustc-dev-guide#1568)
- there are still no locale bundles (rust-lang/rustc-dev-guide#1567)
- bumpt date-check examples to current month (rust-lang/rustc-dev-guide#1566)
- Update hir.md (rust-lang/rustc-dev-guide#1565)
- rustc_typeck exists no more (rust-lang/rustc-dev-guide#1559)
- Correct tests misplacement (rust-lang/rustc-dev-guide#1564)
- Update resolution.md (rust-lang/rustc-dev-guide#1561)
- Update asm.md  (rust-lang/rustc-dev-guide#1560)
@JohnTitor
Rollup merge of rust-lang#107476 - notriddle:notriddle/item-decl-3, r…
b10e601 
…=GuillaumeGomez

rustdoc: remove unnecessary wrapper `div.item-decl` from HTML
@JohnTitor
Rollup merge of rust-lang#107477 - GuillaumeGomez:css-var, r=notriddle
fbcaf04 
Migrate last part of CSS themes to CSS variables

No changes in the output. This is already tested in `tests/rustdoc-gui/search-tab.goml` so no need to add a GUI test.

r? `@notriddle`
@JohnTitor
Rollup merge of rust-lang#107479 - compiler-errors:probe-can-call-ocx…
f95f835 
…, r=BoxyUwU

Use `ObligationCtxt::new_in_snapshot` in `satisfied_from_param_env`

We can evaluate nested `ConstEvaluatable` obligations in an evaluation probe, which will ICE if we use `ObligationCtxt::new`.

Fixes rust-lang#107474
Fixes rust-lang#106666

r? `@BoxyUwU` but feel free to reassign
cc `@JulianKnodt` who i think added this assertion code

Not sure if the rustdoc test is needed, but can't hurt. They're the same root cause, though.
@JohnTitor
Rollup merge of rust-lang#107482 - notriddle:notriddle/keywords, r=jsha
e776a63 
rustdoc: remove meta keywords from HTML

Discussed in <https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/.60.3Cmeta.20name.3D.22keywords.22.3E.60>
@JohnTitor
Rollup merge of rust-lang#107494 - lebensterben:patch-1, r=JohnTitor
150340b 
fix link in std::path::Path::display()

The link `Debug` points to should be the trait `Debug`, not the macro `Debug`.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jan 31, 2023
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Jan 31, 2023

📌 Commit 150340b has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 31, 2023
@bors
Copy link
Collaborator

bors commented Jan 31, 2023

⌛ Testing commit 150340b with merge 7c4a9a9...

@bors
Copy link
Collaborator

bors commented Jan 31, 2023

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 7c4a9a9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 31, 2023
@bors bors merged commit 7c4a9a9 into rust-lang:master Jan 31, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 31, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#107494 a6a11d3b71add3709bac20201cf499cf0ef69a3d
#107482 f29386d9faef83e3293c9c228c260f4e5808710d
#107479 930421ec90f34f2143e2aa95dd997decd4faa373
#107477 6677710136ee7eb3c5c73e3ecf09136fcef627f8
#107476 ebd6d27753c05cd8c4dc9084ec459bbe223ec335
#107473 b5187ca8822e00afa037cc22b63b180e5a305e86
#107445 bb1b4d23064a87a34091c0088338e6dca5ae203f
#107245 5d8a3a704ab64a2c63c4b9311eba5266710bec7e

previous master: dc3e59cb3f

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@JohnTitor JohnTitor deleted the rollup-2i6g4uk branch January 31, 2023 10:43
This was referenced Jan 31, 2023
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7c4a9a9): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 -0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 4.7% [4.7%, 4.7%] 1
Improvements ✅
(primary)		 -3.4% [-3.9%, -3.0%] 2
Improvements ✅
(secondary)		 -4.5% [-7.4%, -2.7%] 3
All ❌✅ (primary) -3.4% [-3.9%, -3.0%] 2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.3% [2.3%, 2.3%] 1

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
9 participants
@JohnTitor @bors @rust-timer @rustbot @Swatinem @notriddle @GuillaumeGomez @compiler-errors @lebensterben