Rollup of 9 pull requests #94514
Merged
Rollup of 9 pull requests #94514
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
…uld match up for traits and impls. Issue rust-lang#94462
Continuation of rust-lang#94376. cc rust-lang#53667
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.
Continuation of rust-lang#94376. cc rust-lang#53667
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.
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.
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).
…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
…an-DPC 7 - Make more use of `let_chains` Continuation of rust-lang#94376. cc rust-lang#53667
…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``
compiler: fix some typos
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 62f5839..32f2a5b 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)
…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.
9 - Make more use of `let_chains` Continuation of rust-lang#94376. cc rust-lang#53667
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.
update Miri Fixes rust-lang#94474 r? `@ghost`
rustbot added T-compiler | @bors r+ rollup=never p=9 |
| 📌 Commit e89ab08 has been approved by |
bors added the S-waiting-on-bors | ☀️ Test successful - checks-actions |
rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 2, 2022
Tested on commit rust-lang/rust@2a280de. Direct link to PR: <rust-lang/rust#94514> 🎉 miri on windows: test-fail → test-pass (cc @eddyb @oli-obk @RalfJung). 🎉 miri on linux: test-fail → test-pass (cc @eddyb @oli-obk @RalfJung).
This was referenced Mar 2, 2022
| Finished benchmarking commit (2a280de): comparison url. Summary: This benchmark run did not return any relevant results. If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Successful merges:
let_chains#94476 (7 - Make more use oflet_chains)let_chains#94498 (9 - Make more use oflet_chains)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup