Merged
Conversation
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use |
Collaborator
|
|
rustbot
added
A-meta
Member
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127474 (doc: Make block of inline Deref methods foldable) - rust-lang#129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver) - rust-lang#129738 (`rustc_mir_transform` cleanups) - rust-lang#129793 (add extra linebreaks so rustdoc can identify the first sentence) - rust-lang#129804 (Fixed some typos in the standard library documentation/comments) - rust-lang#129837 (Actually parse stdout json, instead of using hacky contains logic.) - rust-lang#129842 (Fix LLVM ABI NAME for riscv64imac-unknown-nuttx-elf) - rust-lang#129843 (Mark myself as on vacation for triagebot) - rust-lang#129858 (Replace walk with visit so we dont skip outermost expr kind in def collector) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) - rust-lang#129868 (Remove kobzol vacation status) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127474 (doc: Make block of inline Deref methods foldable) - rust-lang#129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver) - rust-lang#129738 (`rustc_mir_transform` cleanups) - rust-lang#129793 (add extra linebreaks so rustdoc can identify the first sentence) - rust-lang#129804 (Fixed some typos in the standard library documentation/comments) - rust-lang#129837 (Actually parse stdout json, instead of using hacky contains logic.) - rust-lang#129842 (Fix LLVM ABI NAME for riscv64imac-unknown-nuttx-elf) - rust-lang#129843 (Mark myself as on vacation for triagebot) - rust-lang#129858 (Replace walk with visit so we dont skip outermost expr kind in def collector) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) - rust-lang#129868 (Remove kobzol vacation status) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127474 (doc: Make block of inline Deref methods foldable) - rust-lang#129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver) - rust-lang#129738 (`rustc_mir_transform` cleanups) - rust-lang#129793 (add extra linebreaks so rustdoc can identify the first sentence) - rust-lang#129804 (Fixed some typos in the standard library documentation/comments) - rust-lang#129837 (Actually parse stdout json, instead of using hacky contains logic.) - rust-lang#129842 (Fix LLVM ABI NAME for riscv64imac-unknown-nuttx-elf) - rust-lang#129843 (Mark myself as on vacation for triagebot) - rust-lang#129858 (Replace walk with visit so we dont skip outermost expr kind in def collector) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) - rust-lang#129868 (Remove kobzol vacation status) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127474 (doc: Make block of inline Deref methods foldable) - rust-lang#129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver) - rust-lang#129738 (`rustc_mir_transform` cleanups) - rust-lang#129793 (add extra linebreaks so rustdoc can identify the first sentence) - rust-lang#129804 (Fixed some typos in the standard library documentation/comments) - rust-lang#129837 (Actually parse stdout json, instead of using hacky contains logic.) - rust-lang#129842 (Fix LLVM ABI NAME for riscv64imac-unknown-nuttx-elf) - rust-lang#129843 (Mark myself as on vacation for triagebot) - rust-lang#129858 (Replace walk with visit so we dont skip outermost expr kind in def collector) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) - rust-lang#129868 (Remove kobzol vacation status) r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
|
☔ The latest upstream changes (presumably #129873) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Kobzol
force-pushed
the
kobzol-vacation-remove
branch
from
5e77c09 to
fa77b9d
Compare
Member
Author
|
Rebased. @bors r=lqd |
Collaborator
bors
added
S-waiting-on-bors
Member
Author
|
@bors rollup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#129152 (custom/external clippy support for bootstrapping) - rust-lang#129529 (Add test to build crates used by r-a on stable) - rust-lang#129829 (Make decoding non-optional `LazyArray` panic if not set) - rust-lang#129860 (update `object` dependency to remove duplicate `wasmparser`) - rust-lang#129875 (chore: Fix typos in 'compiler' (batch 1)) - rust-lang#129877 (chore: Fix typos in 'compiler' (batch 2)) - rust-lang#129878 (chore: Fix typos in 'compiler' (batch 3)) - rust-lang#129891 (Do not request sanitizers for naked functions) - rust-lang#129892 (Clarify language around ptrs in slice::raw) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) - rust-lang#129868 (Remove kobzol vacation status) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2024
…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#129748 (Box validity: update for new zero-sized rules) - rust-lang#129829 (Make decoding non-optional `LazyArray` panic if not set) - rust-lang#129856 (compiler_fence documentation: emphasize synchronization, not reordering) - rust-lang#129868 (Remove kobzol vacation status) - rust-lang#129875 (chore: Fix typos in 'compiler' (batch 1)) - rust-lang#129877 (chore: Fix typos in 'compiler' (batch 2)) - rust-lang#129878 (chore: Fix typos in 'compiler' (batch 3)) - rust-lang#129890 (Remove stray word in a comment) - rust-lang#129892 (Clarify language around ptrs in slice::raw) - rust-lang#129905 (mailmap: add new email for davidtwco) - rust-lang#129906 (mailmapper?) - rust-lang#129907 (Fix compile error in solid's remove_dir_all) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 3, 2024
Rollup merge of rust-lang#129868 - Kobzol:kobzol-vacation-remove, r=lqd Remove kobzol vacation status Conflicts with rust-lang#129843, so should be merged after it.
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
6 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.
Conflicts with #129843, so should be merged after it.