Rollup of 12 pull requests by GuillaumeGomez · Pull Request #104168 · rust-lang/rust

GuillaumeGomez · 2022-11-08T19:40:55Z

Successful merges:

Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed' #103928 (Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed')
Place config.toml in current working directory if config not found #104027 (Place config.toml in current working directory if config not found)
disable btree size tests on Miri #104093 (disable btree size tests on Miri)
run alloc benchmarks in Miri and fix UB #104097 (run alloc benchmarks in Miri and fix UB)
Add split-debuginfo print option #104104 (Add split-debuginfo print option)
doc: Add mutable to the description #104109 (rustdoc: Add mutable to the description)
Fix const_fn_trait_ref_impl, add test for it #104113 (Fix const_fn_trait_ref_impl, add test for it)
Fix invalid background-image file name #104114 (Fix invalid background-image file name)
fix: lint against lint functions #104132 (fix: lint against lint functions)
Clarify licensing situation of MPSC and SPSC queue #104139 (Clarify licensing situation of MPSC and SPSC queue)
Remove an address comparison from the parser #104147 (Remove an address comparison from the parser)
Add llvm-main to triagebot.toml #104165 (Add llvm-main to triagebot.toml)

Failed merges:

Migrate crate-search element to CSS variables #104115 (Migrate crate-search element to CSS variables)

r? @ghost
@rustbot modify labels: rollup

This option prints all supported values for -Csplit-debuginfo=.., i.e. only stable ones on stable/beta and all of them on nightly/dev.

fix: lint against the functions `LintContext::{lookup_with_diagnostics,lookup,struct_span_lint,lint}`, `TyCtxt::struct_lint_node`, `LintLevelsBuilder::struct_lint`.

Co-authored-by: clubby789 <jamie@hill-daniel.co.uk>

…y_error_with_guaranteed, r=lcnr Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed' Part of rust-lang#103874

Place config.toml in current working directory if config not found Fixes an issue where bootsrapping a Rust build would place `config.toml` in `{src_root}` rather than the current working directory rust-lang#103697

disable btree size tests on Miri Seems fine not to run these in Miri, they can't have UB anyway. And this lets us do layout randomization in Miri. r? ``@thomcc``

run alloc benchmarks in Miri and fix UB Miri since recently has a "fake monotonic clock" that works even with isolation. Its measurements are not very meaningful but it means we can run these benches and check them for UB. And that's a good thing since there was UB here: fixesrust-lang#104096. r? ``@thomcc``

Add split-debuginfo print option This option prints all supported values for `-Csplit-debuginfo=..`, i.e. only stable ones on stable/beta and all of them on nightly/dev. Motivated by 1.65.0 regression causing builds with the following entry in `Cargo.toml` to fail on Windows: ```toml [profile.dev] split-debuginfo = "unpacked" ``` See rust-lang/cargo#11347 for details. This will lead to closing rust-lang#103976.

…t-for-align-to-mut, r=thomcc rustdoc: Add mutable to the description `mutable` is missing from the description. Currently the description for [align_to](https://github.com/rust-lang/rust/blob/master/library/core/src/slice/mod.rs#L3498) is the same as [align_to_mut](https://github.com/rust-lang/rust/blob/master/library/core/src/slice/mod.rs#L3559)

…mpls, r=compiler-errors Fix `const_fn_trait_ref_impl`, add test for it rust-lang#99943 broke `#[feature(const_fn_trait_ref_impl)]`, this PR fixes this and adds a test for it. r? ````@fee1-dead````

…th, r=notriddle Fix invalid background-image file name This is a follow-up of rust-lang#101702. Apparently the image hash was the wrong one. You can see the error in https://doc.rust-lang.org/nightly/core/primitive.u16.html?search=hello too. I really need to check if I can adds check for resources load errors in `browser-ui-test`. cc ``````@jsha`````` r? ``````@notriddle``````

…=davidtwco fix: lint against lint functions Add `#[rustc_lint_diagnostics]` to lint functions missing them. From [this discussion](rust-lang#101138 (comment)). r? ```@davidtwco```

…pnkfelix Clarify licensing situation of MPSC and SPSC queue Originally, these two files were licensed under the `BSD-2-Clause` license, as they were based off sample code on a blog licensing those snippets under that license: * `library/std/src/sync/mpsc/mpsc_queue.rs` * `library/std/src/sync/mpsc/spsc_queue.rs` In 2017 though, the author of that blog agreed to relicense their code under the standard `MIT OR Apache-2.0` license in rust-lang#42149. This PR clarifies the situation in the files by expanding the comment at the top of the file. r? ``@pnkfelix``

…resses-in-parser-, r=compiler-errors Remove an address comparison from the parser Originally this check was added in rust-lang#68985, as suggested by rust-lang@940f657#r376850175. I don't think that this address check is a robust way of making parser more robust. This code is also extensively tested by [`ui/parser/issues/issue-35813-postfix-after-cast.rs`](https://github.com/rust-lang/rust/blob/57d3c58ed6e0faf89a62411f96c000ffc9fd3937/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs). _Replaces #103700_ r? `@compiler-errors`

…-Simulacrum Add llvm-main to triagebot.toml

GuillaumeGomez · 2022-11-08T19:42:01Z

@bors r+ p=12 rollup=never

bors · 2022-11-08T19:42:04Z

📌 Commit c46cc1d has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2022-11-08T22:50:16Z

⌛ Testing commit c46cc1d with merge 8d36948...

bors · 2022-11-09T01:56:24Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 8d36948 to master...

rust-timer · 2022-11-09T01:59:46Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#104165	a80ba58a79f2f74f04ae135d6c7b414a30c2f7f3
#104147	4e827107499ab5d3381bb7a0dbe72282479425e6
#104139	db3731eb3a92d7965ec4ce369328012baf3e367f
#104132	87e64db8514fb9e804287a7ae68156c6ea6270e5
#104114	99735cd02306fe39e12c8126adc677498d3b4072
#104113	33d2c39fd9ed3b25166effd3592d1ad1ccdecbe5
#104109	c5084e166eb3e6e49808116b16544a8c190dabbc
#104104	184542380efb2a7108c4a66d37f30d115d50ed75
#104097	4e2e17541a01f221754523522746e617a37c3c79
#104093	1884c03a5e59e974ef85626f335b314e0bd7cef2
#104027	afb7bb51fba66a58269fda1d08f053e4b693f8b1
#103928	6f70ae8b59a1ca072b2863511752c3b0630b1cbd

previous master: 85f4f41deb

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 · 2022-11-09T03:51:58Z

Finished benchmarking commit (8d36948): 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)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	3.2%	[3.2%, 3.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.3%	[2.3%, 2.3%]	1

Cycles

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

ted-tannerand others added 30 commits November 5, 2022 15:07

Place config.toml in current working directory if config not found
13d4c61

disable btree size tests on Miri
17044c1

run alloc benchmarks in Miri and fix UB
780952f

fmt
29d451c

Add --print=split-debuginfo
4c3cad0
This option prints all supported values for -Csplit-debuginfo=.., i.e. only stable ones on stable/beta and all of them on nightly/dev.

rustdoc: Add mutable to the description
d62582f

Fix const_fn_trait_ref_impl, add test for it
0c9896b

Fix invalid background-image file name
d97fa25

Reworked const fn ref tests
87c190c

Only set config.config to None when using default path
66e8a29

fix: lint against lint functions
ae5cc9c
fix: lint against the functions `LintContext::{lookup_with_diagnostics,lookup,struct_span_lint,lint}`, `TyCtxt::struct_lint_node`, `LintLevelsBuilder::struct_lint`.

add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed'
1f21b96

deprecate unchecked_claim_error_was_emitted in error_reported
465ac26

code cleanup with err.emit_unless
3320879

clarify licensing situation of mpsc and spsc queue
807a7bf

Remove an address comparison from the parser
e5d01dc

Fix outdated comment
268ea35
Co-authored-by: clubby789 <jamie@hill-daniel.co.uk>

Add llvm-main to triagebot.toml
9eb977b

Rollup merge ofrust-lang#103928- chenyukang:yukang/fix-103874-add-t…
3a78320
…y_error_with_guaranteed, r=lcnr Add 'ty_error_with_guaranteed' and 'const_error_with_guaranteed' Part of rust-lang#103874

Rollup merge ofrust-lang#104027- ted-tanner:issue-103697-fix, r=jyn514
3abf329
Place config.toml in current working directory if config not found Fixes an issue where bootsrapping a Rust build would place `config.toml` in `{src_root}` rather than the current working directory rust-lang#103697

Rollup merge ofrust-lang#104093- RalfJung:test-sizes, r=thomcc
afaba19
disable btree size tests on Miri Seems fine not to run these in Miri, they can't have UB anyway. And this lets us do layout randomization in Miri. r? ``@thomcc``

Rollup merge ofrust-lang#104113- ink-feather-org:fix_const_fn_ref_i…
02db37a
…mpls, r=compiler-errors Fix `const_fn_trait_ref_impl`, add test for it rust-lang#99943 broke `#[feature(const_fn_trait_ref_impl)]`, this PR fixes this and adds a test for it. r? ````@fee1-dead````

Rollup merge ofrust-lang#104132- Rejyr:rustc_lint-function-lints, r…
a92d83a
…=davidtwco fix: lint against lint functions Add `#[rustc_lint_diagnostics]` to lint functions missing them. From [this discussion](rust-lang#101138 (comment)). r? ```@davidtwco```

Rollup merge ofrust-lang#104165- Manishearth:triagebot-llvm, r=Mark…
c46cc1d
…-Simulacrum Add llvm-main to triagebot.toml

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 Nov 8, 2022

Manishearth mentioned this pull request Nov 8, 2022
Migrate crate-search element to CSS variables #104115
Merged

This was referenced Nov 8, 2022
Rollup of 8 pull requests #104175
Closed
Rollup of 8 pull requests #104176
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 9, 2022

bors merged commit 8d36948 into rust-lang:masterNov 9, 2022

rustbot added this to the 1.67.0 milestone Nov 9, 2022

This was referenced Nov 9, 2022
Merge crossbeam-channel into std::sync::mpsc#93563
Merged
Update VecDeque implementation to use head+len instead of head+tail #102991
Merged
fix fn/const items implied bounds and wf check #104098
Closed

GuillaumeGomez deleted the rollup-tf4edqc branch November 9, 2022 10:18

Navigation Menu

Uh oh!

Uh oh!

Rollup of 12 pull requests - #104168

Rollup of 12 pull requests#104168
bors merged 30 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-tf4edqc

GuillaumeGomez commented Nov 8, 2022

Uh oh!

GuillaumeGomez commented Nov 8, 2022

Uh oh!

bors commented Nov 8, 2022

Uh oh!

bors commented Nov 8, 2022

Uh oh!

bors commented Nov 9, 2022

Uh oh!

rust-timer commented Nov 9, 2022

Uh oh!

rust-timer commented Nov 9, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Nov 8, 2022

Uh oh!

GuillaumeGomez commented Nov 8, 2022

Uh oh!

bors commented Nov 8, 2022

Uh oh!

bors commented Nov 8, 2022

Uh oh!

bors commented Nov 9, 2022

Uh oh!

rust-timer commented Nov 9, 2022

Uh oh!

rust-timer commented Nov 9, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants