Automatic Rustup #4671
Merged
Automatic Rustup #4671
+268
−26
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
Document rustdoc frontend CI checks
rename primary git branch
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 4fa824bb78318a3cba8c7339d5754b4909922547 Filtered ref: b8d3c3cc8b2048bd34d7611095d36d82259331af Upstream diff: rust-lang/rust@9f32ccf...4fa824b This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
debugging.md: Remove wrong claim that LLVM bitcode is not the same as LLVM IR
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 4068bafedd8ba724e332a5221c06a6fa531a30d2 Filtered ref: da574cbe2d3bcda451b7508b65e82de837b9c92d Upstream diff: rust-lang/rust@4fa824b...4068baf This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b1b464d6f61ec8c4e609c1328106378c066a9729 Filtered ref: f94cd4e7de0695f11c7f0bf0d33bb39ce736c581 Upstream diff: rust-lang/rust@4068baf...b1b464d This merge was created using https://github.com/rust-lang/josh-sync.
remove untrue/contentious statement
Rustc pull update
fix typo in autodiff docs
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: c5dabe8cf798123087d094f06417f5a767ca73e8 Filtered ref: 3214048a4d271548c85aae8ffc5f28ec73719235 Upstream diff: rust-lang/rust@fb24b04...c5dabe8 This merge was created using https://github.com/rust-lang/josh-sync.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: c5dabe8cf798123087d094f06417f5a767ca73e8 Filtered ref: d867ed05e46e3ba4d231efe9df26fcc9310b5d09 Upstream diff: rust-lang/rust@b1b464d...c5dabe8 This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
minor: Rustc pull update
`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@51af7a3. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
Tweak output of missing lifetime on associated type Follow up to rust-lang/rust#135602. Previously we only showed the trait's assoc item if the trait was local, because we were looking for a small span only for the generics, which we don't have for foreign traits. We now use `def_span` for the item, so we at least provide some context, even if its span is too wide. ``` error[E0195]: lifetime parameters or bounds on type `IntoIter` do not match the trait declaration --> tests/ui/lifetimes/missing-lifetime-in-assoc-type-4.rs:7:18 | 7 | type IntoIter<'a> = std::collections::btree_map::Values<'a, i32, T>; | ^^^^ lifetimes do not match type in trait | ::: /home/gh-estebank/rust/library/core/src/iter/traits/collect.rs:292:5 | 292 | type IntoIter: Iterator<Item = Self::Item>; | ------------------------------------------ lifetimes in impl do not match this type in trait ``` Given an associated item that needs a named lifetime, look at the enclosing `impl` item for one. If there is none, look at the self type and the implemented trait to see if either of those has an anonimous lifetime. If so, suggest adding a named lifetime. ``` error: in the trait associated type is declared without lifetime parameters, so using a borrowed type for them requires that lifetime to come from the implemented type --> $DIR/missing-lifetime-in-assoc-type-2.rs:5:17 | LL | type Item = &T; | ^ this lifetime must come from the implemented type | help: add a lifetime to the impl block and use it in the self type and associated type | LL ~ impl<'a> IntoIterator for &'a S { LL ~ type Item = &'a T; | ``` Move the previous long message to a note and use a shorter primary message: ``` error: missing lifetime in associated type --> $DIR/missing-lifetime-in-assoc-type-1.rs:9:17 | LL | impl<'a> IntoIterator for &S { | ---- there is a named lifetime specified on the impl block you could use ... LL | type Item = &T; | ^ this lifetime must come from the implemented type | note: in the trait the associated type is declared without lifetime parameters, so using a borrowed type for them requires that lifetime to come from the implemented type --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL help: consider using the lifetime from the impl block | LL | type Item = &'a T; | ++ ``` r? `@Nadrieril`
Add alignment parameter to `simd_masked_{load,store}`
This PR adds an alignment parameter in `simd_masked_load` and `simd_masked_store`, in the form of a const-generic enum `core::intrinsics::simd::SimdAlign`. This represents the alignment of the `ptr` argument in these intrinsics as follows
- `SimdAlign::Unaligned` - `ptr` is unaligned/1-byte aligned
- `SimdAlign::Element` - `ptr` is aligned to the element type of the SIMD vector (default behavior in the old signature)
- `SimdAlign::Vector` - `ptr` is aligned to the SIMD vector type
The main motive for this is stdarch - most vector loads are either fully aligned (to the vector size) or unaligned (byte-aligned), so the previous signature doesn't cut it.
Now, stdarch will mostly use `SimdAlign::Unaligned` and `SimdAlign::Vector`, whereas portable-simd will use `SimdAlign::Element`.
- [x] `cg_llvm`
- [x] `cg_clif`
- [x] `miri`/`const_eval`
## Alternatives
Using a const-generic/"const" `u32` parameter as alignment (and we error during codegen if this argument is not a power of two). This, although more flexible than this, has a few drawbacks
- If we use an const-generic argument, then portable-simd somehow needs to pass `align_of::<T>()` as the alignment, which isn't possible without GCE
- "const" function parameters are just an ugly hack, and a pain to deal with in non-LLVM backends
We can remedy the problem with the const-generic `u32` parameter by adding a special rule for the element alignment case (e.g. `0` can mean "use the alignment of the element type), but I feel like this is not as expressive as the enum approach, although I am open to suggestions
cc `@workingjubilee` `@RalfJung` `@BoxyUwU`
Fix tests for big-endian The tests fail on s390x and presumably other big-endian systems, due to check of raw alloc values in the MIR output. To fix the tests remove the raw bytes from the MIR output (via: compile-flags: -Zdump-mir-exclude-alloc-bytes) and update the matching diffs.
compiler: Fix a couple issues around cargo feature unification cc rust-lang/rust#148266. this doesn't fix all the issues (`rustc_public` and `rustc_transmute` still emit warnings when tested individually), but it fixes all the simple ones. To fix rustc_public I will probably need help from ````@AlexanderPortland```` or ````@makai410```` to make sure I am not accidentally cfg-ing out items that are meant to be public. To fix `rustc_transmute`, I will need to know (from ````@jswrenn```` ?) in what context the `rustc` cargo feature is disapled. To reproduce the issues, you can run `x test rustc_{transmute,public}` locally. --- The first issue I fixed was a warning in `rustc_index`: ``` Testing stage2 {rustc_parse_format} (aarch64-apple-darwin) Compiling rustc_index v0.0.0 (/Users/ci/project/compiler/rustc_index) error: extern crate `smallvec` is unused in crate `rustc_index` --> compiler/rustc_index/src/lib.rs:2:1 | 2 | #![cfg_attr(all(feature = "nightly", test), feature(stmt_expr_attributes))] | ^ | = help: remove the dependency or add `use smallvec as _;` to the crate root = note: `-D unused-crate-dependencies` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(unused_crate_dependencies)]` error: could not compile `rustc_index` (lib) due to 1 previous error ``` The second was that `type_ir_macros` didn't fully specify its dependencies: ``` Testing stage1 {rustc_type_ir_macros} (aarch64-apple-darwin) Compiling rustc_type_ir_macros v0.0.0 (/Users/jyn/src/ferrocene3/compiler/rustc_type_ir_macros) error[E0432]: unresolved import `syn::visit_mut` --> compiler/rustc_type_ir_macros/src/lib.rs:2:10 | 2 | use syn::visit_mut::VisitMut; | ^^^^^^^^^ could not find `visit_mut` in `syn` | note: found an item that was configured out --> /Users/jyn/.local/lib/cargo/registry/src/index.crates.io-1949cf8c6b5b557f/syn-2.0.106/src/lib.rs:880:21 | 878 | #[cfg(feature = "visit-mut")] | --------------------- the item is gated behind the `visit-mut` feature 879 | #[cfg_attr(docsrs, doc(cfg(feature = "visit-mut")))] 880 | pub use crate::gen::visit_mut; | ^^^^^^^^^ error[E0433]: failed to resolve: could not find `visit_mut` in `syn` --> compiler/rustc_type_ir_macros/src/lib.rs:206:18 | 206 | syn::visit_mut::visit_type_path_mut(self, i); | ^^^^^^^^^ could not find `visit_mut` in `syn` | note: found an item that was configured out --> /Users/jyn/.local/lib/cargo/registry/src/index.crates.io-1949cf8c6b5b557f/syn-2.0.106/src/lib.rs:880:21 | 878 | #[cfg(feature = "visit-mut")] | --------------------- the item is gated behind the `visit-mut` feature 879 | #[cfg_attr(docsrs, doc(cfg(feature = "visit-mut")))] 880 | pub use crate::gen::visit_mut; | ^^^^^^^^^ ```
…fee1-dead
Dogfood `trim_{suffix|prefix}` in compiler
cc rust-lang/rust#142312
Implement Path::is_empty This implements `Path::is_empty` which is simply a convenience wrapper for `path.as_os_str().is_empty()`. Tracking issue: rust-lang/rust#148494 ACP: rust-lang/libs-team#687
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@1a96e5e. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
Improve type safety by using an enum rather than strings.
rustc_target: introduce Arch Improve type safety by using an enum rather than strings.
Rollup of 6 pull requests Successful merges: - rust-lang/rust#147355 (Add alignment parameter to `simd_masked_{load,store}`) - rust-lang/rust#147925 (Fix tests for big-endian) - rust-lang/rust#148341 (compiler: Fix a couple issues around cargo feature unification) - rust-lang/rust#148371 (Dogfood `trim_{suffix|prefix}` in compiler) - rust-lang/rust#148495 (Implement Path::is_empty) - rust-lang/rust#148502 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
Relax r29 inline asm restriction on PowerPC64 targets LLVM uses r29 to hold a base pointer for some PowerPC target configurations. It is usable on all 64 bit targets as a callee save register. r? `@Amanieu`
…=WaffleLapkin Move warning reporting from flag_to_backend_features to cfg_target_feature This way warnings are emitted even in a check build.
…trochenkov Deduplicate deprecation warning when using unit or tuple structs First commit adds a test that's broken currently, 2nd commit fixes it. Created with `@WaffleLapkin`
triagebot: Create Zulip topics for libs backports Take the configuration used by other teams to create Zulip topics for T-libs backports.
Remove no longer necessary lint allow
miri subtree update x86/rounding-error is causing spurious test failures. This sync fixes that. --- Subtree update of `miri` to de2a63b. Created using https://github.com/rust-lang/josh-sync. r? ``@ghost``
Fix ICE from lit_to_mir_constant caused by type error Fixes rust-lang/rust#148515 we still need to mark that there were errors to prevent later phases (like MIR building) from proceeding.
…50_percent_more_mut, r=Amanieu
Merge `Vec::push{,_mut}_within_capacity`
Implements rust-lang/libs-team#689.
cc rust-lang/rust#135974, rust-lang/rust#100486
r? libs-api
Rollup of 8 pull requests Successful merges: - rust-lang/rust#147994 (Deduplicate deprecation warning when using unit or tuple structs) - rust-lang/rust#148440 ([rustdoc search] Simplify itemTypes and filter "dependencies") - rust-lang/rust#148501 (triagebot: Create Zulip topics for libs backports) - rust-lang/rust#148517 (Remove no longer necessary lint allow) - rust-lang/rust#148518 (Unify the configuration of the compiler docs) - rust-lang/rust#148523 (miri subtree update) - rust-lang/rust#148525 (Fix ICE from lit_to_mir_constant caused by type error) - rust-lang/rust#148534 (Merge `Vec::push{,_mut}_within_capacity`) r? `@ghost` `@rustbot` modify labels: rollup
This updates the rust-version file to 401ae55427522984e4a89c37cff6562a4ddcf6b7.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 401ae55427522984e4a89c37cff6562a4ddcf6b7 Filtered ref: 1bd47ec Upstream diff: rust-lang/rust@5f9dd05...401ae55 This merge was created using https://github.com/rust-lang/josh-sync.
Collaborator
|
Thank you for contributing to Miri! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge ref '401ae5542752' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: 401ae55427522984e4a89c37cff6562a4ddcf6b7
Filtered ref: 1bd47ec
Upstream diff: rust-lang/rust@5f9dd05...401ae55
This merge was created using https://github.com/rust-lang/josh-sync.