polonius tweaks

[nikomatsakis]

• bump polonius to 0.6.0
• fix 2-phase-borrow activations

r? @matthewjasper

[matthewjasper]

@bors r+

[bors]

📌 Commit f30ba07 has been approved by matthewjasper

[nikomatsakis]

@bors r=MatthewJasper

Taking the liberty, @matthewjasper, of r+'ing my add'l commit that bumps us to 0.6.1 =)

[bors]

📌 Commit 2618bd7e22f08ddf03cda562c45ee25a8da2fb67 has been approved by MatthewJasper

[nikomatsakis]

@bors r=MatthewJasper

[bors]

📌 Commit 567f654363ec6cfbfbf68a373dfa1df5cfaa0fc9 has been approved by MatthewJasper

[bors]

🔒 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:

1. git checkout polonius-integrate (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self polonius-integrate --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 Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[nikomatsakis]

@bors r=MatthewJasper

[bors]

📌 Commit f7cbbd599d3022a53648d4ad8b64647c6f6324d1 has been approved by MatthewJasper

[bors]

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

[nikomatsakis]

@bors r=MatthewJasper rollup

[bors]

📌 Commit 8ee2c06 has been approved by MatthewJasper

[nikomatsakis]

@bors r=MatthewJasper

[bors]

📌 Commit 490e66eb6cf1ce72ffaa3278534698b528d38dd1 has been approved by MatthewJasper

[bors]

⌛ Testing commit 490e66eb6cf1ce72ffaa3278534698b528d38dd1 with merge 8f7e0cedc57f65a887eb460853de459b34dd6610...

[bors]

💔 Test failed - status-travis

[rust-highfive]

The job dist-x86_64-linux 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:33:21] 
[01:33:21]  Documenting rustc_codegen_llvm v0.0.0 (/checkout/src/librustc_codegen_llvm)
[01:33:22] [RUSTC-TIMING] rustc_errors test:false 1.884
[01:33:24]  Documenting syntax v0.0.0 (/checkout/src/libsyntax)
[01:33:28] thread 'rustc' panicked at 'assertion failed: output.is_none()', src/librustdoc/clean/simplify.rs:98:21
[01:33:29] 
[01:33:29] error: internal compiler error: unexpected panic
[01:33:29] 
[01:33:29] error: Unrecognized option: 'document-private-items'
[01:33:29] error: Unrecognized option: 'document-private-items'
[01:33:29] 
[01:33:29] error: Could not document `rustc_codegen_llvm`.
[01:33:29] 
[01:33:29] Caused by:
[01:33:29]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --crate-name rustc_codegen_llvm src/librustc_codegen_llvm/lib.rs --color always --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/doc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps --extern cc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libcc-26aa2a8a1ef3d6e6.rmeta --extern memmap=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libmemmap-6baaa1d61f0d5f6e.rmeta --extern num_cpus=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libnum_cpus-947d05d9d229d687.rmeta --extern rustc_demangle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_demangle-5fddb3200ed59239.rmeta --extern rustc_llvm=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_llvm-7209a88e3371922f.rmeta --document-private-items` (exit code: 1)
[01:33:31] warning: `[stable]` cannot be resolved, ignoring it...
[01:33:31]    --> src/libsyntax/attr/builtin.rs:111:22
[01:33:31]     |
[01:33:31] 111 | /// Represents the #[stable], #[unstable], #[rustc_{deprecated,const_unstable}] attributes.
---
[01:33:37] [RUSTC-TIMING] syntax test:false 15.780
[01:33:37] error: build failed
[01:33:37] 
[01:33:37] 
[01:33:37] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "rustc_traits" "-p" "graphviz" "-p" "rustc_incremental" "-p" "rustc_lint" "-p" "rustc_target" "-p" "rustc_resolve" "-p" "rustc_borrowck" "-p" "rustc_codegen_ssa" "-p" "serialize" "-p" "rustc" "-p" "rustc_apfloat" "-p" "fmt_macros" "-p" "syntax" "-p" "rustc_typeck" "-p" "rustc_passes" "-p" "syntax_ext" "-p" "syntax_pos" "-p" "rustc_allocator" "-p" "build_helper" "-p" "rustc_save_analysis" "-p" "rustc_metadata" "-p" "rustc_data_structures" "-p" "rustc_mir" "-p" "rustc_codegen_llvm" "-p" "rustc_errors" "-p" "rustc_privacy" "-p" "rustc_plugin" "-p" "rustc_llvm" "-p" "rustc_driver" "-p" "arena" "-p" "rustc_codegen_utils" "-p" "rustc_platform_intrinsics" "-p" "rustc_fs_util"
[01:33:37] 
[01:33:37] 
[01:33:37] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
[01:33:37] Build completed unsuccessfully in 1:28:23
---
travis_time:end:10486b94:start=1546009695169947274,finish=1546009695177851148,duration=7903874
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1ea137a2
$ 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:0c1bba83
travis_time:start:0c1bba83
$ 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:17d0ab60
$ 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)

[Mark-Simulacrum]

@bors try

let's see if a try build also hits this problem

[lqd]

So, even though the error references an "Unrecognized option" which seems valid, and another crate ("Could not document rustc_codegen_llvm"), this PR is actually hitting an unlikely rustdoc ICE trying to document this recent rev of datafrog.

I've minimized it and opened #57180. It can be worked around in datafrog, so I opened rust-lang/datafrog#24 there. Integrating the workaround/fix into a new polonius version and then into this PR should unblock it from landing (famous last words).

[nikomatsakis]

@bors r=MatthewJasper

[bors]

📌 Commit 826fb1d has been approved by MatthewJasper

[bors]

⌛ Testing commit 826fb1d with merge 2442823...

[bors]

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