Rollup of 8 pull requests #110170

JohnTitor · 2023-04-11T03:18:53Z

Successful merges:

Set up standard library path substitution in rust-gdb and gdbgui #109527 (Set up standard library path substitution in rust-gdb and gdbgui)
Stall auto trait assembly in new solver for int/float vars #109752 (Stall auto trait assembly in new solver for int/float vars)
Add support for RISC-V relax target feature #109860 (Add support for RISC-V relax target feature)
Update error [E0449]: unnecessary visibility qualifier to be more clear #109923 (Update error [E0449]: unnecessary visibility qualifier to be more clear)
The wrapping_neg example for unsigned types shouldn't use i8 #110070 (The wrapping_neg example for unsigned types shouldn't use i8)
fix(doc): do not parse inline when output is json for external crate #110146 (fix(doc): do not parse inline when output is json for external crate)
Add regression test for #104916 #110147 (Add regression test for ICE "Not enough bound vars" #104916)
Update books #110149 (Update books)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: Yuki Okushi <[email protected]>

…r=cuviper Set up standard library path substitution in rust-gdb and gdbgui Fixes rust-lang#62945 --- Only lightly tested (in release mode, where the paths are a bit of a mess) because my `gdb` appears to crash with `internal-error: inside_main_func: Assertion 'block != nullptr' failed.` and I don't have `gdbgui`. Please review carefully my shell syntax. There's also `rust-lldb`, but I don't know the equivalent for it.

…uto-trait-for-num-var, r=lcnr Stall auto trait assembly in new solver for int/float vars Make sure that we don't match int/float vars against *all* manual auto trait impls due to this check: https://github.com/rust-lang/rust/blob/2fb0e8d162a021f8a795fb603f5d8c0017855160/compiler/rustc_trait_selection/src/solve/trait_goals.rs#L151-L169 Since `find_map_relevant_impl` treats all impls as candidates for int/float vars, due to the way that `fast_reject::simplify_type` works. This fixes compiler-errors/next-solver-hir-issues#11. r? ``@lcnr``

Add support for RISC-V relax target feature This adds `relax` as an allowed RISC-V target feature. The relax feature in LLVM enables [linker relaxation](https://www.sifive.com/blog/all-aboard-part-3-linker-relaxation-in-riscv-toolchain), an optimization specific to RISC-V that allows global variable accesses to be resolved by the linker by using the global pointer (`gp`) register (rather than constructing the addresses from scratch for each access). Enabling `relax` will cause LLVM to emit relocations in the object file that support this. The feature can be enabled in rustc with `-C target-feature=+relax`. Currently this feature is disabled by default, but maybe it should be enabled by default since it is an easy performance improvement (but requires the `gp` register to be set up properly). GCC/Clang enable this feature by default (for both hosted/bare-metal targets), and include the `-mno-relax` flag to disable it (see [here](https://github.com/llvm/llvm-project/blob/466d554dcab39c3d42fe0c5b588b795e0e4b9d0d/clang/lib/Driver/ToolChains/Arch/RISCV.cpp#L145) for the code that enables it in Clang). I think it would make sense to enable by default, at least for all hosted targets since the `gp` register should be automatically set up by the runtime. For bare-metal targets, `gp` must be set up manually, so it is probably best to leave off by default to avoid breaking existing applications that do not set up `gp`. Leaving it disabled by default for all targets is also reasonable though. Let me know your thoughts. Thanks! Fixes rust-lang#109426.

…iser Update `error [E0449]: unnecessary visibility qualifier` to be more clear This updates the error message `error[E0449]: unnecessary visibility qualifier` by clearly indicating that visibility qualifiers already inherit their visibility from a parent item. The error message previously implied that the qualifiers were permitted, which is not the case anymore. Resolves rust-lang#109822.

The `wrapping_neg` example for unsigned types shouldn't use `i8` Probably it should have at least one example with an unsigned type.

fix(doc): do not parse inline when output is json for external crate relative rust-lang#110138

…-errors Add regression test for rust-lang#104916 Closes rust-lang#104916 I haven't tested if it still passes with debug assertions enabled so it'd be better to wait for CI to be green. r? compiler-errors

Update books ## rust-lang/book 1 commits in 0510ca84c2ce6bf93c4ccf9248756e9e4fd00b12..c06006157b14b3d47b5c716fc392b77f3b2e21ce 2023-04-03 15:31:55 UTC to 2023-04-03 15:31:55 UTC - Fix grammar (rust-lang/book#3600) ## rust-lang/reference 3 commits in 3c47807a3131b3c7cacb508f52632078d253cd0a..1f8dc727e94ae4ef92adf70df979521a1ea1143e 2023-04-09 14:04:53 UTC to 2023-03-29 13:21:47 UTC - Explain typos in `asm!` can be unsound (rust-lang/reference#1344) - Fix coding style in example: add space between module name and bracket (rust-lang/reference#1347) - redundant word removed (rust-lang/reference#1346) ## rust-lang/rust-by-example 1 commits in ba84bf35d0f17d404003349309201654d25f61af..31961fe22521a779070a44a8f30a2b00a20b6212 2023-04-10 13:06:34 UTC to 2023-04-10 13:06:34 UTC - Add clarity to name of file being used in library example. (rust-lang/rust-by-example#1697) ## rust-lang/rustc-dev-guide 8 commits in fca8af6..6337ed1 2023-04-10 14:23:05 UTC to 2023-04-06 00:29:18 UTC - fix markup (rust-lang/rustc-dev-guide#1670) - Reorganize "Getting Started" and add a "What should I work on?" section (rust-lang/rustc-dev-guide#1665) - Clarify cfg(bootstrap) docs (rust-lang/rustc-dev-guide#1669) - Link to forge instead of duplicating toolstate info (rust-lang/rustc-dev-guide#1664) - Improve the landing page for contributing to the libstd docs (rust-lang/rustc-dev-guide#1666) - Various improvements to `check_line_lengths.sh` (rust-lang/rustc-dev-guide#1667) - Document how to ignore specific files in a diff (rust-lang/rustc-dev-guide#1668) - mention `git clone --depth 1` (rust-lang/rustc-dev-guide#1663)

JohnTitor · 2023-04-11T03:19:06Z

@bors r+ p=8 rollup=never

bors · 2023-04-11T03:19:08Z

📌 Commit 48e14bb has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-04-11T05:20:37Z

⌛ Testing commit 48e14bb with merge 8b2a97dec4f931e92d2f6cf283b9fa7487a206a0...

bors · 2023-04-11T05:46:21Z

💔 Test failed - checks-actions

JohnTitor · 2023-04-11T05:49:21Z

@bors retry
#97669

bors · 2023-04-11T05:50:44Z

⌛ Testing commit 48e14bb with merge 5072826...

bors · 2023-04-11T08:11:38Z

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

bors · 2023-04-11T08:11:38Z

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

rust-timer · 2023-04-11T08:11:44Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha

previous master: 5072826793

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 · 2023-04-11T08:13:56Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110149	6b899deed6669882dd4567505d0273ee3ab1eda8
#110147	f4205dae8d3514469ad04c04935e82efa31fbf6e
#110146	90036a0737815c0e8d17e709ce5a3c58dd1276c6
#110070	814684a9b9cd57db278c1cca1c3932be1d11390c
#109923	234556c5ad587149c54a785189d4b1089144c61f
#109860	11cbb1ba16416db93c82119ca485b1fabb5a371a
#109752	91543f8d4d40edd090a94cc75340e250b9f1b756
#109527	1d7f808e1b022eed42570f4371a35299ec319af3

previous master: b80ee3969f

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 · 2023-04-11T09:27:46Z

Finished benchmarking commit (5072826): 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.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

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)	4.9%	[4.2%, 5.7%]	2
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	-0.7%	[-0.7%, -0.7%]	1

rust-log-analyzer · 2023-04-11T14:13:43Z

The job armhf-gnu failed! Check out the build log: (web) (plain)

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

failures:

---- [ui] tests/ui/const-generics/transparent-maybeunit-array-wrapper.rs#min stdout ----

error in revision `min`: test run failed!
status: exit status: 101
command: RUST_TEST_THREADS="16" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/transparent-maybeunit-array-wrapper.min/a"
--- stdout -------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/transparent-maybeunit-array-wrapper.min/a", waiting for result
--- stderr -------------------------------
thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
------------------------------------------

lnicola and others added 17 commits March 23, 2023 13:01

Set up standard library path substitution in rust-gdb and gdbgui

8dd0ec6

Add riscv relax target feature

48be303

Make "unneccesary visibility qualifier" error much more clear

87b3ae3

Update ui tests involving invalid visibility qualifiers

4e5c120

The wrapping_neg example for unsigned types shouldn't use i8

ed0b8af

Add regression test for rust-lang#104916

271ac7b

Signed-off-by: Yuki Okushi <[email protected]>

fix(doc): do not parse inline when output is json for external crate

c127020

Stall auto-trait assembly for int/float vars in new solver

8d2dbba

Update books

687abb0

Rollup merge of rust-lang#110070 - scottmcm:wrapping-neg, r=cuviper

75a4625

The `wrapping_neg` example for unsigned types shouldn't use `i8` Probably it should have at least one example with an unsigned type.

Rollup merge of rust-lang#110146 - bvanjoi:relative-110138, r=notriddle

a996418

fix(doc): do not parse inline when output is json for external crate relative rust-lang#110138

Rollup merge of rust-lang#110147 - JohnTitor:issue-104916, r=compiler…

016ebf8

…-errors Add regression test for rust-lang#104916 Closes rust-lang#104916 I haven't tested if it still passes with debug assertions enabled so it'd be better to wait for CI to be green. r? compiler-errors

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 Apr 11, 2023

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 Apr 11, 2023

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 Apr 11, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 11, 2023

bors merged commit 5072826 into rust-lang:master Apr 11, 2023

rustbot added this to the 1.70.0 milestone Apr 11, 2023

JohnTitor deleted the rollup-hdramer branch April 11, 2023 09:16

klensy mentioned this pull request Apr 11, 2023

rollups: don't print 'Failed merges:' if there no failed merges rust-lang/homu#190

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #110170

Rollup of 8 pull requests #110170

Uh oh!

JohnTitor commented Apr 11, 2023

Uh oh!

JohnTitor commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

JohnTitor commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Uh oh!

rust-log-analyzer commented Apr 11, 2023

Uh oh!

Uh oh!

Rollup of 8 pull requests #110170

Rollup of 8 pull requests #110170

Uh oh!

Conversation

JohnTitor commented Apr 11, 2023

Uh oh!

JohnTitor commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

JohnTitor commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

bors commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Uh oh!

rust-timer commented Apr 11, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

rust-log-analyzer commented Apr 11, 2023

Uh oh!

Uh oh!