Skip to content

Rollup of 9 pull requests #86500

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 26 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 26 commits May 24, 2021 18:18
Co-authored-by: Jane Lusby <jlusby42@gmail.com>
The `RustdocGUI::should_run` condition spawns `npm list` several times
which adds up to seconds of wall-time.
Evaluate the condition lazily to to keep `./x.py test tidy` and similar
short-running tasks fast.
This was unsound since a panic in a.next_back() would result in the
length not being updated which would then lead to the same element
being revisited in the side-effect preserving code.
Account for bad placeholder errors on consts/statics with trait objects

Fixes rust-lang#75889
r? `@estebank`
document PartialEq, PartialOrd, Ord requirements more explicitly

This is the result of discussion in rust-lang#50230, in particular [this summary comment](rust-lang#50230 (comment)).

Fixes rust-lang#50230.
…Simulacrum

Lazify is_really_default condition in the RustdocGUI bootstrap step

The `RustdocGUI::should_run` condition spawns `npm list` several times which adds up to seconds of wall-time.
Evaluate the condition lazily to to keep `./x.py test tidy` and similar short-running tasks fast.

Fixes rust-lang#86147
…ulacrum

Fix a bug in the linkchecker

There was a small typo in the linkchecker (in rust-lang#85652) that caused it to report a `#` fragment link error pointing to the wrong file (it was displaying the path to the source file, not the target of the link).

This also includes a few other changes:
- Fixes the tests due to some changes in the redirect handling in rust-lang#84703.
- Adds the tests to rustbuild to run whenever the linkchecker itself is run.
- Updates the tests to validate more of the output (so that a mistake like this would have been caught).

Closes rust-lang#86144
fix panic-safety in specialized Zip::next_back

This was unsound since a panic in a.next_back() would result in the
length not being updated which would then lead to the same element
being revisited in the side-effect preserving code.

fixes rust-lang#86443
…r=petrochenkov

Do not set depth to 0 in fully_expand_fragment

Fixes rust-lang#84632.
expand: Move some more derive logic to rustc_builtin_macros

And cleanup some `unwrap`s in `cfg_eval`.

Refactorings extracted from rust-lang#83354 and rust-lang#86057.
r? `@Aaron1011`
@rustbot rustbot added the rollup A PR which is a rollup label Jun 21, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=9 rollup=never

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

📌 Commit d449ce1 has been approved by JohnTitor

@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 Jun 21, 2021
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking rustc_plugin_impl v0.0.0 (/checkout/compiler/rustc_plugin_impl)
error[E0061]: this function takes 7 arguments but 6 arguments were supplied
   --> compiler/rustc_typeck/src/collect.rs:842:25
    |
842 |                         placeholder_type_error(tcx, None, &[], visitor.0, false, None);
    |                         |
    |                         expected 7 arguments
    |
note: function defined here
note: function defined here
   --> compiler/rustc_typeck/src/collect.rs:141:10
    |
141 | crate fn placeholder_type_error(
    |          ^^^^^^^^^^^^^^^^^^^^^^
142 |     tcx: TyCtxt<'tcx>,
    |     -----------------
143 |     span: Option<Span>,
    |     ------------------
144 |     generics: &[hir::GenericParam<'_>],
    |     ----------------------------------
145 |     placeholder_types: Vec<Span>,
146 |     suggest: bool,
    |     -------------
    |     -------------
147 |     hir_ty: Option<&hir::Ty<'_>>,
148 |     kind: &'static str,
    |     ------------------

error: aborting due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0061`.
error: could not compile `rustc_typeck`

To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--color" "always" "--features" " llvm max_level_info" "--manifest-path" "/checkout/compiler/rustc/Cargo.toml" "-p" "rustc-main" "-p" "rustc_driver" "-p" "rustc_session" "-p" "rustc_fs_util" "-p" "rustc_macros" "-p" "rustc_lint_defs" "-p" "rustc_data_structures" "-p" "rustc_graphviz" "-p" "rustc_index" "-p" "rustc_errors" "-p" "rustc_middle" "-p" "rustc_apfloat" "-p" "rustc_arena" "-p" "rustc_query_system" "-p" "rustc_type_ir" "-p" "rustc_attr" "-p" "rustc_lexer" "-p" "rustc_mir" "-p" "rustc_infer" "-p" "rustc_trait_selection" "-p" "rustc_parse_format" "-p" "coverage_test_macros" "-p" "rustc_error_codes" "-p" "rustc_typeck" "-p" "rustc_ty_utils" "-p" "rustc_target" "-p" "rustc_hir_pretty" "-p" "rustc_hir" "-p" "rustc_interface" "-p" "rustc_passes" "-p" "rustc_symbol_mangling" "-p" "rustc_builtin_macros" "-p" "rustc_expand" "-p" "rustc_codegen_llvm" "-p" "rustc_llvm" "-p" "rustc_query_impl" "-p" "rustc_incremental" "-p" "rustc_ast_lowering" "-p" "rustc_traits" "-p" "rustc_resolve" "-p" "rustc_ast_passes" "-p" "rustc_privacy" "-p" "rustc_lint" "-p" "rustc_ast" "-p" "rustc_span" "-p" "rustc_serialize" "-p" "rustc_plugin_impl" "-p" "rustc_ast_pretty" "-p" "rustc_metadata" "-p" "rustc_feature" "-p" "rustc_mir_build" "-p" "rustc_parse" "-p" "rustc_save_analysis" "-p" "rustc_codegen_ssa" "--message-format" "json-render-diagnostics"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
Build completed unsuccessfully in 0:02:23

@JohnTitor
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2021
@JohnTitor JohnTitor closed this Jun 21, 2021
@JohnTitor JohnTitor deleted the rollup-638hue6 branch June 21, 2021 00:42
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants