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 16 pull requests #65297

Closed
wants to merge 56 commits into from
Closed

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Oct 11, 2019

Successful merges:

Failed merges:

r? @ghost

rick68 and others added 30 commits September 20, 2019 17:38
It was unclear what the implementation does when it encounters existing keys. This change makes it clear by documenting the trait impl.
This example failed to compile because of implicit `Sized` bound
for `A` parameter that wasn't required by `Trait`.
…locks and table lookups on each access of crate metadata.
…varkor

Function pointers as const generic arguments

Makes function pointers as const generic arguments usable.

Fixes rust-lang#62395

r? @varkor
Added doc about behavior of extend on HashMap

It was unclear what the implementation does when it encounters existing keys. This change makes it clear by documenting the trait impl.
…=nikomatsakis

Add some regression tests

- Add a test for rust-lang#62187.
- Clean up the directory structure in `src/test/ui/const-generics`
- Closes rust-lang#64792.
- Closes rust-lang#57399.
- Closes rust-lang#57271.
Add ?Sized bound to a supertrait listing in E0038 error documentation

This example failed to compile because of implicit `Sized` bound for `A` parameter that wasn't required by `Trait`.
…-E0568, r=estebank

Add long error explanation for E0568

Part of rust-lang#61137.
…k-Simulacrum

self-profiling: Add events for metadata loading (plus a small dep-tracking optimization)

This PR
- adds self-profiling events related to loading things from crate metadata
- makes the compiler cache the `DepNodeIndex` of upstream crates, so that they don't have to be looked up over and over.

The commits are best reviewed in isolation.

Self-profiling tracking issue: rust-lang#58967

r? @Mark-Simulacrum
cc @wesleywiser
…hewjasper

expand: Simplify expansion of derives

And make it more uniform with other macros.
This is done by merging placeholders for future derives' outputs into the derive container's output fragment early (addressing FIXMEs from rust-lang#63667).

Also, macros with names starting with `_` are no longer reported as unused, in accordance with the usual behavior of `unused` lints.

r? @matthewjasper or @mark-i-m
…tril

Deduplicate is_{freeze,copy,sized}_raw

Addresses rust-lang#65259

Deduplicates `is_{freeze,copy,sized}_raw` by delegating to a new method which takes in a `LangItem`.
…-err-codes, r=Mark-Simulacrum

Cleanup librustc mir err codes

Three things are done in this PR:

 * Sort error codes
 * Uncomment an error code long error explanation (they should **never** be commented)
 * Unify explanations
Mark Path::join as must_use

I've accidentally did `mut_path_buf.jon(a_path);`, expecting this to be an in-place modification. Seems like we can easily warn in such cases?
…mulacrum

Don't cc rust-lang/compiler for toolstate changes

Fixes rust-lang#65238.
stability: Do not use `buffer_lint` after lowering to HIR

Fixes rust-lang#65253
@tmandry
Copy link
Member Author

tmandry commented Oct 11, 2019

@bors r+ p=16 rollup=never

@bors
Copy link
Contributor

bors commented Oct 11, 2019

📌 Commit 9f143a7 has been approved by tmandry

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

bors commented Oct 11, 2019

⌛ Testing commit 9f143a7 with merge 21ea2a5bc502b884cd7db96b7f7cef42879ce741...

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux 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.
2019-10-11T05:22:30.0544734Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-11T05:22:30.1571987Z error: Could not document `syntax`.
2019-10-11T05:22:30.1573044Z 
2019-10-11T05:22:30.1573497Z Caused by:
2019-10-11T05:22:30.1578043Z   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name syntax src/libsyntax/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/doc --color always -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps --extern bitflags=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libbitflags-8c129151da7679a3.rmeta --extern lazy_static=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblazy_static-19bb54174cc172de.rmeta --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-e02597a67963bf62.rmeta --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-2acfbd3010664d93.rmeta --extern errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-16584ffb0cc8c85b.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-2fe15f7b14a92e0a.rmeta --extern rustc_lexer=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_lexer-07698344d0e4d053.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-5f652e9d50229f1f.rmeta --extern scoped_tls=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libscoped_tls-e6b3662bad8dcee6.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-c14840a48c3730ee.rmeta --extern smallvec=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsmallvec-12bcd2a8dd59a33c.rmeta --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-f1779b106d702e4c.rmeta --document-private-items --passes strip-hidden` (exit code: 1)
2019-10-11T05:22:36.6681792Z [RUSTC-TIMING] syntax test:false 11.920
2019-10-11T05:22:36.6826069Z error: build failed
2019-10-11T05:22:36.6849366Z 
2019-10-11T05:22:36.6849850Z 
2019-10-11T05:22:36.6849850Z 
2019-10-11T05:22:36.6859358Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" "jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "rustc_codegen_llvm" "-p" "rustc_plugin" "-p" "rustc_privacy" "-p" "rustc_lexer" "-p" "rustc_mir" "-p" "syntax" "-p" "rustc_typeck" "-p" "rustc_fs_util" "-p" "rustc_traits" "-p" "rustc_codegen_utils" "-p" "rustc_plugin_impl" "-p" "rustc_driver" "-p" "rustc_save_analysis" "-p" "rustc_index" "-p" "rustc_interface" "-p" "fmt_macros" "-p" "rustc_lint" "-p" "rustc_macros" "-p" "rustc_resolve" "-p" "rustc_codegen_ssa" "-p" "arena" "-p" "syntax_ext" "-p" "rustc_llvm" "-p" "rustc" "-p" "rustc_apfloat" "-p" "rustc_target" "-p" "graphviz" "-p" "rustc_metadata" "-p" "rustc_passes" "-p" "syntax_pos" "-p" "rustc_errors" "-p" "rustc_incremental" "-p" "build_helper" "-p" "serialize" "-p" "rustc_data_structures"
2019-10-11T05:22:36.6859960Z 
2019-10-11T05:22:36.6860022Z 
2019-10-11T05:22:36.6870125Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2019-10-11T05:22:36.6870333Z Build completed unsuccessfully in 1:35:42
2019-10-11T05:22:36.6870333Z Build completed unsuccessfully in 1:35:42
2019-10-11T05:22:36.6934802Z == clock drift check ==
2019-10-11T05:22:36.6955429Z   local time: Fri Oct 11 05:22:36 UTC 2019
2019-10-11T05:22:37.2649705Z   network time: Fri, 11 Oct 2019 05:22:37 GMT
2019-10-11T05:22:37.2650855Z == end clock drift check ==
2019-10-11T05:22:38.7679494Z ##[error]Bash exited with code '1'.
2019-10-11T05:22:38.7724938Z ##[section]Starting: Upload CPU usage statistics
2019-10-11T05:22:38.7742345Z ==============================================================================
2019-10-11T05:22:38.7742463Z Task         : Bash
2019-10-11T05:22:38.7742567Z Description  : Run a Bash script on macOS, Linux, or Windows

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 Oct 11, 2019

💔 Test failed - checks-azure

@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 Oct 11, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 11, 2019
Rollup of 16 pull requests

Successful merges:

 - rust-lang#64337 (libstd: Fix typos in doc)
 - rust-lang#64986 (Function pointers as const generic arguments)
 - rust-lang#65048 (Added doc about behavior of extend on HashMap)
 - rust-lang#65191 (Add some regression tests)
 - rust-lang#65200 (Add ?Sized bound to a supertrait listing in E0038 error documentation)
 - rust-lang#65205 (Add long error explanation for E0568)
 - rust-lang#65240 (self-profiling: Add events for metadata loading (plus a small dep-tracking optimization))
 - rust-lang#65248 (Suggest `if let` on `let` refutable binding)
 - rust-lang#65252 (expand: Simplify expansion of derives)
 - rust-lang#65263 (Deduplicate is_{freeze,copy,sized}_raw)
 - rust-lang#65265 (Cleanup librustc mir err codes)
 - rust-lang#65266 (Mark Path::join as must_use)
 - rust-lang#65276 (Don't cc rust-lang/compiler for toolstate changes)
 - rust-lang#65277 (Query generator kind for error reporting)
 - rust-lang#65283 (stability: Do not use `buffer_lint` after lowering to HIR)
 - rust-lang#65289 (Fix suggested bound addition diagnostic)

Failed merges:

r? @ghost
@bors bors added the rollup A PR which is a rollup label Oct 11, 2019
@Centril Centril closed this Oct 11, 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.