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 11 pull requests #69979

Closed
wants to merge 40 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 13, 2020

Successful merges:

Failed merges:

r? @ghost

LeSeulArtichaut and others added 30 commits February 23, 2020 18:32
Centril added 10 commits March 13, 2020 18:23
…r=RalfJung

Move some `build-pass` tests to `check-pass`

Helps with rust-lang#62277.

r? @cramertj cc @Centril
…acrum

Added doc on keyword Pub.

Hi, this is my first pull request. I hope it's OK. Please let me know if it would benefit from any changes. Thank you.
fix more clippy findings

* reduce references on match patterns (clippy::match_ref_pats)
* Use writeln!(fmt, "word") instead of write!(fmt, "word\n") (clippy::write_with_newline)
* libtest: remove redundant argument to writeln!() (clippy::writeln_empty_string)
* remove unneeded mutable references (cippy::unnecessary_mut_passed)
* libtest: declare variables as floats instead of casting them (clippy::unnecessary_cast)
* rustdoc: remove redundant static lifetimes (clippy::redundant_static_lifetimes)
* call .as_deref() instead of .as_ref().map(Deref::deref) (clippy::option_as_ref_deref)
* iterate over a maps values directly. (clippy::for_kv_map)
* rustdoc: simplify boolean condition (clippy::nonminimal_bool)
* Use ?-operator in more places (clippy::question_mark, had some false negatives fixed recently)
* rustdoc: Use .any(p) instead of find(p).is_some(). (clippy::search_is_some)
* rustdoc: don't call into_iter() on iterator. (clippy::identity_conversion)
remove lifetimes that can be elided (clippy::needless_lifetimes)
…ark-Simulacrum

triagebot.toml: add ping aliases

I think I got the syntax right.
Closes rust-lang/triagebot#402.

r? @Mark-Simulacrum
cc @pnkfelix
@Centril
Copy link
Contributor Author

Centril commented Mar 13, 2020

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Mar 13, 2020

📌 Commit e0af3a4 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 Mar 13, 2020
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-03-13T17:27:16.8772561Z ========================== Starting Command Output ===========================
2020-03-13T17:27:16.8774979Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/7c99d14e-67c1-4130-8b1c-329f73ab6b08.sh
2020-03-13T17:27:16.8775242Z 
2020-03-13T17:27:16.8779225Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-13T17:27:16.8798825Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69979/merge to s
2020-03-13T17:27:16.8802033Z Task         : Get sources
2020-03-13T17:27:16.8802355Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-13T17:27:16.8802653Z Version      : 1.0.0
2020-03-13T17:27:16.8802855Z Author       : Microsoft
---
2020-03-13T17:27:17.8716753Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-13T17:27:17.8721616Z ##[command]git config gc.auto 0
2020-03-13T17:27:17.8724941Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-13T17:27:17.8727956Z ##[command]git config --get-all http.proxy
2020-03-13T17:27:17.8733720Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/69979/merge:refs/remotes/pull/69979/merge
---
2020-03-13T18:25:55.7177932Z .................................................................................................... 1700/9771
2020-03-13T18:25:59.8795793Z .................................................................................................... 1800/9771
2020-03-13T18:26:11.0533131Z ...................................................................i................................ 1900/9771
2020-03-13T18:26:17.5140788Z .................................................................................................... 2000/9771
2020-03-13T18:26:31.5299270Z .........................................................iiiii...................................... 2100/9771
2020-03-13T18:26:41.4193845Z .................................................................................................... 2300/9771
2020-03-13T18:26:43.4874937Z .................................................................................................... 2400/9771
2020-03-13T18:26:46.4003748Z .................................................................................................... 2500/9771
2020-03-13T18:27:07.1826887Z .................................................................................................... 2600/9771
---
2020-03-13T18:29:37.3720826Z ............................i...............i....................................................... 5000/9771
2020-03-13T18:29:46.8159513Z .................................................................................................... 5100/9771
2020-03-13T18:29:52.1271125Z .......................................................................i............................ 5200/9771
2020-03-13T18:29:57.5137572Z .................................................................................................... 5300/9771
2020-03-13T18:30:06.7716095Z ....................................................ii.ii........i...i.............................. 5400/9771
2020-03-13T18:30:14.5186059Z .................................................................................................... 5600/9771
2020-03-13T18:30:23.7424226Z .........................F.......................................................................... 5700/9771
2020-03-13T18:30:29.7649535Z ............................................i....................................................... 5800/9771
2020-03-13T18:30:36.0326491Z .................................................................................................... 5900/9771
2020-03-13T18:30:36.0326491Z .................................................................................................... 5900/9771
2020-03-13T18:30:45.6286350Z .................................................................................................... 6000/9771
2020-03-13T18:30:51.6424329Z ......................................ii...i..ii...........i........................................ 6100/9771
2020-03-13T18:31:10.8589089Z .................................................................................................... 6300/9771
2020-03-13T18:31:14.2605863Z .................................................................................................... 6400/9771
2020-03-13T18:31:14.2605863Z .................................................................................................... 6400/9771
2020-03-13T18:31:19.1188048Z .....................................................................i..ii.......................... 6500/9771
2020-03-13T18:31:40.6268866Z .................................................................................................... 6700/9771
2020-03-13T18:31:48.7244044Z ...................................................................i................................ 6800/9771
2020-03-13T18:31:50.6461443Z .................................................................................................... 6900/9771
2020-03-13T18:31:52.7412150Z .................................................................................................... 7000/9771
---
2020-03-13T18:33:30.4297233Z .................................................................................................... 7800/9771
2020-03-13T18:33:36.0247739Z .................................................................................................... 7900/9771
2020-03-13T18:33:41.6316181Z ...................................................i................................................ 8000/9771
2020-03-13T18:33:51.5371197Z .................................................................................................... 8100/9771
2020-03-13T18:33:56.5795335Z iiiiiiiiii.i........................................................................................ 8200/9771
2020-03-13T18:34:09.5814544Z .................................................................................................... 8400/9771
2020-03-13T18:34:19.5616315Z .................................................................................................... 8500/9771
2020-03-13T18:34:31.4591137Z .................................................................................................... 8600/9771
2020-03-13T18:34:36.8782329Z .................................................................................................... 8700/9771
---
2020-03-13T18:36:20.9597933Z 8 
2020-03-13T18:36:20.9598138Z 
2020-03-13T18:36:20.9598391Z 
2020-03-13T18:36:20.9598704Z The actual stderr differed from the expected stderr.
2020-03-13T18:36:20.9599563Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/lint/use_suggestion_json/use_suggestion_json.stderr
2020-03-13T18:36:20.9600332Z To update references, rerun the tests and pass the `--bless` flag
2020-03-13T18:36:20.9601062Z To only update this specific test, also pass `--test-args lint/use_suggestion_json.rs`
2020-03-13T18:36:20.9601724Z error: 1 errors occurred comparing output.
2020-03-13T18:36:20.9602149Z failed to decode compiler output as json: line: {
2020-03-13T18:36:20.9602499Z output: {
2020-03-13T18:36:20.9602841Z   "message": "cannot find type `Iter` in this scope",
2020-03-13T18:36:20.9602841Z   "message": "cannot find type `Iter` in this scope",
2020-03-13T18:36:20.9603215Z   "code": {
2020-03-13T18:36:20.9603504Z     "code": "E0412",
2020-03-13T18:36:20.9611952Z     "explanation": "A used type name is not in scope.\n\nErroneous code examples:\n\n```compile_fail,E0412\nimpl Something {} // error: type name `Something` is not in scope\n\n// or:\n\ntrait Foo {\n    fn bar(N); // error: type name `N` is not in scope\n}\n\n// or:\n\nfn foo(x: T) {} // type name `T` is not in scope\n```\n\nTo fix this error, please verify you didn't misspell the type name, you did\ndeclare it or imported it into the scope. Examples:\n\n```\nstruct Something;\n\nimpl Something {} // ok!\n\n// or:\n\ntrait Foo {\n    type N;\n\n    fn bar(_: Self::N); // ok!\n}\n\n// or:\n\nfn foo<T>(x: T) {} // ok!\n```\n\nAnother case that causes this error is when a type is imported into a parent\nmodule. To fix this, you can follow the suggestion and use File directly or\n`use super::File;` which will import the types from the parent namespace. An\nexample that causes this error is below:\n\n```compile_fail,E0412\nuse std::fs::File;\n\nmod foo {\n    fn some_function(f: File) {}\n}\n```\n\n```\nuse std::fs::File;\n\nmod foo {\n    // either\n    use super::File;\n    // or\n    // use std::fs::File;\n    fn foo(f: File) {}\n}\n# fn main() {} // don't insert it for us; that'll break imports\n```\n"
2020-03-13T18:36:20.9626098Z   },
2020-03-13T18:36:20.9626340Z   "level": "error",
2020-03-13T18:36:20.9626562Z   "spans": [
2020-03-13T18:36:20.9627125Z       "file_name": "/checkout/src/test/ui/lint/use_suggestion_json.rs",
2020-03-13T18:36:20.9627535Z       "byte_start": 471,
2020-03-13T18:36:20.9627921Z       "byte_end": 475,
2020-03-13T18:36:20.9628262Z       "line_start": 12,
2020-03-13T18:36:20.9628262Z       "line_start": 12,
2020-03-13T18:36:20.9628573Z       "line_end": 12,
2020-03-13T18:36:20.9628851Z       "column_start": 12,
2020-03-13T18:36:20.9629177Z       "column_end": 16,
2020-03-13T18:36:20.9629489Z       "is_primary": true,
2020-03-13T18:36:20.9629785Z       "text": [
2020-03-13T18:36:20.9630350Z         {
2020-03-13T18:36:20.9630664Z           "text": "    let x: Iter;",
2020-03-13T18:36:20.9631035Z           "highlight_start": 12,
2020-03-13T18:36:20.9631394Z           "highlight_end": 16
2020-03-13T18:36:20.9631871Z       ],
2020-03-13T18:36:20.9632081Z       "label": "not found in this scope",
2020-03-13T18:36:20.9632351Z       "suggested_replacement": null,
2020-03-13T18:36:20.9632740Z       "suggestion_applicability": null,
2020-03-13T18:36:20.9632740Z       "suggestion_applicability": null,
2020-03-13T18:36:20.9633082Z       "expansion": null
2020-03-13T18:36:20.9633352Z     }
2020-03-13T18:36:20.9633521Z   ],
2020-03-13T18:36:20.9633772Z   "children": [
2020-03-13T18:36:20.9633953Z     {
2020-03-13T18:36:20.9634392Z       "message": "possible candidates are found in other modules, you can import them into scope",
2020-03-13T18:36:20.9634821Z       "code": null,
2020-03-13T18:36:20.9635148Z       "level": "help",
2020-03-13T18:36:20.9635442Z       "spans": [
2020-03-13T18:36:20.9636022Z           "file_name": "/checkout/src/test/ui/lint/use_suggestion_json.rs",
2020-03-13T18:36:20.9636433Z           "byte_start": 448,
2020-03-13T18:36:20.9636757Z           "byte_end": 448,
2020-03-13T18:36:20.9637025Z           "line_start": 11,
---
2020-03-13T18:36:21.6015617Z       ],
2020-03-13T18:36:21.6015793Z       "children": [],
2020-03-13T18:36:21.6016014Z       "rendered": null
2020-03-13T18:36:21.6016183Z     }
2020-03-13T18:36:21.6016311Z   ],
2020-03-13T18:36:21.6080212Z   "rendered": "\u001b[0m\u001b[1m\u001b[38;5;9merror[E0412]\u001b[0m\u001b[0m\u001b[1m: cannot find type `Iter` in this scope\u001b[0m\n\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0m/checkout/src/test/ui/lint/use_suggestion_json.rs:12:12\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    let x: Iter;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m           \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9m^^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9mnot found in this scope\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;14mhelp\u001b[0m\u001b[0m: possible candidates are found in other modules, you can import them into scope\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0muse std::collections::binary_heap::Iter;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0muse std::collections::btree_map::Iter;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0muse std::collections::btree_set::Iter;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0muse std::collections::hash_map::Iter;\u001b[0m\n\u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m\n\u001b[0m     and 8 other candidates\u001b[0m\n\n"
2020-03-13T18:36:21.6084776Z {
2020-03-13T18:36:21.6084983Z   "message": "aborting due to previous error",
2020-03-13T18:36:21.6085234Z   "code": null,
2020-03-13T18:36:21.6085234Z   "code": null,
2020-03-13T18:36:21.6085537Z   "level": "error",
2020-03-13T18:36:21.6085713Z   "spans": [],
2020-03-13T18:36:21.6085897Z   "children": [],
2020-03-13T18:36:21.6086273Z   "rendered": "\u001b[0m\u001b[1m\u001b[38;5;9merror\u001b[0m\u001b[0m\u001b[1m: aborting due to previous error\u001b[0m\n\n"
2020-03-13T18:36:21.6086737Z {
2020-03-13T18:36:21.6087405Z   "message": "For more information about this error, try `rustc --explain E0412`.",
2020-03-13T18:36:21.6087683Z   "code": null,
2020-03-13T18:36:21.6088068Z   "level": "failure-note",
2020-03-13T18:36:21.6088068Z   "level": "failure-note",
2020-03-13T18:36:21.6088255Z   "spans": [],
2020-03-13T18:36:21.6088423Z   "children": [],
2020-03-13T18:36:21.6088989Z   "rendered": "\u001b[0m\u001b[1mFor more information about this error, try `rustc --explain E0412`.\u001b[0m\n"
2020-03-13T18:36:21.6089795Z thread '[ui] ui/lint/use_suggestion_json.rs' panicked at 'explicit panic', src/tools/compiletest/src/json.rs:87:21
2020-03-13T18:36:21.6090424Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-13T18:36:21.6090661Z 
2020-03-13T18:36:21.6090763Z 
2020-03-13T18:36:21.6090763Z 
2020-03-13T18:36:21.6090892Z failures:
2020-03-13T18:36:21.6091214Z     [ui] ui/lint/use_suggestion_json.rs
2020-03-13T18:36:21.6091367Z 
2020-03-13T18:36:21.6091830Z test result: FAILED. 9713 passed; 1 failed; 57 ignored; 0 measured; 0 filtered out
2020-03-13T18:36:21.6092074Z 
2020-03-13T18:36:21.6092163Z 
2020-03-13T18:36:21.6092269Z 
2020-03-13T18:36:21.6095650Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-03-13T18:36:21.6104076Z 
2020-03-13T18:36:21.6104172Z 
2020-03-13T18:36:21.6106852Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-03-13T18:36:21.6107259Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-03-13T18:36:21.6107259Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-03-13T18:36:21.6107584Z Build completed unsuccessfully in 1:00:59
2020-03-13T18:36:21.6107814Z == clock drift check ==
2020-03-13T18:36:21.6108057Z   local time: Fri Mar 13 18:36:20 UTC 2020
2020-03-13T18:36:21.6108338Z   network time: Fri, 13 Mar 2020 18:36:21 GMT
2020-03-13T18:36:21.6108580Z == end clock drift check ==
2020-03-13T18:36:21.8443303Z 
2020-03-13T18:36:21.8520089Z ##[error]Bash exited with code '1'.
2020-03-13T18:36:21.8534143Z ##[section]Finishing: Run build
2020-03-13T18:36:21.8582023Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/69979/merge to s
2020-03-13T18:36:21.8587148Z Task         : Get sources
2020-03-13T18:36:21.8587487Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-13T18:36:21.8587822Z Version      : 1.0.0
2020-03-13T18:36:21.8588045Z Author       : Microsoft
2020-03-13T18:36:21.8588045Z Author       : Microsoft
2020-03-13T18:36:21.8588398Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-13T18:36:21.8588826Z ==============================================================================
2020-03-13T18:36:22.1792059Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-13T18:36:22.1843179Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/69979/merge to s
2020-03-13T18:36:22.1929834Z Cleaning up task key
2020-03-13T18:36:22.1931108Z Start cleaning up orphan processes.
2020-03-13T18:36:22.2312307Z Terminate orphan process: pid (3717) (python)
2020-03-13T18:36:22.2366717Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

@Centril Centril closed this Mar 13, 2020
@Centril Centril deleted the rollup-3vwhh36 branch March 13, 2020 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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