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 10 pull requests #59868

Closed
wants to merge 23 commits into from
Closed

Conversation

sanxiyn
Copy link
Member

@sanxiyn sanxiyn commented Apr 11, 2019

Successful merges:

Failed merges:

r? @ghost

Christian and others added 23 commits April 3, 2019 22:20
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.
This adds some extra docs for the `no-prefer-dynamic` header.

And also a `s/must_compile_successfully/compile_pass`.

`must_compile_successfully` has been renamed to `compile_pass` at some
point in the past and this comment was still referring to the old name.
- Make links relative.
- Adjust links from old 2018-edition book.
- Fix broken link in `let` docs.
…ble compiler flags, instead of flags for debugging.
…mertj

Document the -Z flag to the rustc book

# Description

Changes:
- Added new documentation on the `-Z` flag of rustc in the command-line arguments section of the rustc book.

If I need to rephrase anything or if you have any improvements, please let me know! I deliberately did not create an exhaustive list of all options since they are likely to change over time and per toolchain version.

closes rust-lang#41142
remove lookup_char_pos_adj

It is now exactly equivalent to lookup_char_pos.
…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
compiletest: Improve no_prefer_dynamic docs

This adds some extra docs for the `no-prefer-dynamic` header.

And also a `s/must_compile_successfully/compile_pass`.

`must_compile_successfully` has been renamed to `compile_pass` at some
point in the past and this comment was still referring to the old name.
Kill dead code dominator code.

Hi,

Whilst fiddling around in the dominator code, I found some (I think) unused code. This code *was* used at the time it was imported, but over time it seems to have become redundant.

I've tested a build up to stage 1 with no problems. Maybe the tests will turn up something though.

P.S.

There is a FIXME comment in `dominators/mod.rs`:
```
    pub fn is_dominated_by(&self, node: Node, dom: Node) -> bool {
        // FIXME -- could be optimized by using post-order-rank
        self.dominators(node).any(|n| n == dom)
    }
```

I'm not sure of the intention of this comment. The `Dominators` struct already operates over post-order rank nodes. Any ideas?
…sdreavus

Fix broken links on std::boxed doc page

r? @QuietMisdreavus
Fix links on keyword docs.

- Make links relative.
- Adjust links from old 2018-edition book.
- Fix broken link in `let` docs.
Remove strange formatting in `Ordering` docs.

I can't really fathom what the intent of the brackets is. The [original PR](rust-lang#12956) doesn't give any hints. I think it seems fine without them.
std::ops::Div examples: correct nominator to numerator
@sanxiyn
Copy link
Member Author

sanxiyn commented Apr 11, 2019

@bors p=10

@sanxiyn
Copy link
Member Author

sanxiyn commented Apr 11, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 11, 2019

📌 Commit 83787bb has been approved by sanxiyn

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

bors commented Apr 11, 2019

⌛ Testing commit 83787bb with merge f8133b3abcf8f1b52e6cd4768997be2d96bb24d1...

@bors
Copy link
Contributor

bors commented Apr 11, 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 11, 2019
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple 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.
voltdb
wry
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1554955797~hmac=4bd112398c92f6f67d592a7ed8c8860931ccaa13e184bd6af6c2fa9ea7c762c8&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1982Ru-foK9fCEO86Y8wuIqvw6pvW4JkgYmOzM0CeCgTnOPbLxZWOQgKrRH7TXmzTWijHoZtpd19_p43bX4JEydFBc4ffpkTcwPqTcnq6YaP47J6rGNq9Ny1Im3NYnjiUmM6Al5gZJaTw&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig: pcre
==> Installing swig dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1554955810~hmac=60afc945d61006458556f2521732e2ef6c3fc0c8f4cdf845b517b5d1daf497d3&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-e2M19gT-3V1xJSq2Eu2kjvHonRTmwjgIWhClbNwdwbtu1tSAE7OBGlt1tkHFk4jfm_vXcdqDxkfV4NEFxbJLZYa22_cQbwxc3T4Z6Eheda-3YKb7uk1eUn1b1xUdsUOz7xUwk1UxDmA&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig
==> Downloading https://homebrew.bintray.com/bottles/swig-3.0.12.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig-3.0.12.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/c0/c0e2656fd10d57281280d20ce8bf9a060cf8714f4283dd1dfde383b3688d9ed1?__gda__=exp=1554955812~hmac=d8b415e9d2a94a20025b36077efcd023a812df4db232305ac214772ec2835450&response-content-disposition=attachment%3Bfilename%3D%22swig-3.0.12.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1_mOWvTkwlVhMtj1AWAFfvbUMFL3K3jTO2ezYiE8fPIUfeEYeSZ9xftCNBoJhJbU1hAMsQ2fQmYINWWbRcU9iL_ElqKIHjQD32nKsxztUhhDKQTa2XVMdhwusm6NrniqwtrztNFii7Gqg&response-X-Checksum-Sha1=db6e6ed21965214d5f9fba1b180517bb2587ef59&response-X-Checksum-Sha2=c0e2656fd10d57281280d20ce8bf9a060cf8714f4283dd1dfde383b3688d9ed1
🍺  /usr/local/Cellar/swig/3.0.12: 755 files, 5.5MB
travis_time:end:01869080:start=1554954745569511000,finish=1554955129605510000,duration=384035999000
travis_fold:end:install
travis_fold:start:before_script.1
---
[00:03:01]       Memory: 8 GB
[00:03:01]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:03:01]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:01]       SMC Version (system): 2.8f0
[00:03:01]       Serial Number (system): VMCeB2aHgMdk
[00:03:01] 
[00:03:01] hw.ncpu: 4
[00:03:01] hw.byteorder: 1234
[00:03:01] hw.memsize: 8589934592
---
[01:55:53] 
[01:55:53] error: Could not document `core`.
[01:55:53] 
[01:55:53] Caused by:
[01:55:53]   process didn't exit successfully: `/Users/travis/build/rust-lang/rust/build/bootstrap/debug/rustdoc --crate-name core src/libcore/lib.rs --color always --target armv7-apple-ios -o /Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-std/armv7-apple-ios/doc --markdown-css rust.css --markdown-no-toc --generate-redirect-pages --resource-suffix 1.35.0 --index-page /Users/travis/build/rust-lang/rust/src/doc/index.md -L dependency=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-std/armv7-apple-ios/release/deps -L dependency=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-std/release/deps` (exit code: 1)
[01:55:53] 
[01:55:53] 
[01:55:53] command did not execute successfully: "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage0/bin/cargo" "rustdoc" "--target" "armv7-apple-ios" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler" "--manifest-path" "/Users/travis/build/rust-lang/rust/src/libstd/Cargo.toml" "-Z" "unstable-options" "-p" "core" "--" "--markdown-css" "rust.css" "--markdown-no-toc" "--generate-redirect-pages" "--resource-suffix" "1.35.0" "--index-page" "/Users/travis/build/rust-lang/rust/src/doc/index.md"
[01:55:53] 
[01:55:53] 
[01:55:53] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap doc
[01:55:53] Build completed unsuccessfully in 0:14:51
---
travis_fold:start:after_failure.2
travis_time:start:0247fe39
$ 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:056e1b80
$ 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:056e1b80:start=1554962090320855000,finish=1554962090351100000,duration=30245000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:09e4e5dc
$ 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:07bb746e
travis_time:start:07bb746e
$ 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:00f5bde5
$ 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)

@Centril Centril closed this Apr 11, 2019
@sanxiyn sanxiyn deleted the rollup-u332bby branch April 11, 2019 15:49
@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.