[codex] Refresh carry branch from upstream main#8
Merged
cypherair merged 284 commits intoMay 27, 2026
Merged
Conversation
…`register_removed(...)` call
These are all tests from trying to fix the tear-free `dbg!`: * rust-lang#154074 * rust-lang#154994 * rust-lang#155915 These should also work as we revert to the old `dbg!`, so we should keep the tests to make sure they don't regress again. Co-authored-by: dianne <diannes.gm@gmail.com>
…inealways + target feature changes, factoring in subsequent codebase changes
refactor thread block timeout handling
add --native flag to './miri run' to run tests on the host
libc shim fixes
This adds shims for the `readv`, `writev`, `preadv` and `pwritev` functions.
…v-writev Add vectored read and vectored write shims for Unix targets
…ort-peek Fix readable readiness removed after a short peek
This updates the rust-version file to 281c97c.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@281c97c Filtered ref: rust-lang/miri@bbdb123 Upstream diff: rust-lang/rust@c8c4c83...281c97c This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This intermediate commit makes subsequent diffs/blame a bit nicer, by encouraging git's blame view to preserve line history for the remaining parts of `handle_needs`, which would otherwise be obscured. A subsequent commit will move the list back into `needs.rs` in an altered form.
…r=SimonSapin Stabilize bool_to_result Closes rust-lang#142748
…thar tests: fix pub-priv-dep test expectation Related to private dependencies rust-lang#44663 The test had wrongly configured dependency privacy. The ascii graph shows that both dependencies should be private. Furthermore, the way this test existed was effectively identical to `shared_direct_private.rs`.
compiletest: sort unexpected and unimportant errors Sort unexpected errors before printing in tests, this helps inserting annotations manually from bottom to top and searching for errors is a bit simpler. Output before: ```rust tests/ui/delegation/explicit-paths.rs:47:9: ERROR: method `foo3` is not a member of trait `Trait` [E0407] tests/ui/delegation/explicit-paths.rs:48:9: ERROR: method `foo4` is not a member of trait `Trait` [E0407] tests/ui/delegation/explicit-paths.rs:27:14: ERROR: cannot find function `foo4` in `S` [E0425] tests/ui/delegation/explicit-paths.rs:37:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:48:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:59:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:67:5: ERROR: conflicting implementations of trait `Trait` for type `S` [E0119] tests/ui/delegation/explicit-paths.rs:56:36: ERROR: mismatched types [E0308] tests/ui/delegation/explicit-paths.rs:68:16: ERROR: the trait bound `S2: Trait` is not satisfied [E0277] tests/ui/delegation/explicit-paths.rs:68:30: ERROR: mismatched types [E0308] ``` Output after: ```rust tests/ui/delegation/explicit-paths.rs:27:14: ERROR: cannot find function `foo4` in `S` [E0425] tests/ui/delegation/explicit-paths.rs:37:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:47:9: ERROR: method `foo3` is not a member of trait `Trait` [E0407] tests/ui/delegation/explicit-paths.rs:48:9: ERROR: method `foo4` is not a member of trait `Trait` [E0407] tests/ui/delegation/explicit-paths.rs:48:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:56:36: ERROR: mismatched types [E0308] tests/ui/delegation/explicit-paths.rs:59:18: ERROR: cannot find function `foo4` in `F` [E0425] tests/ui/delegation/explicit-paths.rs:67:5: ERROR: conflicting implementations of trait `Trait` for type `S` [E0119] tests/ui/delegation/explicit-paths.rs:68:16: ERROR: the trait bound `S2: Trait` is not satisfied [E0277] tests/ui/delegation/explicit-paths.rs:68:30: ERROR: mismatched types [E0308] ``` r? @petrochenkov
…check, r=workingjubilee codegen: re-enable FileCheck for scalable-vector tuple intrinsics The FileCheck directives in `tests/codegen-llvm/scalable-vectors/tuple-intrinsics.rs` were not actually being checked: the test used `//@ build-pass`, and rust-lang#155630 made that explicit by replacing it with `//@ skip-filecheck`. This fixes the stale checks and re-enables FileCheck for the test. The `get` and `set` cases now use concrete index-0 wrappers, so they have stable `#[no_mangle]` names for FileCheck to match. Fixes rust-lang#155665. r? @jieyouxu
Rewrite documentation that said to implement `Into`
…nathanBrouwer Rollup of 4 pull requests Successful merges: - rust-lang#156764 (tests: fix pub-priv-dep test expectation) - rust-lang#156825 (compiletest: sort unexpected and unimportant errors) - rust-lang#156878 (codegen: re-enable FileCheck for scalable-vector tuple intrinsics) - rust-lang#156909 (Rewrite documentation that said to implement `Into`)
This is a small update with a few bug fixes. Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-053
Add CI check when building sysroot with GCC backend and running libcore tests with it Fixes rust-lang/rustc_codegen_gcc#882. Is it what you had in mind @Kobzol? r? @Kobzol
hexagon-gen: add optional output-dir argument
…, r=folkertdev stdarch subtree update Subtree update of `stdarch` to rust-lang/stdarch@18ca8c5. Created using https://github.com/rust-lang/josh-sync. r? @ghost
…l, r=petrochenkov delegation: remove method call generation This PR removes method call generation from delegations, now we always generate default call. Part of rust-lang#118212. We reuse methods probing engine for finding needed adjustments, thus extending number of supported cases. In this PR adjustments are applied to trait methods (was supported before) ~and static functions (new feature)~. Free functions can be supported later. Finally this PR solves issues from parent generics propagation from rust-lang#155906. r? @petrochenkov
rustc_on_unimplemented: introduce format specifiers
...as printing options for the annotated item.
See also the test and dev guide prose. This only affects rustc_on_unimplemented, not (yet) the other diagnostic attributes. I plan to do that in some later PR.
```rust
#![feature(rustc_attrs)]
#[rustc_on_unimplemented(
message = "normal: {This}, path: {This:path}, resolved: {This:resolved}"
)]
pub trait Trait<'lifetime, const CONST_GENERIC: usize, A, B> where A: Send {}
```
will do:
```
normal: Trait, path: Trait<'lifetime, CONST_GENERIC, A, B>, resolved: Trait<'_, 6, u8, _>
```
…=oli-obk
fix E0371 description
This changes the `impl`s to be `impl {Trait} for dyn {Trait}` instead of just `impl {Trait} for {Trait}` in the description of E0371.
(While this was not part of "Crafting errors like rustc" workshop at RustWeek by @jdonszelmann and @estebank, I found this while going through all errors Rust emits to pick a favourite)
tidy: remove duplicate entry and alphabetize OS constants list
…i-obk Drop skip_move_check_fns query. Looking at the header of the impl block for each method can be just as fast.
fix breakpoint callback registration in `lldb_batchmode` We'd been failing to register the callback for a while now, because it couldn't find the specified function. This change imports `lldb_batchmode` and uses the namespaced name of the function. As an aside, I'm relatively sure this breakpoint callback isn't necessary anymore. Whenever lldb stops at a breakpoint, it updates the selected thread/frame automatically. I don't want to remove it quite yet because I *might* need it for some bookkeeping with the `lldb-repr` directive (and `--bless` behavior)
Reorganize `tests/ui/issues` [1/N] Part of [GSoC'26 project](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Reorganizing.20tests.2Fui.2Fissues) r? Kivooeo @Teapot4195
Update mdbook to 0.5.3 This is a small update with a few bug fixes. Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-053
…nathanBrouwer Rollup of 9 pull requests Successful merges: - rust-lang#156959 (stdarch subtree update) - rust-lang#156541 (delegation: remove method call generation) - rust-lang#156161 (rustc_on_unimplemented: introduce format specifiers) - rust-lang#156752 (fix E0371 description) - rust-lang#156761 (tidy: remove duplicate entry and alphabetize OS constants list) - rust-lang#156872 (Drop skip_move_check_fns query.) - rust-lang#156899 (fix breakpoint callback registration in `lldb_batchmode`) - rust-lang#156927 (Reorganize `tests/ui/issues` [1/N]) - rust-lang#156947 (Update mdbook to 0.5.3)
std::net::tcp: let the OS pick the port numbers See rust-lang#156377 for context. I only did the TCP tests for now to see whether there are any unexpected problems.
Update cargo submodule 13 commits in 4d1f984518c77fad6eeef4f40153b002a659e662..fbb61be30e5f9ac3a6ad58e56a5c0f5db2d2b3ef 2026-05-15 17:12:01 +0000 to 2026-05-26 15:08:03 +0000 - fix(compiler): forward verbose flag to rustc for local crates (rust-lang/cargo#17006) - Fix CVE-2026-5222 and CVE-2026-5223 (rust-lang/cargo#17031) - Don't use the network for a publish dry-run test (rust-lang/cargo#17027) - feat: Break out `RegistryConfig` and `crate_url` for interpreting `RegistryConfig::dl` (rust-lang/cargo#17011) - refactor(diag): Sort the PARSE_PASS_RULES (rust-lang/cargo#17019) - fix(artifact)!: Remove compat mode from artifacts (rust-lang/cargo#17016) - refactor(diag): Simplify adding of new diagnostics (rust-lang/cargo#17015) - test(package): Mark a network test that timed out on me (rust-lang/cargo#17017) - refactor(diag): Pull in the parse pass (rust-lang/cargo#17008) - test(lints): Avoid compiling where possible (rust-lang/cargo#17007) - fix(diag): Report deferred diagnostics like other diagnostics (rust-lang/cargo#16994) - refactor: drop `-Zunstable-options` for `rustdoc --emit` (rust-lang/cargo#17002) - chore(deps): update msrv (1 version) to v1.95 (rust-lang/cargo#17001)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 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.
Summary
upstream/maininto a carry-targeted refresh branch.compiler/rustc_codegen_llvm/src/attributes.rsconflict by accepting upstream's earlierinline_attr(...)placement.default_arm64e_ptrauth_attrs(cx, sess)before target features are converted into LLVM feature strings.Validation
git diff --name-only --diff-filter=Ureturned no files.rg -n "<<<<<<<|=======|>>>>>>>" compiler/rustc_codegen_llvm/src/attributes.rsreturned no matches.git diff --checkgit diff --cached --check -- compiler/rustc_codegen_llvm/src/attributes.rspython x.py check compiler/rustc_codegen_ssa compiler/rustc_codegen_llvm --stage 1Notes
git diff --cached --checkreports whitespace in upstream test fixtures introduced by the upstream merge; the resolved conflict file itself passes the check.