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 14 pull requests #78920

Merged
merged 33 commits into from
Nov 11, 2020
Merged

Rollup of 14 pull requests #78920

merged 33 commits into from
Nov 11, 2020

Commits on Oct 17, 2020

  1. Configuration menu
    Copy the full SHA
    20e032e View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Configuration menu
    Copy the full SHA
    68d2cd5 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. Assert that a return place is not used for indexing during integration

    The inliner integrates call destination place with callee return place
    by remapping the local and adding extra projections as necessary.
    
    If a call destination place contains any projections (which is already
    possible) and a return place is used in an indexing projection (most
    likely doesn't happen yet) the end result would be incorrect.
    
    Add an assertion to ensure that potential issue won't go unnoticed in
    the presence of more sophisticated copy propagation scheme.
    tmiasko committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    89c3582 View commit details
    Browse the repository at this point in the history
  2. remove needs_drop

    the8472 committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    8c7046e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. Collapse all uses of target.options.foo into target.foo

    with an eye on merging `TargetOptions` into `Target`.
    
    `TargetOptions` as a separate structure is mostly an implementation detail of `Target` construction, all its fields logically belong to `Target` and available from `Target` through `Deref` impls.
    petrochenkov committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    bf66988 View commit details
    Browse the repository at this point in the history
  2. rustc_target: Rename some target options to avoid tautology

    `target.target_endian` -> `target.endian`
    `target.target_c_int_width` -> `target.c_int_width`
    `target.target_os` -> `target.os`
    `target.target_env` -> `target.env`
    `target.target_vendor` -> `target.vendor`
    `target.target_family` -> `target.os_family`
    `target.target_mcount` -> `target.mcount`
    petrochenkov committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    dc004d4 View commit details
    Browse the repository at this point in the history
  3. Address review comments

    petrochenkov committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    7f91175 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Configuration menu
    Copy the full SHA
    f173957 View commit details
    Browse the repository at this point in the history
  2. comment attribution fix

    comment means to refer to the macro in its direct scope
    o752d authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    21f44fb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2633e93 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    868aa89 View commit details
    Browse the repository at this point in the history
  5. Bad grammar

    cyqsimon committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    bf982a5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    70e175b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0242f96 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. (rustdoc) [src] link for types defined by macros shows invocation

    Previously the [src] link on types defined by a macro
    pointed to the macro definition.
    This commit makes the Clean-Implementation for Spans
    aware of macro defined types,
    so that the link points to the invocation instead.
    liketechnik committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    7beb0da View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aaf06d8 View commit details
    Browse the repository at this point in the history
  3. Update src/test/ui/issues/issue-76547.rs

    Co-authored-by: Camelid <camelidcamel@gmail.com>
    tmandry and camelid authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    6be4847 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    857dd8b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d757ecd View commit details
    Browse the repository at this point in the history
  6. Rollup merge of #76765 - guswynn:async_return, r=tmandry

    Make it more clear what an about async fn's returns when referring to what it returns
    
    see #76547
    
    This is *likely* not the ONLY place that this happens to be unclear, but we can move this fn to rustc_middle or something like that and reuse it if need be, to apply it to more diagnostics
    
    One outstanding question I have is, if the fn returns (), should I make the message more clear (what about `fn f()` vs `fn f() -> ()`, can you tell those apart in the hir?)
    
    R? `@tmandry`
    
    `@rustbot` modify labels +A-diagnostics +T-compiler
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    9596e34 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of #78574 - sasurau4:test/check-pass-regions, r=jyn514

    Use check-pass instead of build-pass in regions ui test suite
    
    ## Overview
    
    Helps with #62277
    
    Region inference have nothing to do with codegen because they are erased before codegen.
    Ref: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Is.20region.20inference.20.20nothing.20to.20do.20with.20codegen.20process.3F/near/215956759
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    8c88c03 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of #78669 - sasurau4:test/check-pass-consts, r=jyn514

    Use check-pass instead of build-pass in some consts ui test suits
    
    Helps with #62277
    
    Changed tests modified by #57175 because of the stabilization `#![feature(const_let)]`.
    They should be compile-fail because the feature gate checking disallow the feature before stabilization. So the feature gate checking have nothing to do with codegen according to https://rustc-dev-guide.rust-lang.org/feature-gate-ck.html.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    3a2cbe6 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of #78847 - tmiasko:inline-return-place, r=matthewjasper

    Assert that a return place is not used for indexing during integration
    
    The inliner integrates call destination place with callee return place
    by remapping the local and adding extra projections as necessary.
    
    If a call destination place contains any projections (which is already
    possible) and a return place is used in an indexing projection (most
    likely doesn't happen yet) the end result would be incorrect.
    
    Add an assertion to ensure that potential issue won't go unnoticed in
    the presence of more sophisticated copy propagation scheme.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    9c48688 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of #78854 - the8472:workaround-normalization-regression-…

    …master, r=Mark-Simulacrum
    
    Workaround for "could not fully normalize" ICE
    
    Workaround for "could not fully normalize" ICE (#78139) by removing the `needs_drop::<T>()` calls triggering it.
    Corresponding beta PR: #78845
    
    Fixes #78139 -- the underlying bug is likely not fixed but we don't have another test case isolated for now, so closing.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    e15fee9 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of #78875 - petrochenkov:cleantarg, r=Mark-Simulacrum

    rustc_target: Further cleanup use of target options
    
    Follow up to #77729.
    
    Implements items 2 and 4 from the list in #77729 (comment).
    
    The first commit collapses uses of `target.options.foo` into `target.foo`.
    
    The second commit renames some target options to avoid tautology:
    `target.target_endian` -> `target.endian`
    `target.target_c_int_width` -> `target.c_int_width`
    `target.target_os` -> `target.os`
    `target.target_env` -> `target.env`
    `target.target_vendor` -> `target.vendor`
    `target.target_family` -> `target.os_family`
    `target.target_mcount` -> `target.mcount`
    
    r? `@Mark-Simulacrum`
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    105f4b8 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of #78887 - camelid:dataflow-state-decl, r=jonas-schievink

    Add comments to explain memory usage optimization
    
    Add explanatory comments so that people understand that it's just an optimization and doesn't affect behavior.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    a08e7af View commit details
    Browse the repository at this point in the history
  13. Rollup merge of #78890 - o752d:patch-2, r=jyn514

    comment attribution fix
    
    comment means to refer to the macro in its direct scope
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    1952f04 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of #78896 - cyqsimon:master, r=m-ou-se

    Clarified description of write! macro
    
    Reordered the list of arguments in the description to match that in the actual macro.
    
    Suggested and discussed [here](https://discord.com/channels/442252698964721669/443492145567891458/774341262609219624).
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    87ecb0a View commit details
    Browse the repository at this point in the history
  15. Rollup merge of #78897 - hyd-dev:alloc-error-hook-newline, r=m-ou-se

    Add missing newline to error message of the default OOM hook
    
    Currently the default OOM hook in libstd does not end the error message with a newline:
    ```
    memory allocation of 4 bytes failedtimeout: the monitored command dumped core
    /playground/tools/entrypoint.sh: line 11:     7 Aborted                 timeout --signal=KILL ${timeout} "$`@"`
    ```
    https://play.rust-lang.org/?version=nightly&mode=debug&edition=2018&gist=030d8223eb57dfe47ef157709aa26542
    
    This is because the `fmt::Arguments` passed to `dumb_print()` does not end with a newline. All other calls to `dumb_print()` in libstd pass a `\n`-ended `fmt::Arguments` to `dumb_print()`. For example:
    https://github.com/rust-lang/rust/blob/25f6938da459a57b43bdf16ed6bdad3225b2a3ce/library/std/src/sys_common/util.rs#L18
    I think the `\n` was forgotten in #51264.
    
    This PR appends `\n` to the error string.
    
    ~~Note that I didn't add a test, because I didn't find tests for functions in ` library/std/src/alloc.rs` or a test that is similar to the test of this change would be.~~ *Edit: CI told me there is an existing test. Sorry.*
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    354098c View commit details
    Browse the repository at this point in the history
  16. Rollup merge of #78898 - SNCPlay42:issue-78892, r=Mark-Simulacrum

    add regression test for #78892
    
    closes #78892, which was already fixed on nightly.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    6b27f0d View commit details
    Browse the repository at this point in the history
  17. Rollup merge of #78908 - liketechnik:fix_macro_expand_src_link, r=jyn514

    (rustdoc) [src] link for types defined by macros shows invocation, not defintion
    
    Previously the [src] link on types defined by a macro pointed to the macro definition.
    
    This pr makes the Clean-Implementation for Spans aware of macro defined types, so that the link points to the invocation instead.
    
    I'm not totally sure if it's okay to add the 'macro awareness' in the Clean-Implementation, because it erases that knowledge for all following code. Maybe it would be more sensible to add the check only for the link generation at https://github.com/rust-lang/rust/blob/25f6938da459a57b43bdf16ed6bdad3225b2a3ce/src/librustdoc/html/render/mod.rs#L1619
    
    Closes #39726.
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    a5f549e View commit details
    Browse the repository at this point in the history
  18. Rollup merge of #78910 - tmiasko:intrinsics-link, r=jyn514

    Fix links to stabilized versions of some intrinsics
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    42fae6b View commit details
    Browse the repository at this point in the history
  19. Rollup merge of #78912 - JulianKnodt:mcg_macro, r=lcnr

    Add macro test for min-const-generics
    
    Adds a test which uses a macro inside a block for a const-expression, as per #78433
    
    r? `@lcnr`
    jonas-schievink authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    fa4d0f2 View commit details
    Browse the repository at this point in the history