Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #54036

Closed
wants to merge 39 commits into from
Closed

Rollup of 9 pull requests #54036

wants to merge 39 commits into from

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Sep 7, 2018

Successful merges:

Failed merges:

r? @ghost

matthewjasper and others added 30 commits September 3, 2018 21:50
those get handled properly in strip-hidden anyway
constraints:

- clean/inline.rs needs this map to fill in traits when inlining
- fold.rs needs this map to allow passes to fold trait items
- html/render.rs needs this map to seed the Cache.traits map of all
  known traits

The first two are the real problem, since `DocFolder` only operates on
`clean::Crate` but `clean/inline.rs` only sees the `DocContext`. The
introduction of early passes means that these two now exist at the same
time, so they need to share ownership of the map. Even better, the use
of `Crate` in a rustc thread pool means that it needs to be Sync, so it
can't use `Lrc<Lock>` to manually activate thread-safety.

`parking_lot` is reused from elsewhere in the tree to allow use of its
`ReentrantMutex`, as the relevant parts of rustdoc are still
single-threaded and this allows for easier use in that context.
We're shipping a rust-enabled lldb, but the "lldb" executable is not
installed into the "bin" directory by rustup.  See the discussion in
rust-lang/rustup#1492 for
background on this decision.  There, we agreed to have rust-lldb
prefer the rust-enabled lldb if it is installed.

This patch changes dist.rs to put lldb into rustlib, following what
was done for the other LLVM tools in rust-lang#53955, and then fixes rust-lldb
to prefer that lldb, if it exists.

See issue rust-lang#48168
@bors
Copy link
Contributor

bors commented Sep 7, 2018

📌 Commit 32668874b564659ac1589f511277098da61e47d8 has been approved by kennytm

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 7, 2018
@bors
Copy link
Contributor

bors commented Sep 7, 2018

⌛ Testing commit 32668874b564659ac1589f511277098da61e47d8 with merge afac4abd683e597fa1bcde76a2fc3e71d8a2d8fc...

@bors
Copy link
Contributor

bors commented Sep 7, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-aarch64-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.
[00:03:50] DirectMap2M:     3082240 kB
[00:03:50] DirectMap1G:    14680064 kB
[00:03:50] + python2.7 ../x.py dist --host aarch64-unknown-linux-gnu --target aarch64-unknown-linux-gnu
[00:03:50]     Finished dev [unoptimized] target(s) in 0.25s
[00:03:51] thread 'main' panicked at 'failed to find sha', libcore/option.rs:989:5
[00:03:51] travis_fold:end:log-system-info
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host aarch64-unknown-linux-gnu --target aarch64-unknown-linux-gnu
[00:03:51] Build completed unsuccessfully in 0:00:01
travis_time:end:1684db80:start=1536342708314694063,finish=1536342940317103245,duration=232002409182
---
travis_time:end:11648ebb:start=1536342940768440001,finish=1536342940778331463,duration=9891462
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0fdb523b
$ 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 -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:14cb95b2
travis_time:start:14cb95b2
$ 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:04efc280
$ 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)

@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 Sep 7, 2018
…ikomatsakis

[NLL] Remove base_place

This function was supposed to make `Box` less special. But

* I think that the consensus is that MIR borrowck is going to fully special case `Box`
* It wasn't implemented correctly, it's looking at the type of the wrong `Place`, resulting in weird behaviour:

```rust
#![feature(nll)]
type A = Box<i32>; // If this is changed to another type then this will compile.

pub fn foo(x: Box<(String, A)>) {
    let a = x.0; // This will compile if these lines are swapped
    let b = x.1;
}
```

r? @nikomatsakis
Fix incorrect outer function type parameter message

Fix rust-lang#51303.
…alexcrichton

Have rust-lldb look for the rust-enabled lldb

We're shipping a rust-enabled lldb, but the "lldb" executable is not
installed into the "bin" directory by rustup.  See the discussion in
rust-lang/rustup#1492 for
background on this decision.  There, we agreed to have rust-lldb
prefer the rust-enabled lldb if it is installed.  This patch changes
rust-lldb to look in the sysroot and use the lldb found there, if any.

See issue rust-lang#48168
rustbuild: allow configuring llvm version suffix

Fixes rust-lang#53852 by allowing user to install different versions of rust to the same sysroot.
rustc_resolve: don't record uniform_paths canaries as reexports.

Fixes rust-lang#53691, fixes rust-lang#53484.
@kennytm kennytm changed the title Rollup of 10 pull requests Rollup of 9 pull requests Sep 7, 2018
@kennytm
Copy link
Member Author

kennytm commented Sep 7, 2018

@bors r+

Removed #53829.

@bors
Copy link
Contributor

bors commented Sep 7, 2018

📌 Commit 1e4aa65 has been approved by kennytm

@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 Sep 7, 2018
@bors
Copy link
Contributor

bors commented Sep 7, 2018

⌛ Testing commit 1e4aa65 with merge 0103b90a67470e4ef125ed59125cbe36b942641d...

@bors
Copy link
Contributor

bors commented Sep 7, 2018

💔 Test failed - status-appveyor

@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 Sep 7, 2018
@matthiaskrgr
Copy link
Member

Looks like 8c3ac3c Remove crate_visibility_modifier from 2018 edition is breaking clippy

@kennytm kennytm closed this Sep 8, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.