BTreeMap: gather and decompose reusable tree fixing functions#81362

ssomers · 2021-01-25T00:05:20Z

This is kind of pushing it as a standalone refactor, probably only useful for #81075 (or similar).
r? @Mark-Simulacrum

Mark-Simulacrum · 2021-02-12T01:28:17Z

Can you say if this is changing any code beyond just moving things around? It looks like git is struggling to detect things with --color-moved when run locally...

ssomers · 2021-02-12T10:35:47Z

Yes, it also decomposes the body of some moved functions into more functions. But it does not change or add arguments. Therefore #81075 not only starts reusing the new functions, it also changes some arguments.

I can of course do another PR merely gathering the existing functions in one place, perhaps renaming some, but it didn't strike me as useful on its own.

Mark-Simulacrum · 2021-02-12T11:20:08Z

@bors try @rust-timer queue

rust-timer · 2021-02-12T11:20:09Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2021-02-12T11:20:18Z

⌛ Trying commit cbbdb44 with merge fd57014500755e6af5188269772a1e80782bb062...

bors · 2021-02-12T12:20:43Z

☀️ Try build successful - checks-actions
Build commit: fd57014500755e6af5188269772a1e80782bb062 (fd57014500755e6af5188269772a1e80782bb062)

rust-timer · 2021-02-12T12:20:45Z

Queued fd57014500755e6af5188269772a1e80782bb062 with parent a118ee2, future comparison URL.

rust-timer · 2021-02-12T13:59:01Z

Finished benchmarking try commit (fd57014500755e6af5188269772a1e80782bb062): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

Mark-Simulacrum · 2021-02-13T02:52:50Z

@bors r+

bors · 2021-02-13T02:52:51Z

📌 Commit cbbdb44 has been approved by Mark-Simulacrum

bors · 2021-02-13T05:38:01Z

⌛ Testing commit cbbdb44 with merge 7ddeac2b60f557f78ca03e30084fe7941d1df698...

rust-log-analyzer · 2021-02-13T07:58:08Z

The job x86_64-apple failed! Check out the build log: (web) (plain)

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

bors · 2021-02-13T07:58:39Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2021-02-20T20:41:22Z

@bors retry likely spurious expected success, got: signal: 9

rust-log-analyzer · 2021-02-22T04:05:18Z

The job i686-msvc-1 failed! Check out the build log: (web) (plain)

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

test [incremental] incremental\unchecked_dirty_clean.rs ... ok
test [incremental] incremental\warnings-reemitted.rs ... ok
test [incremental] incremental\type_alias_cross_crate\b.rs ... ok
test [incremental] incremental\lto.rs ... ok
Some tests failed in compiletest suite=incremental mode=incremental host=i686-pc-windows-msvc target=i686-pc-windows-msvc
failures:

---- [incremental] incremental\spike.rs stdout ----


error in revision `rpass2`: compilation failed!
status: exit code: 1
command: PATH="D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\bin;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\HostX64\x86;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw32\bin;C:\hostedtoolcache\windows\Python\3.9.1\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.1\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Users\runneradmin\.dotnet\tools;C:\Program Files\MongoDB\Server\4.4\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.5.1\x64;C:\ProgramData\chocolatey\lib\ghc.8.10.4\tools\ghc-8.10.4\bin;C:\Program Files\dotnet;C:\mysql-5.7.21-winx64\bin;C:\Program Files\R\R-4.0.3\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Rust\.cargo\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.15.8\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.8\x64\bin;C:\Program Files\Java\jdk8u282-b08\bin;C:\npm\prefix;C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI;C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0;C:\windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\nodejs;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.6.3\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\TortoiseSVN\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\CMake\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "D:\\a\\rust\\rust\\src/test\\incremental\\spike.rs" "-Zthreads=1" "--target=i686-pc-windows-msvc" "--cfg" "rpass2" "-C" "incremental=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\spike.inc" "-Z" "incremental-verify-ich" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-C" "prefer-dynamic" "-o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.exe" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "-Z" "query-dep-graph" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: linking with `link.exe` failed: exit code: 1201
   |
   = note: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.28.29333\\bin\\HostX64\\x86\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LARGEADDRESSAWARE" "/SAFESEH" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.10cnhdf72u6ogs3b.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.1runo6sbei6v04n4.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.24omyi2pb19ferq8.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.54k7jer479470fpt.rcgu.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.5aild7u98bzrn091.rcgu.o" "/OUT:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\a.exe" "/OPT:REF,ICF" "/DEBUG" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental\\spike\\auxiliary" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "std-3bae82006f02ab67.dll.lib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib\\libcompiler_builtins-432b832063ae9291.rlib" "advapi32.lib" "ws2_32.lib" "userenv.lib" "msvcrt.lib"
   = note: LINK : fatal error LNK1201: error writing to program database 'D:\a\rust\rust\build\i686-pc-windows-msvc\test\incremental\spike\a.pdb'; check for insufficient disk space, invalid path, or insufficient privilege

error: aborting due to previous error


---
test result: FAILED. 123 passed; 1 failed; 3 ignored; 0 measured; 0 filtered out; finished in 12.73s



command did not execute successfully: "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\rust\\rust\\src/test\\incremental" "--build-base" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\incremental" "--stage-id" "stage2-i686-pc-windows-msvc" "--suite" "incremental" "--mode" "incremental" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.1\\x64\\python3.exe" "--lldb-python" "C:\\hostedtoolcache\\windows\\Python\\3.9.1\\x64\\python3.exe" "--gdb" "C:\\msys64\\usr\\bin\\gdb" "--llvm-version" "11.0.1-rust-1.52.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions frontendopenmp fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcerror orcjit passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: D:\a\rust\rust\build\bootstrap\debug\bootstrap test --stage 2 --exclude src/test/ui --exclude src/tools/linkchecker
Build completed unsuccessfully in 0:30:56
Build completed unsuccessfully in 0:30:56
make: *** [Makefile:72: ci-subset-1] Error 1

bors · 2021-02-22T04:07:00Z

💔 Test failed - checks-actions

ehuss · 2021-02-22T05:56:24Z

@bors retry
#81890

bors · 2021-02-22T15:45:50Z

⌛ Testing commit cbbdb44 with merge db7c9dd034b6f1264637120e1b724e6c4e54fa86...

rust-log-analyzer · 2021-02-22T16:00:16Z

The job mingw-check failed! Check out the build log: (web) (plain)

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

Build completed successfully in 0:00:58
+ /scripts/validate-toolstate.sh
Cloning into 'rust-toolstate'...
<Nothing changed>
error: miri maintainer @oli-obk is not assignable in the rust-lang/rust repo
error: rustfmt maintainer @topecongiro is not assignable in the rust-lang/rust repo
error: nomicon maintainer @Gankra is not assignable in the rust-lang/rust repo
error: reference maintainer @ehuss is not assignable in the rust-lang/rust repo
error: reference maintainer @Havvy is not assignable in the rust-lang/rust repo
error: reference maintainer @matthewjasper is not assignable in the rust-lang/rust repo
error: embedded-book maintainer @therealprof is not assignable in the rust-lang/rust repo
error: edition-guide maintainer @ehuss is not assignable in the rust-lang/rust repo
error: rustc-dev-guide maintainer @amanjeev is not assignable in the rust-lang/rust repo

  To be assignable, a person needs to be explicitly listed as a
  collaborator in the repository settings. The simple way to
  fix this is to ask someone with 'admin' privileges on the repo
  to add the person or whole team as a collaborator with 'read'
  privileges. Those privileges don't grant any extra permissions
  so it's safe to apply them.
The build will fail due to this.

bors · 2021-02-22T16:02:40Z

💔 Test failed - checks-actions

ehuss · 2021-02-22T16:23:21Z

@bors treeclosed=1000

error: miri maintainer @oli-obk is not assignable in the rust-lang/rust repo
error: rustfmt maintainer @topecongiro is not assignable in the rust-lang/rust repo
error: nomicon maintainer @Gankra is not assignable in the rust-lang/rust repo
error: reference maintainer @ehuss is not assignable in the rust-lang/rust repo
error: reference maintainer @Havvy is not assignable in the rust-lang/rust repo
error: reference maintainer @matthewjasper is not assignable in the rust-lang/rust repo
error: embedded-book maintainer @therealprof is not assignable in the rust-lang/rust repo
error: edition-guide maintainer @ehuss is not assignable in the rust-lang/rust repo
error: rustc-dev-guide maintainer @amanjeev is not assignable in the rust-lang/rust repo

ehuss · 2021-02-22T16:25:47Z

@bors retry

kennytm · 2021-02-22T17:56:38Z

@bors p=1001

bors · 2021-02-22T17:56:49Z

⌛ Testing commit cbbdb44 with merge a15f484...

kennytm · 2021-02-22T18:13:44Z

@bors treeclosed-

bors · 2021-02-22T20:42:26Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing a15f484 to master...

rust-highfive assigned Mark-Simulacrum Jan 25, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 25, 2021

BTreeMap: gather and decompose reusable tree fixing functions

cbbdb44

Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2021

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 12, 2021

Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 12, 2021

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 12, 2021

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 Feb 13, 2021

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 Feb 13, 2021

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2021

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 Feb 22, 2021

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 Feb 22, 2021

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 Feb 22, 2021

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 Feb 22, 2021

This was referenced Feb 22, 2021

Improve anonymous lifetime note to indicate the target span #82370

Merged

Test hexagon-enum only when llvm target is present #82404

Merged

bors mentioned this pull request Feb 22, 2021

Remove many RefCells from DocContext #82305

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2021

bors merged commit a15f484 into rust-lang:master Feb 22, 2021

rustbot added this to the 1.52.0 milestone Feb 22, 2021

bors mentioned this pull request Feb 22, 2021

BTree: add drain methods #81075

Closed

ssomers deleted the btree_drainy_refactor_8 branch February 22, 2021 21:27

Uh oh!

Conversation

ssomers commented Jan 25, 2021

Uh oh!

Mark-Simulacrum commented Feb 12, 2021

Uh oh!

ssomers commented Feb 12, 2021

Uh oh!

Mark-Simulacrum commented Feb 12, 2021

Uh oh!

rust-timer commented Feb 12, 2021

Uh oh!

bors commented Feb 12, 2021

Uh oh!

bors commented Feb 12, 2021

Uh oh!

rust-timer commented Feb 12, 2021

Uh oh!

rust-timer commented Feb 12, 2021

Uh oh!

Mark-Simulacrum commented Feb 13, 2021

Uh oh!

bors commented Feb 13, 2021

Uh oh!

bors commented Feb 13, 2021

Uh oh!

rust-log-analyzer commented Feb 13, 2021

Uh oh!

bors commented Feb 13, 2021

Uh oh!

Mark-Simulacrum commented Feb 20, 2021

Uh oh!

rust-log-analyzer commented Feb 22, 2021

Uh oh!

bors commented Feb 22, 2021

Uh oh!

ehuss commented Feb 22, 2021

Uh oh!

bors commented Feb 22, 2021

Uh oh!

rust-log-analyzer commented Feb 22, 2021

Uh oh!

bors commented Feb 22, 2021

Uh oh!

ehuss commented Feb 22, 2021

Uh oh!

ehuss commented Feb 22, 2021

Uh oh!

kennytm commented Feb 22, 2021

Uh oh!

bors commented Feb 22, 2021

Uh oh!

kennytm commented Feb 22, 2021

Uh oh!

bors commented Feb 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants