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 15 pull requests #56521

Closed
wants to merge 46 commits into from
Closed

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

… r=QuietMisdreavus

Improve no result found sentence in doc search

Fixes rust-lang#55531.

Look:

<img width="1440" alt="screenshot 2018-11-01 at 02 21 56" src="https://user-images.githubusercontent.com/3050060/47827257-f6236c80-dd7c-11e8-9ea9-99c8cb4b2de5.png">

r? @QuietMisdreavus
Add Weak.ptr_eq

I hope the doc tests alone are good enough.

We also might want to discuss the dangling pointer case (from `Weak::new()`).

Updates rust-lang#55981.
…=TimNN

Utilize `?` instead of `return None`.

None
…, r=QuietMisdreavus

[rustdoc] Specific crate search

Reopening of rust-lang#54706.
Fixes rust-lang#54616.

<img width="1440" alt="screenshot 2018-11-29 at 01 29 11" src="https://user-images.githubusercontent.com/3050060/49191372-979adf80-f376-11e8-963e-e4feb927c1da.png">

r? @QuietMisdreavus
…ref, r=davidtwco

Refer to the second borrow as the "second borrow" in E0501.rs

Fixes rust-lang#55314.

r? @davidtwco
…nup, r=nikomatsakis

More MIR borrow check cleanup

* Fix some rustc doc links
* Remove the `region_map` field from `BorrowSet`
*  Use `visit_local` to find 2PB activations

r? @nikomatsakis
…tsakis

data_structures: remove tuple_slice

It looks like we're not using it anywhere.
…match, r=QuietMisdreavus

Fix invalid line number match

If a code line is longer than the width, it then gets to the next line making the line number not matching it anymore.

r? @QuietMisdreavus
…es, r=kennytm

cleanup: remove static lifetimes from consts in libstd
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=15

@bors
Copy link
Contributor

bors commented Dec 4, 2018

📌 Commit be0217c has been approved by GuillaumeGomez

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

bors commented Dec 4, 2018

⌛ Testing commit be0217c with merge 7917d0cce83105c63d68785c226285b125e8193a...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the stable release fixes.

@rust-highfive
Copy link
Collaborator

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.
Checking out files: 100% (17339/17339), done.
travis_time:end:2f0af741:start=1543966834223743000,finish=1543966844599975000,duration=10376232000
$ cd rust-lang/rust
$ git checkout -qf 7917d0cce83105c63d68785c226285b125e8193a
fatal: reference is not a tree: 7917d0cce83105c63d68785c226285b125e8193a
The command "git checkout -qf 7917d0cce83105c63d68785c226285b125e8193a" failed and exited with 128 during .
Your build has been stopped.

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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.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:1dd8995c:start=1543965120377856964,finish=1543965181862384257,duration=61484527293
$ 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-5.0
---
    100% |████████████████████████████████| 1.4MB 928kB/s 
Collecting botocore==1.12.59 (from awscli)
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
  Downloading https://files.pythonhosted.org/packages/21/cf/71dfc14692883aaf709bc1098a56770173a760a14b0b1cb74471609181be/botocore-1.12.59-py2.py3-none-any.whl (5.1MB)
    0% |                                | 10kB 39.4MB/s eta 0:00:01
    0% |▏                               | 20kB 37.7MB/s eta 0:00:01
    0% |▏                               | 30kB 45.0MB/s eta 0:00:01
    0% |▎                               | 40kB 27.2MB/s eta 0:00:01
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[00:54:50] 
[00:54:50] running 120 tests
[00:54:53] i..ii...iii..iiii.....i...i..........i..iii.............i.....i.....ii...i..i.ii...............i..ii 100/120
[00:54:54] ..ii.i.....iiii.....
[00:54:54] 
[00:54:54]  finished in 3.447
[00:54:54] travis_fold:end:test_codegen

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[00:55:08] 
[00:55:08] running 118 tests
[00:55:31] .iiiii...i.....i..i...i..i.i..i.i..i.....i..i....i..........iiii.........i.i....i...i.......ii.i.i.i 100/118
[00:55:35] ......iii.i.....ii
[00:55:35] 
[00:55:35]  finished in 27.279
[00:55:35] travis_fold:end:test_debuginfo

---
[01:04:44] error: no global memory allocator found but one is required; link to std or add #[global_allocator] to a static item that implements the GlobalAlloc trait.
[01:04:44] 
[01:04:45] 
[01:04:45] running 412 tests
[01:05:01] .............................................F...................................................... 100/412
[01:05:25] .................................................................................................... 300/412
[01:05:36] .................................................................................................... 400/412
[01:05:38] ............
[01:05:38] failures:
[01:05:38] failures:
[01:05:38] 
[01:05:38] ---- collections/btree/map.rs - collections::btree::map::BTreeMap (line 69) stdout ----
[01:05:38] error[E0425]: cannot find value `book_reviews` in this scope
[01:05:38]   --> collections/btree/map.rs:101:33
[01:05:38]    |
[01:05:38] 35 | println!("Review for Jane: {}", book_reviews["Pride and Prejudice"]);
[01:05:38]    |                                 ^^^^^^^^^^^^ did you mean `movie_reviews`?
[01:05:38] thread 'collections/btree/map.rs - collections::btree::map::BTreeMap (line 69)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:323:13
[01:05:38] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:05:38] 
[01:05:38] 
---
[01:05:38] 
[01:05:38] error: test failed, to rerun pass '--doc'
[01:05:38] 
[01:05:38] 
[01:05:38] 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" "alloc" "--" "--quiet"
[01:05:38] 
[01:05:38] 
[01:05:38] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:05:38] Build completed unsuccessfully in 0:21:24
[01:05:38] Build completed unsuccessfully in 0:21:24
[01:05:38] Makefile:58: recipe for target 'check' failed
[01:05:38] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:01c95530
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Dec  5 00:18:49 UTC 2018
---
travis_time:end:011a8676:start=1543969130999157061,finish=1543969131066172277,duration=67015216
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1b0d7f98
$ 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:2b06a98b
$ 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
Copy link
Contributor

bors commented Dec 5, 2018

⌛ Testing commit be0217c with merge 7bd36a596d8b86b8d485487bf0008cf5451b0dda...

@bors
Copy link
Contributor

bors commented Dec 5, 2018

💔 Test failed - status-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 Dec 5, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.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.
[01:06:08] 
[01:06:08] failures:
[01:06:08] 
[01:06:08] ---- collections/btree/map.rs - collections::btree::map::BTreeMap (line 69) stdout ----
[01:06:08] error[E0425]: cannot find value `book_reviews` in this scope
[01:06:08]   --> collections/btree/map.rs:101:33
[01:06:08]    |
[01:06:08] 35 | println!("Review for Jane: {}", book_reviews["Pride and Prejudice"]);
[01:06:08]    |                                 ^^^^^^^^^^^^ did you mean `movie_reviews`?
[01:06:08] thread 'collections/btree/map.rs - collections::btree::map::BTreeMap (line 69)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:323:13
[01:06:08] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:06:08] 
[01:06:08] 
---
[01:06:08] 
[01:06:08] error: test failed, to rerun pass '--doc'
[01:06:08] 
[01:06:08] 
[01:06:08] 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" "alloc" "--"
[01:06:08] 
[01:06:08] 
[01:06:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:06:08] Build completed unsuccessfully in 0:21:10
[01:06:08] Build completed unsuccessfully in 0:21:10
[01:06:08] Makefile:58: recipe for target 'check' failed
[01:06:08] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1a22981c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Dec  5 06:07:19 UTC 2018
---
travis_time:end:22905f98:start=1543990041946817262,finish=1543990041956087973,duration=9270711
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0de04eba
$ 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:0b490950
travis_time:start:0b490950
$ 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:0767ed06
$ 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)

@GuillaumeGomez GuillaumeGomez deleted the rollup branch December 5, 2018 10:08
@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.