Rollup of 9 pull requests #101946

matthiaskrgr · 2022-09-17T17:27:10Z

Successful merges:

array docs - advertise how to get array from slice #101672 (array docs - advertise how to get array from slice)
Extend list of targets that support dyanmic linking for llvm tools #101781 (Extend list of targets that support dyanmic linking for llvm tools)
Improve handing of env vars during bootstrap process #101783 (Improve handing of env vars during bootstrap process)
add note for layout_of when query depth overflows #101801 (add note for layout_of when query depth overflows)
rustdoc: add test cases for turning [Vec<T>] into `[Vec<T>]` #101824 (rustdoc: add test cases for turning [Vec<T>] into [`Vec<T>`])
Update stdarch #101861 (Update stdarch)
Allow building rust-analyzer-proc-macro-srv as a standalone tool #101873 (Allow building rust-analyzer-proc-macro-srv as a standalone tool)
rustdoc: clean up CSS for All Items and All Crates lists #101918 (rustdoc: clean up CSS for All Items and All Crates lists)
Continue migration of CSS themes #101934 (Continue migration of CSS themes)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

On my first Rust project, I spent more time than I care to admit figuring out how to efficiently get an array from a slice. Update the array documentation to explain this a bit more clearly. (As a side note, it's a bit unfortunate that get-array-from-slice is only available via trait since that means it can't be used from const functions yet.)

…lows

stdarch updated their version of `cfg-if` so we need to update the one used by libstd as well.

This commit removes an allow-list for the dynamic linking of the LLVM tools and instead relies on the builder's linking preference only.

This reduces the amount of CSS, and makes these two pages more consistent (which, necessarily, means changing them a bit).

This CL modifies the handing of env vars during the bootstrap process in two ways: 1. Replaces '-' characters with '_' characters in target names to increase compatibility with different shells 2. Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

…mulacrum array docs - advertise how to get array from slice On my first Rust project, I spent more time than I care to admit figuring out how to efficiently get an array from a slice. Update the array documentation to explain this a bit more clearly. (As a side note, it's a bit unfortunate that get-array-from-slice is only available via trait since that means it can't be used from const functions yet.)

…r=jyn514 Extend list of targets that support dyanmic linking for llvm tools This commit adds `linux-musl` to the list of targets that support dynamic linking for the LLVM tools.

Improve handing of env vars during bootstrap process This CL modifies the handing of env vars during the bootstrap process in two ways: 1. Replaces '-' characters with '_' characters in target names to increase compatibility with different shells 2. Passes Stage0 snapshot compiler related env vars to early invocations of Cargo

…ebank add note for `layout_of` when query depth overflows Fixes rust-lang#101747 Added `try_find_layout_root` function to add a note for `layout_of` when query depth overflows. This would make the error in rust-lang#101747 look like this: ``` error: queries overflow the depth limit! | note: Query depth increased by 66 when computing layout of `core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<alloc::boxed::Box<alloc::string::String>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`! --> D:\rust-backup\parallel_rust\query_depth.rs:40:1 | 40 | fn main() { | ^^^^^^^^^ error: aborting due to previous error ``` cc ``@semicoleon``

…cs-intra-doc-links, r=Mark-Simulacrum rustdoc: add test cases for turning ``[Vec<T>]`` into ``[`Vec<T>`]``

Update stdarch This pulls in the following changes: - [Use simd_bitmask intrinsic in a couple of places](rust-lang/stdarch@9f09287) - [Remove simd_shuffle<n> usage in favor of simd_shuffle](rust-lang/stdarch@3fd17e4) - [Remove late specifiers in __cpuid_count](rust-lang/stdarch@f1db941) - Helps with rust-lang#101346 - [Use mov and xchg instead of movl(q) and xchgl(q)](rust-lang/stdarch@3049a31) - [Bump cfg-if dependency to 1.0](rust-lang/stdarch@f305cc8) - [Fix documentation of __m256bh and __m512bh structs](rust-lang/stdarch@699c093) r? ``@Amanieu``

…v, r=jyn514 Allow building `rust-analyzer-proc-macro-srv` as a standalone tool This PR allows building `rust-analyzer-proc-macro-srv` as a standalone tool via `x b proc-macro-srv-cli` (I thought that `x b rust-analyzer-proc-macro-srv` should work, but it doesn't for some reason...). Also this PR adds a copy of `rust-analyzer-proc-macro-srv` binary to `build/{triple}/{stage}/libexec/` when building `rust-analyzer-proc-macro-srv`, so that r-a can pick it up. This is useful to make r-a (and I assume Intellij IDEA) to expand macros when using a custom, build from source toolchain. r? ``@jyn514`` [_zulip thread_](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/How.20to.20fix.20.60UnsupportedABI.60.20for.20custom.20toolchains.3F/near/299040175)

…meGomez rustdoc: clean up CSS for All Items and All Crates lists This reduces the amount of CSS, and makes these two pages more consistent (which, necessarily, means changing them a bit). # Before ![image](https://user-images.githubusercontent.com/1593513/190735035-c66b2664-3783-483c-9bc6-89f80e4a5490.png) ![image](https://user-images.githubusercontent.com/1593513/190735134-1d5df81d-58c5-4c86-b066-6dd3031ffc2e.png) # After ![image](https://user-images.githubusercontent.com/1593513/190735261-fc3878bb-0cab-4c4e-a6da-b5f7abd06588.png) ![image](https://user-images.githubusercontent.com/1593513/190735389-935a7836-f2c0-4349-a7d0-7fe5378f6b9a.png)

…, r=notriddle Continue migration of CSS themes Now that rust-lang#101898 has been merged, we can move forward. This PR moves more CSS theme rules as CSS variables. I also added a GUI test to prevent regressions. Part of rust-lang#98460. r? ``@notriddle``

matthiaskrgr · 2022-09-17T17:27:25Z

@bors r+ rollup=never p=9

bors · 2022-09-17T17:27:26Z

📌 Commit 1f31bee has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-17T19:33:56Z

⌛ Testing commit 1f31bee with merge 98ad6a5...

bors · 2022-09-17T22:04:22Z

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

rust-timer · 2022-09-17T22:07:04Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101934	5340a0cc01eff754c2114a9f7b6ae2d5676c2358
#101918	42557bcd4a4ce500edf061b21d249b08b8fafef5
#101873	c6fe6df5250f781b08ccf9361d68d30179c6c519
#101861	4f079e87e7ad963c749016241c8580c1523725bd
#101824	a3730c847ad7ba869aeef82ef074ad58e0730c2c
#101801	5b4c4321b957f5e1ee33c034bf82394d66f83b71
#101783	6445c64b65dd26b5349300f1e1a729ddec7a0bc6
#101781	c33aabd723bf0c802f88378970da00b9cfafbb8c
#101672	fb5189f1aa90446e245bd191d44289e8f2ca7d5c

previous master: c773c134c9

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-09-17T23:12:48Z

Finished benchmarking commit (98ad6a5): 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
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

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)	2.7%	[0.7%, 3.8%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.7%	[-5.0%, -2.3%]	2
All ❌✅ (primary)	-	-	0

Cycles

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

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

After rust-lang#101946 this completes the move to cfg-if 1.0 by: * Updating getrandom 0.1.14->0.1.16 * Updating panic_abort, panic_unwind, and unwind to cfg-if 1.0

…homcc Remove std's transitive dependency on cfg-if 0.1 After rust-lang#101946 this completes the move to cfg-if 1.0 by: * Updating getrandom 0.1.14->0.1.16 * Updating panic_abort's and unwind's dep to cfg-if 1.0 Fixes rust-lang#103365

After rust-lang/rust#101946 this completes the move to cfg-if 1.0 by: * Updating getrandom 0.1.14->0.1.16 * Updating panic_abort, panic_unwind, and unwind to cfg-if 1.0

Remove std's transitive dependency on cfg-if 0.1 After rust-lang/rust#101946 this completes the move to cfg-if 1.0 by: * Updating getrandom 0.1.14->0.1.16 * Updating panic_abort's and unwind's dep to cfg-if 1.0 Fixes rust-lang/rust#103365

Doug Cook (WINDOWS) and others added 22 commits September 10, 2022 19:37

rustdoc: add test cases for turning [Vec<T>] into `[Vec<T>]`

1ec92c8

add note for layout_of when query depth overflows

44506f3

correct span, add help message and add UI test when query depth overf…

89fd6ae

…lows

Update stdarch

9286c3c

stdarch updated their version of `cfg-if` so we need to update the one used by libstd as well.

Allow building rust-analyzer-proc-macro-srv as a standalone tool

532e3a5

Use builder.sysroot(...) instead of a hack

9c3c88c

Create new CSS variables for links color

1c65997

Add GUI test for links colors

5d449a0

Remove the allow-list for dynamic linking of LLVM tools

9995029

This commit removes an allow-list for the dynamic linking of the LLVM tools and instead relies on the builder's linking preference only.

rustdoc: clean up CSS for All Items and All Crates lists

b72de9b

This reduces the amount of CSS, and makes these two pages more consistent (which, necessarily, means changing them a bit).

rustdoc: update test case for All Crates page

a87a883

Rollup merge of rust-lang#101781 - chriswailes:dynamic-llvm-on-musl, …

ec61047

…r=jyn514 Extend list of targets that support dyanmic linking for llvm tools This commit adds `linux-musl` to the list of targets that support dynamic linking for the LLVM tools.

Rollup merge of rust-lang#101824 - notriddle:notriddle/html-as-generi…

030f453

…cs-intra-doc-links, r=Mark-Simulacrum rustdoc: add test cases for turning ``[Vec<T>]`` into ``[`Vec<T>`]``

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 17, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 17, 2022

bors merged commit 98ad6a5 into rust-lang:master Sep 17, 2022

rustbot added this to the 1.66.0 milestone Sep 17, 2022

This was referenced Sep 17, 2022

Invoke backtrace-rs' buildscript in std's buildscript for Android targets #99883

Closed

Move and rename SessionDiagnostic & SessionSubdiagnostic traits and macros #101558

Merged

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

matthiaskrgr deleted the rollup-jqkhsku branch October 9, 2022 00:31

chbaker0 mentioned this pull request Oct 21, 2022

Remove std's transitive dependency on cfg-if 0.1 #103367

Merged

matthiaskrgr mentioned this pull request Apr 13, 2024

ICE: Couldn't evaluate constant const #123893

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #101946

Rollup of 9 pull requests #101946

matthiaskrgr commented Sep 17, 2022

matthiaskrgr commented Sep 17, 2022

bors commented Sep 17, 2022

bors commented Sep 17, 2022

bors commented Sep 17, 2022

rust-timer commented Sep 17, 2022

rust-timer commented Sep 17, 2022

Rollup of 9 pull requests #101946

Rollup of 9 pull requests #101946

Conversation

matthiaskrgr commented Sep 17, 2022

matthiaskrgr commented Sep 17, 2022

bors commented Sep 17, 2022

bors commented Sep 17, 2022

bors commented Sep 17, 2022

rust-timer commented Sep 17, 2022

rust-timer commented Sep 17, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes