Rollup of 8 pull requests #120341

matthiaskrgr · 2024-01-25T16:39:31Z

Successful merges:

Rewrite the BTreeMap cursor API using gaps #118208 (Rewrite the BTreeMap cursor API using gaps)
linker: Refactor library linking methods in trait Linker #120099 (linker: Refactor library linking methods in trait Linker)
Bump askama version #120288 (Bump askama version)
Clean up after clone3 removal from pidfd code (docs and tests) #120306 (Clean up after clone3 removal from pidfd code (docs and tests))
Don't call walk_ functions directly if there is an equivalent visit_ method #120316 (Don't call walk_ functions directly if there is an equivalent visit_ method)
Remove coroutine info when building coroutine drop body #120330 (Remove coroutine info when building coroutine drop body)
Remove unused struct #120332 (Remove unused struct)
Fix links to [strict|exposed] provenance sections of [std|core]::ptr #120338 (Fix links to [strict|exposed] provenance sections of [std|core]::ptr)

r? @ghost
@rustbot modify labels: rollup

Tracking issue: rust-lang#107540 Currently, a `Cursor` points to a single element in the tree, and allows moving to the next or previous element while mutating the tree. However this was found to be confusing and hard to use. This PR completely refactors cursors to instead point to a gap between two elements in the tree. This eliminates the need for a "ghost" element that exists after the last element and before the first one. Additionally, `upper_bound` and `lower_bound` now have a much clearer meaning. The ability to mutate keys is also factored out into a separate `CursorMutKey` type which is unsafe to create. This makes the API easier to use since it avoids duplicated versions of each method with and without key mutation. API summary: ```rust impl<K, V> BTreeMap<K, V> { fn lower_bound<Q>(&self, bound: Bound<&Q>) -> Cursor<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn lower_bound_mut<Q>(&mut self, bound: Bound<&Q>) -> CursorMut<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn upper_bound<Q>(&self, bound: Bound<&Q>) -> Cursor<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn upper_bound_mut<Q>(&mut self, bound: Bound<&Q>) -> CursorMut<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; } struct Cursor<'a, K: 'a, V: 'a>; impl<'a, K, V> Cursor<'a, K, V> { fn next(&mut self) -> Option<(&'a K, &'a V)>; fn prev(&mut self) -> Option<(&'a K, &'a V)>; fn peek_next(&self) -> Option<(&'a K, &'a V)>; fn peek_prev(&self) -> Option<(&'a K, &'a V)>; } struct CursorMut<'a, K: 'a, V: 'a>; impl<'a, K, V> CursorMut<'a, K, V> { fn next(&mut self) -> Option<(&K, &mut V)>; fn prev(&mut self) -> Option<(&K, &mut V)>; fn peek_next(&mut self) -> Option<(&K, &mut V)>; fn peek_prev(&mut self) -> Option<(&K, &mut V)>; unsafe fn insert_after_unchecked(&mut self, key: K, value: V); unsafe fn insert_before_unchecked(&mut self, key: K, value: V); fn insert_after(&mut self, key: K, value: V); fn insert_before(&mut self, key: K, value: V); fn remove_next(&mut self) -> Option<(K, V)>; fn remove_prev(&mut self) -> Option<(K, V)>; fn as_cursor(&self) -> Cursor<'_, K, V>; unsafe fn with_mutable_key(self) -> CursorMutKey<'a, K, V, A>; } struct CursorMutKey<'a, K: 'a, V: 'a>; impl<'a, K, V> CursorMut<'a, K, V> { fn next(&mut self) -> Option<(&mut K, &mut V)>; fn prev(&mut self) -> Option<(&mut K, &mut V)>; fn peek_next(&mut self) -> Option<(&mut K, &mut V)>; fn peek_prev(&mut self) -> Option<(&mut K, &mut V)>; unsafe fn insert_after_unchecked(&mut self, key: K, value: V); unsafe fn insert_before_unchecked(&mut self, key: K, value: V); fn insert_after(&mut self, key: K, value: V); fn insert_before(&mut self, key: K, value: V); fn remove_next(&mut self) -> Option<(K, V)>; fn remove_prev(&mut self) -> Option<(K, V)>; fn as_cursor(&self) -> Cursor<'_, K, V>; unsafe fn with_mutable_key(self) -> CursorMutKey<'a, K, V, A>; } ```

Co-authored-by: Joe ST <joe@fbstj.net>

Rename `link_(dylib,framework)`, remove `link_rust_dylib`.

Rename `link(_whole)(staticlib,rlib)` to something more suitable.

…ntly

remove tests/ui/command/command-create-pidfd.rs . But it contains very useful comment, so let's move the comment to library/std/src/sys/pal/unix/rand.rs , which contains another instance of the same Docker problem

…mand/command-create-pidfd.rs to library/std/src/sys/pal/unix/process/process_unix/tests.rs to remove code duplication

…t_` method.

Rewrite the BTreeMap cursor API using gaps Tracking issue: rust-lang#107540 Currently, a `Cursor` points to a single element in the tree, and allows moving to the next or previous element while mutating the tree. However this was found to be confusing and hard to use. This PR completely refactors cursors to instead point to a gap between two elements in the tree. This eliminates the need for a "ghost" element that exists after the last element and before the first one. Additionally, `upper_bound` and `lower_bound` now have a much clearer meaning. The ability to mutate keys is also factored out into a separate `CursorMutKey` type which is unsafe to create. This makes the API easier to use since it avoids duplicated versions of each method with and without key mutation. API summary: ```rust impl<K, V> BTreeMap<K, V> { fn lower_bound<Q>(&self, bound: Bound<&Q>) -> Cursor<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn lower_bound_mut<Q>(&mut self, bound: Bound<&Q>) -> CursorMut<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn upper_bound<Q>(&self, bound: Bound<&Q>) -> Cursor<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; fn upper_bound_mut<Q>(&mut self, bound: Bound<&Q>) -> CursorMut<'_, K, V> where K: Borrow<Q> + Ord, Q: Ord; } struct Cursor<'a, K: 'a, V: 'a>; impl<'a, K, V> Cursor<'a, K, V> { fn next(&mut self) -> Option<(&'a K, &'a V)>; fn prev(&mut self) -> Option<(&'a K, &'a V)>; fn peek_next(&self) -> Option<(&'a K, &'a V)>; fn peek_prev(&self) -> Option<(&'a K, &'a V)>; } struct CursorMut<'a, K: 'a, V: 'a>; impl<'a, K, V> CursorMut<'a, K, V> { fn next(&mut self) -> Option<(&K, &mut V)>; fn prev(&mut self) -> Option<(&K, &mut V)>; fn peek_next(&mut self) -> Option<(&K, &mut V)>; fn peek_prev(&mut self) -> Option<(&K, &mut V)>; unsafe fn insert_after_unchecked(&mut self, key: K, value: V); unsafe fn insert_before_unchecked(&mut self, key: K, value: V); fn insert_after(&mut self, key: K, value: V) -> Result<(), UnorderedKeyError>; fn insert_before(&mut self, key: K, value: V) -> Result<(), UnorderedKeyError>; fn remove_next(&mut self) -> Option<(K, V)>; fn remove_prev(&mut self) -> Option<(K, V)>; fn as_cursor(&self) -> Cursor<'_, K, V>; unsafe fn with_mutable_key(self) -> CursorMutKey<'a, K, V, A>; } struct CursorMutKey<'a, K: 'a, V: 'a>; impl<'a, K, V> CursorMut<'a, K, V> { fn next(&mut self) -> Option<(&mut K, &mut V)>; fn prev(&mut self) -> Option<(&mut K, &mut V)>; fn peek_next(&mut self) -> Option<(&mut K, &mut V)>; fn peek_prev(&mut self) -> Option<(&mut K, &mut V)>; unsafe fn insert_after_unchecked(&mut self, key: K, value: V); unsafe fn insert_before_unchecked(&mut self, key: K, value: V); fn insert_after(&mut self, key: K, value: V) -> Result<(), UnorderedKeyError>; fn insert_before(&mut self, key: K, value: V) -> Result<(), UnorderedKeyError>; fn remove_next(&mut self) -> Option<(K, V)>; fn remove_prev(&mut self) -> Option<(K, V)>; fn as_cursor(&self) -> Cursor<'_, K, V>; unsafe fn with_mutable_key(self) -> CursorMutKey<'a, K, V, A>; } struct UnorderedKeyError; ```

linker: Refactor library linking methods in `trait Linker` Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in `trait Linker` do not make much sense. They can be either removed or renamed to something more suitable. Commits after the second one are cleanups.

…Gomez Bump `askama` version Ran into this while looking at rust-lang#112865 and thought it would be useful to fix it now. Some more details in [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/Askama.20parser.20changes)

…ochenkov Clean up after clone3 removal from pidfd code (docs and tests) rust-lang#113939 removed clone3 from pidfd code. This patchset does necessary clean up: fixes docs and tests

…compiler-errors Don't call `walk_` functions directly if there is an equivalent `visit_` method I was working on rust-lang#77773 and realized in one of my experiments that the `visit_path` method was not always called whereas it should have. This fixes it. r? ``@davidtwco``

…in-coroutine-drop-body, r=nnethercote Remove coroutine info when building coroutine drop body Coroutine drop shims are not themselves coroutines, so erase the "`coroutine`" field from the body so that helper fns like `yield_ty` and `coroutine_kind` properly return `None` for the drop shim.

…trieb Remove unused struct Detected by rust-lang#118257

…rieb Fix links to [strict|exposed] provenance sections of `[std|core]::ptr`

matthiaskrgr · 2024-01-25T17:11:10Z

@bors r+ rollup=never p=8

bors · 2024-01-25T17:11:13Z

📌 Commit ea27a57 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-25T21:59:32Z

⌛ Testing commit ea27a57 with merge 0c1fb2a...

bors · 2024-01-26T00:16:35Z

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

rust-timer · 2024-01-26T00:18:49Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#118208	Rewrite the BTreeMap cursor API using gaps	`bc0f4bb6329d2b6b27f906095117f281766f14c1` (link)
#120099	linker: Refactor library linking methods in `trait Linker`	`4a2df618bb8d74bb77ec5f006cbf51e27bffafbe` (link)
#120288	Bump `askama` version	`5289486498a13b02f05a617e3f4630cf6d5cccfe` (link)
#120306	Clean up after clone3 removal from pidfd code (docs and tes…	`6cf8c22a90dc3af055e261ee126bc4a2183a3512` (link)
#120316	Don't call `walk_` functions directly if there is an equiva…	`4ff2132472c2ba0d56552559c520fe9b4b8384e0` (link)
#120330	Remove coroutine info when building coroutine drop body	`4a0d3b0c36e536b82322811de9a781a52aef243c` (link)
#120332	Remove unused struct	`6b91e4cd68aa53b12861911b68e30459465eb8d2` (link)
#120338	Fix links to [strict	exposed] provenance sections of `[std

previous master: 5bd5d214ef

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 · 2024-01-26T01:31:20Z

Finished benchmarking commit (0c1fb2a): 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)	4.6%	[3.1%, 6.2%]	2
Regressions ❌ (secondary)	2.2%	[2.0%, 2.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-3.9%, -3.9%]	1
All ❌✅ (primary)	4.6%	[3.1%, 6.2%]	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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

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.2%	[0.2%, 0.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.2%	[-1.6%, -0.2%]	12
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	1

Bootstrap: 664.45s -> 662.586s (-0.28%)
Artifact size: 308.12 MiB -> 308.16 MiB (0.01%)

Amanieu and others added 27 commits November 23, 2023 11:42

Update library/alloc/src/collections/btree/map.rs

166e348

Co-authored-by: Joe ST <joe@fbstj.net>

Add UnorderedKeyError

d085f34

Remove unused struct

75eeb5e

linker: Refactor APIs for linking dynamic libraries

50501c6

Rename `link_(dylib,framework)`, remove `link_rust_dylib`.

linker: Refactor APIs for linking static libraries

0e38a65

Rename `link(_whole)(staticlib,rlib)` to something more suitable.

linker: Group library linking methods together and sort them consiste…

14cd3fd

…ntly

linker: Do not collect search paths unless necessary

859f37a

linker: Merge link_staticlib_* and link_whole_staticlib_*

d15db6b

linker: Cleanup implementations of link_staticlib_*

1b8e871

linker: Fix Rust dylib crate extension on windows-msvc

03f23c1

Bump askama version

da33619

This commit is part of clone3 clean up. As part of clean up we will

57f9d1f

remove tests/ui/command/command-create-pidfd.rs . But it contains very useful comment, so let's move the comment to library/std/src/sys/pal/unix/rand.rs , which contains another instance of the same Docker problem

This commit is part of clone3 clean up. Merge tests from tests/ui/com…

1ee773e

…mand/command-create-pidfd.rs to library/std/src/sys/pal/unix/process/process_unix/tests.rs to remove code duplication

Finishing clone3 clean up

df0c9c3

Don't call walk_ functions directly if there is an equivalent `visi…

bdc9ce0

…t_` method.

Remove coroutine info when building coroutine drop body

3004e8c

What even is CoroutineInfo

07b7c77

Fix links to [strict|exposed] provenance sections of [std|core]::ptr

6a81ec3

Rollup merge of rust-lang#120306 - safinaskar:clone3-clean-up, r=petr…

8750bec

…ochenkov Clean up after clone3 removal from pidfd code (docs and tests) rust-lang#113939 removed clone3 from pidfd code. This patchset does necessary clean up: fixes docs and tests

Rollup merge of rust-lang#120332 - mu001999:cleanup/dead_code, r=Nils…

d7a9f51

…trieb Remove unused struct Detected by rust-lang#118257

Rollup merge of rust-lang#120338 - steffahn:provenance_links, r=Nilst…

ea27a57

…rieb Fix links to [strict|exposed] provenance sections of `[std|core]::ptr`

rustbot added O-linux Operating system: Linux O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2024

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 25, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2024

bors merged commit 0c1fb2a into rust-lang:master Jan 26, 2024
12 checks passed

rustbot added this to the 1.77.0 milestone Jan 26, 2024

bors mentioned this pull request Jan 26, 2024

LLVM Bitcode Linker: A self contained linker for nvptx and other targets #117458

Merged

matthiaskrgr deleted the rollup-lvm59cj branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #120341

Rollup of 8 pull requests #120341

matthiaskrgr commented Jan 25, 2024

matthiaskrgr commented Jan 25, 2024

bors commented Jan 25, 2024

bors commented Jan 25, 2024

bors commented Jan 26, 2024

rust-timer commented Jan 26, 2024

rust-timer commented Jan 26, 2024

Rollup of 8 pull requests #120341

Rollup of 8 pull requests #120341

Conversation

matthiaskrgr commented Jan 25, 2024

matthiaskrgr commented Jan 25, 2024

bors commented Jan 25, 2024

bors commented Jan 25, 2024

bors commented Jan 26, 2024

rust-timer commented Jan 26, 2024

rust-timer commented Jan 26, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size