Skip to content

Rollup of 5 pull requests#106945

Merged
bors merged 10 commits intorust-lang:masterfrom
matthiaskrgr:rollup-c5or8z3
Jan 16, 2023
Merged

Rollup of 5 pull requests#106945
bors merged 10 commits intorust-lang:masterfrom
matthiaskrgr:rollup-c5or8z3

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jan 16, 2023

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 10 commits January 14, 2023 04:47
@compiler-errors
new trait solver: rebase impl substs for gats correctly
05f664a
@gftea
check -Z query-dep-graph is enabled if -Z dump-dep-graph (rust-lang#1…
2c5583e 
…06736)
@gftea @ehuss
Update instrument-coverage.md
c1f1f60 
Document the default for LLVM_PROFILE_FILE and add a recemmondation for setting
it for older versions of Rust which had a different default.
@oli-obk
Improve a TAIT error and add an error code plus documentation
6b69b5e
@rustbot
Update books
db1ddef
@matthiaskrgr
Rollup merge of rust-lang#105954 - gftea:patch-1, r=ehuss
cf533dd 
Update instrument-coverage.md

explicitly set environment variable LLVM_PROFILE_FILE="default_%m.profraw"  when starting cargo test, otherwise, only one `default.profraw ` is generated and will be overwritten if run unnittests and integration tests at the same time.
@matthiaskrgr
Rollup merge of rust-lang#106835 - compiler-errors:new-solver-gat-reb…
8ea26ca 
…ase-oops, r=lcnr

new trait solver: rebase impl substs for gats correctly

you might've caught this while working on projection code, if so then you can close this pr

r? `@lcnr`
@matthiaskrgr
Rollup merge of rust-lang#106912 - gftea:pr-106736, r=Nilstrieb
37378ee 
check -Z query-dep-graph is enabled if -Z dump-dep-graph (rust-lang#106736)

PR to solve rust-lang#106736, r? `@cjgillot`
@matthiaskrgr
Rollup merge of rust-lang#106940 - oli-obk:tait_error, r=compiler-errors
d2a8a9f 
Improve a TAIT error and add an error code plus documentation

cc rust-lang#106858
@matthiaskrgr
Rollup merge of rust-lang#106942 - rustbot:docs-update, r=ehuss
4fb9da1 
Update books

## rust-lang/book

1 commits in 2bd5d42c9956369132228da6409f0e68da56c51a..2cd1b5593d26dc6a03c20f8619187ad4b2485552
2023-01-12 14:47:47 UTC to 2023-01-12 14:47:47 UTC

- Typo (rust-lang/book#3457)

## rust-lang/nomicon

2 commits in 8ca261268068d80c0969260fff15199bad87b587..960d610e7f33889a2577f5f17c26f0d5c82b30df
2023-01-06 11:51:41 UTC to 2023-01-05 10:20:31 UTC

- vec/raw: Simplify `RawVec::grow` (rust-lang/nomicon#392)
- borrow-splitting: Use `take` instead of `replace` (rust-lang/nomicon#391)

## rust-lang/reference

4 commits in 3ae62681ff236d5528ef7c8c28ba7c6b2ecc6731..2cb0ed9ba56360949f492f9866afe8c293f9f9da
2023-01-13 03:16:35 UTC to 2023-01-07 00:08:06 UTC

- Update field-expr.md (rust-lang/reference#1318)
- Update documentation for arbitrary_enum_discriminant feature (rust-lang/reference#1055)
- Add links to definitions of terminology ... (rust-lang/reference#1315)
- Enable triagebot shortcuts (rust-lang/reference#1314)

## rust-lang/rust-by-example

2 commits in 8888f9428fe9a48f31de6bd2cef9b9bf80791edc..a9fb7d13eadfcc5f457962731f105b97f9a7474a
2023-01-14 10:25:39 UTC to 2023-01-11 18:25:42 UTC

- get_or_insert example: print my_fruit as intended (rust-lang/rust-by-example#1664)
- Update print.md (rust-lang/rust-by-example#1663)

## rust-lang/rustc-dev-guide

8 commits in b3e2a6e..7352353
2023-01-14 20:34:23 UTC to 2023-01-02 23:35:09 UTC

- fix examples for rustc 1.68.0-nightly (935dc07 2022-12-19) (rust-lang#1556) (rust-lang/rustc-dev-guide#1557)
- Update incremental-compilation-in-detail.md (rust-lang/rustc-dev-guide#1553)
- Link to the youtube recording of my talk, not the summary (rust-lang/rustc-dev-guide#1554)
- Change `src/test` to `tests` (rust-lang/rustc-dev-guide#1547)
- add full name for ICE (rust-lang/rustc-dev-guide#1552)
- Fix incorrect links (rust-lang/rustc-dev-guide#1549)
- fix rebase link (rust-lang/rustc-dev-guide#1546)
- Add a section for how to review code more easily (rust-lang/rustc-dev-guide#1538)
@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jan 16, 2023
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Jan 16, 2023

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 16, 2023

📌 Commit 4fb9da1 has been approved by matthiaskrgr

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 16, 2023
@bors
Copy link
Collaborator

bors commented Jan 16, 2023

⌛ Testing commit 4fb9da1 with merge 4781233...

@bors
Copy link
Collaborator

bors commented Jan 16, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4781233 to master...

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

rust-timer commented Jan 16, 2023

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#106942 44dc022ea346108072b617241826b93f145498d2
#106940 c2a8d33bc029b67588a7367d5a93e1175729cdd2
#106912 0220601ee803426fc0ec1a5e9337b360f02fecee
#106835 961054dbab4fd5ec53ba60bf36ddffc71e408df4
#105954 a40fb6ef510f7be1b754d8f56f023cd8efa496b4

previous master: 481725984b

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

@rust-timer
Copy link
Collaborator

rust-timer commented Jan 17, 2023

Finished benchmarking commit (4781233): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

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% [3.7%, 5.7%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -5.9% [-5.9%, -5.9%] 1
All ❌✅ (primary) - - 0

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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.0% [-4.2%, -1.8%] 2
All ❌✅ (primary) - - 0

@matthiaskrgr matthiaskrgr deleted the rollup-c5or8z3 branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.68.0

Development

Successfully merging this pull request may close these issues.

7 participants

@matthiaskrgr @bors @rust-timer @rustbot @compiler-errors @gftea @oli-obk