Update parking_lot to 0.7 #57051

Eijebong · 2018-12-21T19:57:18Z

Unfortunately this'll dupe parking_lot until the data_structures crate
is published and be updated in rls in conjunction with crossbeam-channel

rust-highfive · 2018-12-21T19:57:28Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

nikomatsakis · 2018-12-27T14:18:12Z

@bors r+

bors · 2018-12-27T14:18:13Z

📌 Commit fc2af5efdce40439bf3a3744f2f5baa72085c2f9 has been approved by nikomatsakis

Eijebong · 2018-12-29T16:27:17Z

Rebased

killercup · 2018-12-30T23:57:39Z

@bors r=nikomatsakis

bors · 2018-12-30T23:57:40Z

📌 Commit 353b1bbe0ac15dec4ebd738c6fbd81d6ab6e4abd has been approved by nikomatsakis

bors · 2018-12-31T06:44:08Z

⌛ Testing commit 353b1bbe0ac15dec4ebd738c6fbd81d6ab6e4abd with merge 13df9903f43ebb181fa62668e11abe517c706dc6...

bors · 2018-12-31T08:06:11Z

💔 Test failed - status-travis

rust-highfive · 2018-12-31T08:06:13Z

The job dist-x86_64-apple-alt 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:02:20]       Memory: 8 GB
[00:02:20]       Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:02:20]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:20]       SMC Version (system): 2.8f0
[00:02:20]       Serial Number (system): VMVioWY30Bik
[00:02:20] 
[00:02:20] hw.ncpu: 4
[00:02:20] hw.byteorder: 1234
[00:02:20] hw.memsize: 8589934592
---
[01:11:06] [RUSTC-TIMING] racer test:false 27.283
[01:11:32] [RUSTC-TIMING] rustfmt_nightly test:false 53.050
[01:12:53] [RUSTC-TIMING] rls test:false 81.923
[01:12:53]     Finished release [optimized] target(s) in 6m 18s
[01:12:54] duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
[01:12:54] 
[01:12:54] the following dependencies are duplicated although they have the same features enabled:
[01:12:54]   crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)
[01:12:54]     `rls` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libcrossbeam_channel-16fb00439a89c4da.rlib")
[01:12:54]     `cargo` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libcrossbeam_channel-6efa008a657362da.rlib")
[01:12:54]   ignore 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)
[01:12:54]     `rls` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libignore-9a961f29fd89f3ae.rlib")
[01:12:54]     `cargo` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libignore-2bf832742f73f7f0.rlib")
[01:12:54] the following dependencies have different features:
[01:12:54]   parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)
[01:12:54]     `rls` additionally enabled features {"nightly"} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot_core-8d1e5d3d6481b0c3.rlib"
[01:12:54]     `cargo` additionally enabled features {} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot_core-2780374da10dcd7d.rlib"
[01:12:54]   parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)
[01:12:54]     `rls` additionally enabled features {"parking_lot_core", "nightly"} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot-b2d458ca67492993.rlib"
[01:12:54]     `cargo` additionally enabled features {} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot-13d4e3ef562ec70c.rlib"
[01:12:54] thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:169:13
[01:12:54] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:12:54] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:12:54] to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
[01:12:54] make: *** [all] Error 1

[01:12:54] travis_time:end:stage2-rls:start=1546243149836140000,finish=1546243528112353000,duration=378276213000

[01:12:54] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap build
---
travis_fold:start:after_failure.2
travis_time:start:20245e30
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
total 0
drwx------+ 15 travis  staff  510 Jan 25  2018 ..
drwx------   2 travis  staff   68 Dec  6  2017 .
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:00a63e3a
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
travis_time:end:00a63e3a:start=1546243530662036000,finish=1546243530676692000,duration=14656000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:04f45368
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:15cf2166
travis_time:start:15cf2166
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1eb0e992
$ dmesg | grep -i kill
$ dmesg | grep -i kill
Unable to obtain kernel buffer: Operation not permitted
usage: sudo dmesg
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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)

bors · 2019-01-03T15:37:18Z

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

nikomatsakis · 2019-01-03T17:38:40Z

Sigh, needs rebase again :(

nikomatsakis · 2019-01-03T17:38:48Z

These Cargo.lock PRs are a royal pain to land

bors · 2019-01-10T06:01:36Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout parking_lot (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self parking_lot --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/tools/rustc-workspace-hack/Cargo.toml
CONFLICT (content): Merge conflict in src/tools/rustc-workspace-hack/Cargo.toml
Auto-merging src/librustc/Cargo.toml
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Xanewok · 2019-02-04T23:37:20Z

@bors r=nikomatsakis

bors · 2019-02-04T23:37:21Z

📌 Commit 79db25c83c193173f065bd631850b46b04184637 has been approved by nikomatsakis

bors · 2019-02-05T00:10:31Z

⌛ Testing commit 79db25c83c193173f065bd631850b46b04184637 with merge 5c19fa914f179cdd0d5db0a8cba9306f632c83d5...

bors · 2019-02-05T01:40:09Z

💔 Test failed - checks-travis

rust-highfive · 2019-02-05T01:40:11Z

The job dist-x86_64-freebsd 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.

[01:25:26] [RUSTC-TIMING] cargo test:false 138.406
[01:26:44] [RUSTC-TIMING] rls test:false 77.824
[01:26:50] [RUSTC-TIMING] rls test:false 6.123
[01:26:50]     Finished release [optimized] target(s) in 4m 43s
[01:26:50] duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
[01:26:50] 
[01:26:50] the following dependencies are duplicated although they have the same features enabled:
[01:26:50]   crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)
[01:26:50]     `rls` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libcrossbeam_channel-847b9bde19455337.rlib")
[01:26:50]     `cargo` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libcrossbeam_channel-694f8ae15c491d73.rlib")
[01:26:50]   ignore 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)
[01:26:50]     `rls` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libignore-9e2734c668c93115.rlib")
[01:26:50]     `cargo` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libignore-2ea005206020e491.rlib")
[01:26:50] the following dependencies have different features:
[01:26:50]   parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)
[01:26:50]     `rls` additionally enabled features {"nightly"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libparking_lot_core-ebc045d9e817e68b.rlib"
[01:26:50]     `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libparking_lot_core-122e91f3326c9552.rlib"
[01:26:50]   parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)
[01:26:50] thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:169:13
[01:26:50] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:26:50]     `rls` additionally enabled features {"parking_lot_core", "nightly"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libparking_lot-ed53e4fb9ce4db63.rlib"
[01:26:50]     `cargo` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-freebsd/release/deps/libparking_lot-2694dc4c18db5d32.rlib"
[01:26:50] 
[01:26:50] to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set

[01:26:50] travis_time:end:stage2-rls:start=1549330486924265527,finish=1549330770245436465,duration=283321170938

[01:26:50] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-freebsd --target x86_64-unknown-freebsd
---
travis_time:end:02cb9718:start=1549330772519413969,finish=1549330772527543940,duration=8129971
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:02cc0c8e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e5e1233
travis_time:start:0e5e1233
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1232bd0f
$ 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)

Xanewok · 2019-02-05T15:22:14Z

I believe this also needs a bump of the ignore to ^0.4.5 (which pulls in crossbeam-channel 0.3)

bors · 2019-02-07T17:45:00Z

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

Unfortunately this'll dupe parking_lot until the data_structures crate is published and be updated in rls in conjunction with crossbeam-channel

Eijebong · 2019-02-22T12:51:43Z

There, rebased. Not sure how to test for the latest CI failure locally though so I trusted @Xanewok's advice and bumped ignore (which removed a few dependencies so that's great)

Xanewok · 2019-02-23T15:55:50Z

CI is green, right now 0.6.4 is pulled by

rust/Cargo.lock

Lines 2416 to 2423 in a82f0ce

    
           name = "rustc-ap-rustc_data_structures" 
        
           version = "373.0.0" 
        
           source = "registry+https://github.com/rust-lang/crates.io-index" 
        
           dependencies = [ 
        
            "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 
        
            "ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 
        
            "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 
        
            "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",

but since it's an auto-published rustc package this will be updated once we upgrade rustc-ap-* packages in a lockstep (has to be coordinated with tools)

@bors r=nikomatsakis p=1
bumping prio to not let it bitrot due to lockfile changes

bors · 2019-02-23T15:55:51Z

📌 Commit a82f0ce has been approved by nikomatsakis

bors · 2019-02-23T19:46:17Z

⌛ Testing commit a82f0ce with merge aadbc45...

Update parking_lot to 0.7 Unfortunately this'll dupe parking_lot until the data_structures crate is published and be updated in rls in conjunction with crossbeam-channel

bors · 2019-02-23T22:27:58Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing aadbc45 to master...

bors · 2019-02-23T22:28:08Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing aadbc45 to master...

rust-highfive assigned nikomatsakis Dec 21, 2018

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

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 Dec 27, 2018

This comment has been minimized.

Sign in to view

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 28, 2018

Eijebong force-pushed the parking_lot branch from fc2af5e to 0b8dbfe Compare December 29, 2018 16:27

Eijebong force-pushed the parking_lot branch from 0b8dbfe to 353b1bb Compare December 30, 2018 15:04

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 30, 2018

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 Dec 31, 2018

kennytm 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 Dec 31, 2018

Eijebong force-pushed the parking_lot branch from 353b1bb to e48aabc Compare January 15, 2019 11:36

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 2019

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 5, 2019

kennytm 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 5, 2019

Update parking_lot to 0.7

a82f0ce

Unfortunately this'll dupe parking_lot until the data_structures crate is published and be updated in rls in conjunction with crossbeam-channel

Eijebong force-pushed the parking_lot branch from 79db25c to a82f0ce Compare February 22, 2019 12:49

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2019

jonas-schievink mentioned this pull request Feb 23, 2019

Auto #58682

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2019

bors merged commit a82f0ce into rust-lang:master Feb 23, 2019

bors mentioned this pull request Feb 23, 2019

Add support for using a jobserver with Rayon #56946

Merged

Mark-Simulacrum mentioned this pull request Mar 2, 2019

Huge performance regression in rustdoc between 1/28 and 2/25 nightlies #58849

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update parking_lot to 0.7 #57051

Update parking_lot to 0.7 #57051

Eijebong commented Dec 21, 2018

rust-highfive commented Dec 21, 2018

nikomatsakis commented Dec 27, 2018

bors commented Dec 27, 2018

This comment has been minimized.

Eijebong commented Dec 29, 2018

killercup commented Dec 30, 2018

bors commented Dec 30, 2018

bors commented Dec 31, 2018

bors commented Dec 31, 2018

rust-highfive commented Dec 31, 2018

bors commented Jan 3, 2019

nikomatsakis commented Jan 3, 2019

nikomatsakis commented Jan 3, 2019

bors commented Jan 10, 2019

Xanewok commented Feb 4, 2019

bors commented Feb 4, 2019

bors commented Feb 5, 2019

bors commented Feb 5, 2019

rust-highfive commented Feb 5, 2019

Xanewok commented Feb 5, 2019

bors commented Feb 7, 2019

Eijebong commented Feb 22, 2019

Xanewok commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019

Update parking_lot to 0.7 #57051

Update parking_lot to 0.7 #57051

Conversation

Eijebong commented Dec 21, 2018

rust-highfive commented Dec 21, 2018

nikomatsakis commented Dec 27, 2018

bors commented Dec 27, 2018

This comment has been minimized.

Eijebong commented Dec 29, 2018

killercup commented Dec 30, 2018

bors commented Dec 30, 2018

bors commented Dec 31, 2018

bors commented Dec 31, 2018

rust-highfive commented Dec 31, 2018

bors commented Jan 3, 2019

nikomatsakis commented Jan 3, 2019

nikomatsakis commented Jan 3, 2019

bors commented Jan 10, 2019

Xanewok commented Feb 4, 2019

bors commented Feb 4, 2019

bors commented Feb 5, 2019

bors commented Feb 5, 2019

rust-highfive commented Feb 5, 2019

Xanewok commented Feb 5, 2019

bors commented Feb 7, 2019

Eijebong commented Feb 22, 2019

Xanewok commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019

bors commented Feb 23, 2019