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 6 pull requests #59801

Closed
wants to merge 19 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 8, 2019

Successful merges:

Failed merges:

r? @ghost

QuietMisdreavus and others added 19 commits March 6, 2019 10:16
It is now exactly equivalent to lookup_char_pos.
This uplifts `get_def_path` from Clippy. This is a follow up on the
implementation of internal lints: rust-lang#59316

The internal lint implementation also copied the implementation of the
`AbsolutePathPrinter`. To get rid of this code duplication this also
uplifts the `get_def_path` function from Clippy.

This also renames `match_path` to `match_def_path`, as it was originally
named in Clippy.
typos

Co-Authored-By: RalfJung <post@ralfj.de>
…rts, r=GuillaumeGomez

rustdoc: don't process `Crate::external_traits` when collecting intra-doc links

Part of rust-lang#58745, closes rust-lang#58917

The `collect-intra-doc-links` pass keeps track of the modules it recurses through as it processes items. This is used to know what module to give the resolver when looking up links. When looking through the regular items of the crate, this works fine, but the `DocFolder` trait as written doesn't just process the main crate hierarchy - it also processes the trait items in the `external_traits` map. This is useful for other passes (so they can strip out `#[doc(hidden)]` items, for example), but here it creates a situation where we're processing items "outside" the regular module hierarchy. Since everything in `external_traits` is defined outside the current crate, we can't fall back to finding its module scope like we do with local items.

Skipping this collection saves us from emitting some spurious warnings. We don't even lose anything by skipping it, either - the docs loaded from here are only ever rendered through `html::render::document_short` which strips any links out, so the fact that the links haven't been loaded doesn't matter. Hopefully this removes most of the remaining spurious resolution warnings from intra-doc links.

r? @GuillaumeGomez
…-mut, r=pnkfelix

Mark variables captured by reference as mutable correctly

Closes rust-lang#59620

r? @pnkfelix
remove lookup_char_pos_adj

It is now exactly equivalent to lookup_char_pos.
Limit dylib symbols

This makes `windows-gnu` match the behavior of `windows-msvc`. It probably doesn't make sense to export these symbols on other platforms either.
…ishearth

Uplift `get_def_path` from Clippy

cc rust-lang/rust-clippy#3926
cc rust-lang#59738

This uplifts `get_def_path` from Clippy. This is a follow up on the
implementation of internal lints: rust-lang#59316

The internal lint implementation also copied the implementation of the
`AbsolutePathPrinter`. To get rid of this code duplication this also
uplifts the `get_def_path` function from Clippy.

This also renames `match_path` to `match_def_path`, as it was originally
named in Clippy.

r? @Manishearth
@Centril
Copy link
Contributor Author

Centril commented Apr 8, 2019

@bors r+ p=6

@bors
Copy link
Contributor

bors commented Apr 8, 2019

📌 Commit 4564c89 has been approved by Centril

@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 Apr 8, 2019
@bors
Copy link
Contributor

bors commented Apr 8, 2019

⌛ Testing commit 4564c89 with merge a8ace84691b15000a34b71e5980e13f3a936c0a9...

@Manishearth
Copy link
Member

yielding pri to clippy PR

@Manishearth Manishearth closed this Apr 8, 2019
@Manishearth Manishearth reopened this Apr 8, 2019
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 8, 2019

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: Update clippy #59783

@bors
Copy link
Contributor

bors commented Apr 8, 2019

📌 Commit 4564c89 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Apr 9, 2019

⌛ Testing commit 4564c89 with merge c984e5efd0be84b6eb1befe158abd8f5bcee393b...

@bors
Copy link
Contributor

bors commented Apr 9, 2019

💔 Test failed - checks-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 Apr 9, 2019
@rust-highfive
Copy link
Collaborator

The job dist-various-2 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:57:33]    Compiling panic_unwind v0.0.0 (/checkout/src/libpanic_unwind)
[00:57:33] [RUSTC-TIMING] panic_unwind test:false 0.244
[00:57:52] error: linking with `sparcv9-sun-solaris2.10-gcc` failed: exit code: 1
[00:57:52]   |
[00:57:52]   = note: "sparcv9-sun-solaris2.10-gcc" "-m64" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/sparcv9-sun-solaris/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/deps/std-a13bd72181596505.std.dn7eah83-cgu.0.rcgu.o" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/deps/libstd-a13bd72181596505.so" "-Wl,-M,/tmp/rustc6CHczt/list" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/deps/std-a13bd72181596505.4s1vtwpn7z85dmqf.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/deps/std-a13bd72181596505.1mglhhcuhvh8teko.rcgu.o" "-Wl,-zignore" "-nodefaultlibs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/build/compiler_builtins-8378b22d6a548e04/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/sparcv9-sun-solaris/release/build/backtrace-sys-cbe5a45b39d44720/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/sparcv9-sun-solaris/lib" "-lsocket" "-lposix4" "-lpthread" "-lresolv" "-Wl,-Bstatic" "-Wl,--whole-archive" "/tmp/rustc6CHczt/libpanic_unwind-c2a16410f228c714.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/libbacktrace_sys-5ba735a64c8951c3.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/librustc_demangle-8fd284197e46ab70.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/libunwind-eebc1ec39336b17a.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/liblibc-233cfda2f4c7d8e1.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/liballoc-e75db5a2a9e140cf.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/librustc_std_workspace_core-f74bc27f7dfbf352.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustc6CHczt/libcore-e2f4bb5fa52d60ee.rlib" "-Wl,--no-whole-archive" "/tmp/rustc6CHczt/libcompiler_builtins-4ab94bdb9690f25a.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-shared" "-Wl,-rpath,$ORIGIN/../lib"
[00:57:52]   = note: /usr/local/lib/gcc/sparcv9-sun-solaris2.10/6.4.0/../../../../sparcv9-sun-solaris2.10/bin/ld: warning: -z ignore ignored.
[00:57:52]           /usr/local/lib/gcc/sparcv9-sun-solaris2.10/6.4.0/../../../../sparcv9-sun-solaris2.10/bin/ld:/tmp/rustc6CHczt/list: file format not recognized; treating as linker script
[00:57:52]           /usr/local/lib/gcc/sparcv9-sun-solaris2.10/6.4.0/../../../../sparcv9-sun-solaris2.10/bin/ld:/tmp/rustc6CHczt/list:1: syntax error
[00:57:52]           
[00:57:52] 
[00:57:52] error: aborting due to previous error
[00:57:52] 
---
travis_time:end:36261d68:start=1554785991343313982,finish=1554785991351070568,duration=7756586
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0dd804f8
$ 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:3371e2de
travis_time:start:3371e2de
$ 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:03e74954
$ 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)

@Centril Centril closed this Apr 9, 2019
@Centril Centril deleted the rollup-0c3lsz3 branch April 9, 2019 23:44
@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.

10 participants