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 7 pull requests #58799

Closed
wants to merge 23 commits into from
Closed

Rollup of 7 pull requests #58799

wants to merge 23 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Feb 28, 2019

Successful merges:

Failed merges:

r? @ghost

timvermeulen and others added 23 commits February 25, 2019 16:44
Since there is nothing to optimise there...
The examples are still lacking for now, both for module docs
and for methods/impl's.
They're not as good as `From` 'cause they don't stringify
the types and generate examples and so on, but it's a start.
Unfortunately trying to run doctests on my local machine is
not really faster than letting Travis do it...
Expand docs for `TryFrom` and `TryInto`.

The examples are still lacking for now, both for module docs and for methods/impl's.  Will be adding those in further pushes.

Should hopefully resolve the doc concern in rust-lang#33417 when finished?
…oerister

Use informational target machine for metadata

Since there is nothing to optimise there...

Should fix rust-lang#58323 but haven’t tested locally.

r? @michaelwoerister
rust-lldb: fix crash when printing empty string

Fixes rust-lang#52185.

~Re-enables the pretty-std debuginfo test and tweaks the test as necessary to get it to pass again. This reveals that lldb's formatting of enums is broken (rust-lang#58492). I also removed the emoji from the test because I couldn't get the docker image's gdb to print the emoji, just octal escapes (https://github.com/rust-lang/rust/pull/53154/files#r208263904).~
Put Local, Static and Promoted as one Base variant of Place

Related to rust-lang#52708

The `Place` 2.0 representation use a `Base` variant for `Local`, `Static` and `Promoted` so we start making this change in the current `Place` to make the following steps simpler.

r? @oli-obk
…scottmcm

Have all methods of Filter and FilterMap use internal iteration

This PR changes `Filter::{next, next_back, count}` and `FilterMap::{next, next_back}` to all use internal iteration. The `next` and `next_back` methods are changed to directly forward to `try_for_each` and `try_rfold` respectively, using `Result` as the `Try` type. I think that's okay? Alternatively, I could change their implementations to use `LoopState` instead if there's any benefit in doing so.

r? @scottmcm
Replace `s` with `self` in docs for str methods taking self.

Cherry picked from PR rust-lang#58596 which is blocked on some intra-doc link bugs.
allow specifying attributes for tool lints

Needed for clippy to fix `unused_doc_comments` warnings that will be exposed by rust-lang#57882 (and thus unblock it).
@Centril
Copy link
Contributor Author

Centril commented Feb 28, 2019

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Feb 28, 2019

📌 Commit dadf786 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 Feb 28, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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.
travis_time:end:1fec1371:start=1551327734658199878,finish=1551327830255679164,duration=95597479286
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:17:36] 
[01:17:36] running 120 tests
[01:18:05] .iiiii...i.....i..i...i..i.i...i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i 100/120
[01:18:10] .i......iii.i.....ii
[01:18:10] 
[01:18:10]  finished in 33.834
[01:18:10] travis_fold:end:test_debuginfo

---
[01:29:12] 
[01:29:12]    Doc-tests core
[01:29:18] 
[01:29:18] running 2277 tests
[01:29:31] ....iiiii........................................................................................... 100/2277
[01:29:45] .....................................................................ii.....F....................... 200/2277
[01:30:18] .................................................................................................... 400/2277
[01:30:33] .....................i..i........................................................................... 500/2277
[01:30:47] .................................................................................................... 600/2277
[01:31:01] .................................................................................................... 700/2277
---
[01:35:04] 
[01:35:04] error: test failed, to rerun pass '--doc'
[01:35:04] 
[01:35:04] 
[01:35:04] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "core" "--" "--quiet"
[01:35:04] 
[01:35:04] 
[01:35:04] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:35:04] Build completed unsuccessfully in 0:30:17
[01:35:04] Build completed unsuccessfully in 0:30:17
[01:35:04] Makefile:48: recipe for target 'check' failed
[01:35:04] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2a4c4981
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb 28 05:59:04 UTC 2019
---
travis_time:end:03406980:start=1551333546545784497,finish=1551333546551723911,duration=5939414
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0cad00a3
$ 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:03194e53
travis_time:start:03194e53
$ 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:0af78c93
$ 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 Feb 28, 2019
@Centril Centril deleted the rollup branch February 28, 2019 06:03
@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants