Skip to content

Make BTreeMap::clone() not allocate when cloning an empty tree.#51893

Merged
bors merged 1 commit into
rust-lang:masterfrom
nnethercote:BTreeMap-clone-noalloc
Jul 2, 2018
Merged

Make BTreeMap::clone() not allocate when cloning an empty tree.#51893
bors merged 1 commit into
rust-lang:masterfrom
nnethercote:BTreeMap-clone-noalloc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:05:02] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:05:02] tidy error: /checkout/src/liballoc/btree/map.rs:217: XXX is deprecated; use FIXME
[00:05:04] some tidy checks failed
[00:05:04] 
[00:05:04] 
[00:05:04] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:05:04] 
[00:05:04] 
[00:05:04] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:05:04] Build completed unsuccessfully in 0:01:54
[00:05:04] Build completed unsuccessfully in 0:01:54
[00:05:04] Makefile:79: recipe for target 'tidy' failed
[00:05:04] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:001c3ff9
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:1ca9c2ed:start=1530261046150411598,finish=1530261046156942621,duration=6531023
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:12c4532a
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0057cfe5
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Gankra

Gankra commented Jun 29, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 29, 2018

Copy link
Copy Markdown
Collaborator

@gankro: 🔑 Insufficient privileges: Not in reviewers

Comment thread src/liballoc/btree/map.rs Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tidy is complaining XXX is deprecated notation; i would just drop the XXX, comment is fine without it

@bors

bors commented Jun 29, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #51569) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors delegate+

(this is effectively r=me at this point pending rebase and nit)

@bors

bors commented Jul 1, 2018

Copy link
Copy Markdown
Collaborator

✌️ @nnethercote can now approve this pull request

@nnethercote nnethercote force-pushed the BTreeMap-clone-noalloc branch from f5e99e8 to cf3786d Compare July 2, 2018 00:02
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:04:36] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:36] tidy error: /checkout/src/liballoc/collections/btree/map.rs:217: XXX is deprecated; use FIXME
[00:04:37] some tidy checks failed
[00:04:37] 
[00:04:37] 
[00:04:37] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:37] 
[00:04:37] 
[00:04:37] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:37] Build completed unsuccessfully in 0:01:30
[00:04:37] Build completed unsuccessfully in 0:01:30
[00:04:37] make: *** [tidy] Error 1
[00:04:37] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2f3fbd6a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0a9b16a0:start=1530490126665110950,finish=1530490126671729842,duration=6618892
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0f1121f0
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:11d491ba
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@nnethercote nnethercote force-pushed the BTreeMap-clone-noalloc branch from cf3786d to f46f05b Compare July 2, 2018 03:03
@nnethercote

Copy link
Copy Markdown
Contributor Author

@bors: r+

@bors

bors commented Jul 2, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit f46f05b has been approved by nnethercote

@bors 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 Jul 2, 2018
@bors

bors commented Jul 2, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f46f05b with merge 3a35d425288de5289e194a888d0be2f23ce14766...

@bors

bors commented Jul 2, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@bors 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 Jul 2, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:156edd35:start=1530513116062105291,finish=1530513116067596775,duration=5491484
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0206a6f6
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:029a1cec
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

1 similar comment
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:156edd35:start=1530513116062105291,finish=1530513116067596775,duration=5491484
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0206a6f6
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:029a1cec
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@nnethercote

Copy link
Copy Markdown
Contributor Author

@bors retry

@bors 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 Jul 2, 2018
@bors

bors commented Jul 2, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f46f05b with merge a96c88e...

bors added a commit that referenced this pull request Jul 2, 2018
Make `BTreeMap::clone()` not allocate when cloning an empty tree.

r? @gankro

CC @porglezomp
@bors

bors commented Jul 2, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nnethercote
Pushing a96c88e to master...

@bors bors merged commit f46f05b into rust-lang:master Jul 2, 2018
@nnethercote nnethercote deleted the BTreeMap-clone-noalloc branch July 2, 2018 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants