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 9 pull requests #94514

Merged
merged 24 commits into from
Mar 2, 2022
Merged

Rollup of 9 pull requests #94514

merged 24 commits into from
Mar 2, 2022

Commits on Feb 28, 2022

  1. Suggest adding a new lifetime parameter when two elided lifetimes sho…

    …uld match up for traits and impls.
    
    Issue rust-lang#94462
    kckeiks committed Feb 28, 2022
    Configuration menu
    Copy the full SHA
    abcccc9 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2022

  1. 7 - Make more use of let_chains

    Continuation of rust-lang#94376.
    
    cc rust-lang#53667
    c410-f3r committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    7aa5ea9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    741553e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    885e808 View commit details
    Browse the repository at this point in the history
  4. compiler: fix some typos

    cuishuang committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    eb2b944 View commit details
    Browse the repository at this point in the history
  5. Update books

    ehuss committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    8e04049 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    270730f View commit details
    Browse the repository at this point in the history
  7. update (bless) test results

    kckeiks committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    1b08cba View commit details
    Browse the repository at this point in the history
  8. tests: accept llvm intrinsic in align-checking test

    This changed in upstream change https://reviews.llvm.org/D98152 (aka
    llvm/llvm-project@a266af7)
    wherein LLVM got smarter about using intrinsics. As best I can tell the
    change I've made here preserves the intent of the test on LLVM 14 and
    before while also passing on LLVM 15 and later.
    durin42 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    26c5d21 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6fbef7f View commit details
    Browse the repository at this point in the history
  10. 9 - Make more use of let_chains

    Continuation of rust-lang#94376.
    
    cc rust-lang#53667
    c410-f3r committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    a7b4d66 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2022

  1. Add a copy of cfg_if to core's internal_macros.rs

    core can't depend on external crates the way std can. Rather than revert
    usage of cfg_if, add a copy of it to core. This does not export our
    copy, even unstably; such a change could occur in a later commit.
    joshtriplett committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    0f505c6 View commit details
    Browse the repository at this point in the history
  2. Provide C FFI types via core::ffi, not just in std

    The ability to interoperate with C code via FFI is not limited to crates
    using std; this allows using these types without std.
    
    The existing types in `std::os::raw` become type aliases for the ones in
    `core::ffi`. This uses type aliases rather than re-exports, to allow the
    std types to remain stable while the core types are unstable.
    
    This also moves the currently unstable `NonZero_` variants and
    `c_size_t`/`c_ssize_t`/`c_ptrdiff_t` types to `core::ffi`, while leaving
    them unstable.
    joshtriplett committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    335c960 View commit details
    Browse the repository at this point in the history
  3. Temporarily make CStr not a link in the c_char docs

    When CStr moves to core with an alias in std, this can link to
    `crate::ffi::CStr`. However, linking in the reverse direction (from core
    to std) requires a relative path, and that path can't work from both
    core::ffi and std::os::raw (different number of `../` traversals
    required).
    joshtriplett committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    75c3e9c View commit details
    Browse the repository at this point in the history
  4. update Miri

    RalfJung committed Mar 2, 2022
    Configuration menu
    Copy the full SHA
    50790a9 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#94464 - kckeiks:lifetime-elision-mismatch-h…

    …int-for-traits, r=estebank
    
    Suggest adding a new lifetime parameter when two elided lifetimes should match up for traits and impls.
    
    Suggest adding a new lifetime parameter when two elided lifetimes should match up for functions in traits and impls.
    
    Issue rust-lang#94462
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    2b72ecb View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#94476 - c410-f3r:yet-more-let-chains, r=Dyl…

    …an-DPC
    
    7 - Make more use of `let_chains`
    
    Continuation of rust-lang#94376.
    
    cc rust-lang#53667
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    42596a7 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#94478 - GuillaumeGomez:macro-generated-intr…

    …a-doc-link, r=notriddle
    
    Fix panic when handling intra doc links generated from macro
    
    Fixes rust-lang#78591.
    Fixes rust-lang#92789.
    
    r? ``@notriddle``
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    64e16d3 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#94482 - cuishuang:master, r=Dylan-DPC

    compiler: fix some typos
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    cd6e53d View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#94490 - ehuss:update-books, r=ehuss

    Update books
    
    ## nomicon
    
    1 commits in 90993eeac93dbf9388992de92965f99cf6f29a03..f6d6126fc96ecf4a7f7d22da330df9506293b0d0
    2022-02-13 12:44:12 +0900 to 2022-02-26 02:21:21 +0900
    - ffi: explicitly declare hello_from_rust for C99 (rust-lang/nomicon#343)
    
    ## reference
    
    20 commits in 70fc73a6b908e08e66aa0306856c5211312f6c05..9d289c05fce7254b99c6a0d354d84abb7fd7a032
    2022-02-14 19:33:01 -0800 to 2022-02-23 08:58:20 -0800
    - Fix typo in `functions.md` (rust-lang/reference#1173)
    - Fix CI
    - Unify global_asm/asm directive list
    - Update src/inline-assembly.md
    - Update src/inline-assembly.md
    - Fix changes unintentional reverted in d5d3d80
    - Add note about operand interpolations
    - Sort lists, add syntax control directives
    - Add another missed batch suggestion
    - Add missed batch suggestion
    - Apply suggestions from code review
    - Add .type, .size, and .p2align
    - Reformat directive lists
    - Add `.inst` directive
    - Add missing directives
    - Add additional directives in use
    - Add `.fill` directive
    - Style fixes
    - Fix code block
    - Add supported Directives list
    
    ## book
    
    13 commits in 67b768c0b660a069a45f0e5d8ae2f679df1022ab..3f255ed40b8c82a0434088568fbed270dc31bf00
    2022-02-09 21:52:41 -0500 to 2022-02-27 21:26:12 -0500
    - Add a back reference about enum variant initializer fns. Fixes rust-lang/book#800.
    - Update ch01-03-hello-cargo.md
    - ch03-05: Add definite article for the block of code
    - Change variable names from "slice" to "values"
    - Remove reference to advanced lifetime section that no longer exists
    - Fix link to go to the right newtype section
    - Remove confusing and redundant part of a sentence about newtypes
    - Make transition less repetitive
    - Correct wording about associated functions.
    - Remove unnecessary extern crate proc_macro
    - Clarify that this code is defining, not using a procedural macro
    - Add manual regeneration steps for cargo new test
    - Update Listing 11-1 to reflect current contents
    
    ## rust-by-example
    
    11 commits in 18c0055b8aea49391e8f758a4400097999c9cf1e..2a928483a20bb306a7399c0468234db90d89afb5
    2022-01-19 08:51:55 -0300 to 2022-02-28 11:36:59 -0300
    - Update destructure_slice.md (rust-lang/rust-by-example#1513)
    - Update iter_find.md (rust-lang/rust-by-example#1512)
    - Add an example of collecting errors while iterating successes (rust-lang/rust-by-example#1509)
    - Fix broken link on asm (rust-lang/rust-by-example#1508)
    - Update abort_unwind.md (rust-lang/rust-by-example#1505)
    - Remove duplicate text in asm.md (rust-lang/rust-by-example#1506)
    - Improve asm clobber example (rust-lang/rust-by-example#1504)
    - Add +1 to next_age (rust-lang/rust-by-example#1503)
    - fix comment on into_iter() for arrays (rust-lang/rust-by-example#1502)
    - Added new Rust 1.58 direct format args (rust-lang/rust-by-example#1501)
    - documentation for cfg_panic (rust-lang/rust-by-example#1500)
    
    ## rustc-dev-guide
    
    13 commits in 62f58394ba7b203f55ac35ddcc4c0b79578f5706..32f2a5b4e7545318846185198542230170dd8a42
    2022-02-11 08:42:50 -0500 to 2022-03-01 10:45:24 -0600
    - Add architecture suggestion for Apple silicon (rust-lang/rustc-dev-guide#1320)
    - cargo timings has been stabilized (rust-lang/rustc-dev-guide#1319)
    - Add known-bug header. (rust-lang/rustc-dev-guide#1311)
    - Fix typo (rust-lang/rustc-dev-guide#1315)
    - Typo (rust-lang/rustc-dev-guide#1313)
    - instrument-coverage has been stabilized.
    - symbol-mangling-version has been stabilized
    - Fix `Ty` link (rust-lang/rustc-dev-guide#1308)
    - Edit glossary (rust-lang/rustc-dev-guide#1302)
    - Fix heading levels in the query chapter (rust-lang/rustc-dev-guide#1305)
    - Fix link
    - Edit "Queries" chapter (rust-lang/rustc-dev-guide#1301)
    - Link to The Rust Performance Book (rust-lang/rustc-dev-guide#1300)
    
    ## edition-guide
    
    1 commits in beea0a3cdc3885375342fd010f9ad658e6a5e09a..c55611dd6c58bdeb52423b5c52fd0f3c93615ba8
    2021-12-05 07:06:45 -0800 to 2022-02-21 14:21:39 +0100
    - Remove `+nightly` for `cargo new` (rust-lang/edition-guide#276)
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    823a386 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#94496 - durin42:llvm-15-moar-intrinsic, r=n…

    …ikic
    
    tests: accept llvm intrinsic in align-checking test
    
    This changed in upstream change https://reviews.llvm.org/D98152 (aka
    llvm/llvm-project@a266af7)
    wherein LLVM got smarter about using intrinsics. As best I can tell the
    change I've made here preserves the intent of the test on LLVM 14 and
    before while also passing on LLVM 15 and later.
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    aabd068 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#94498 - c410-f3r:chega-ja-deu, r=Dylan-DPC

    9 - Make more use of `let_chains`
    
    Continuation of rust-lang#94376.
    
    cc rust-lang#53667
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    1ff654a View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#94503 - joshtriplett:core-ffi-c, r=Amanieu

    Provide C FFI types via core::ffi, not just in std
    
    Tracking issue: rust-lang#94501
    
    The ability to interoperate with C code via FFI is not limited to crates
    using std; this allows using these types without std.
    
    The existing types in `std::os::raw` become type aliases for the ones in
    `core::ffi`. This uses type aliases rather than re-exports, to allow the
    std types to remain stable while the core types are unstable.
    
    This also moves the currently unstable `NonZero_` variants and
    `c_size_t`/`c_ssize_t`/`c_ptrdiff_t` types to `core::ffi`, while leaving
    them unstable.
    
    Historically, we didn't do this because these types are target-dependent.
    However, `core` itself is also target-dependent. `core` should not call
    any OS services, but it knows the target and the target's ABI.
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    3ea9eeb View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#94513 - RalfJung:miri, r=RalfJung

    update Miri
    
    Fixes rust-lang#94474
    r? `@ghost`
    matthiaskrgr authored Mar 2, 2022
    Configuration menu
    Copy the full SHA
    e89ab08 View commit details
    Browse the repository at this point in the history