Skip to content

Commit 65e5058

Browse files
committed
Auto merge of #126793 - saethlin:mono-rawvec, r=scottmcm
Apply "polymorphization at home" to RawVec The idea here is to move all the logic in RawVec into functions with explicit size and alignment parameters. This should eliminate all the fussing about how tweaking RawVec code produces large swings in compile times. This uncovered rust-lang/rust-clippy#12979, so I've modified the relevant test in a way that tries to preserve the spirit of the test without tripping the ICE.
2 parents aad0563 + 74a9685 commit 65e5058

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

tests/pass/tree_borrows/vec_unique.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// FIXME: This test is broken since https://github.com/rust-lang/rust/pull/126793,
2+
// possibly related to the additional struct between Vec and Unique.
13
//@revisions: default uniq
24
// We disable the GC for this test because it would change what is printed.
35
//@compile-flags: -Zmiri-tree-borrows -Zmiri-provenance-gc=0

tests/pass/tree_borrows/vec_unique.uniq.stderr

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
Warning: this tree is indicative only. Some tags may have been hidden.
33
0.. 2
44
| Act | └─┬──<TAG=root of the allocation>
5-
|-----| └─┬──<TAG=base.as_ptr(), base.as_ptr()>
6-
|-----| └─┬──<TAG=raw_parts.0>
7-
|-----| └────<TAG=reconstructed.as_ptr(), reconstructed.as_ptr()>
5+
|-----| ├────<TAG=base.as_ptr()>
6+
|-----| ├────<TAG=base.as_ptr()>
7+
|-----| └─┬──<TAG=raw_parts.0>
8+
|-----| ├────<TAG=reconstructed.as_ptr()>
9+
|-----| └────<TAG=reconstructed.as_ptr()>
810
──────────────────────────────────────────────────

0 commit comments

Comments
 (0)