Merged
Conversation
Almost all callers want this anyway, and now we can use it to also return fed bodies
This value represents a quantity of conditions, not an ID, so the new spelling is more appropriate.
Document platform-specifics for `Read` and `Write` of `File`
Make `body_owned_by` return the `Body` instead of just the `BodyId` fixes rust-lang#125677 Almost all `body_owned_by` callers immediately called `body`, too, so just return `Body` directly. This makes the inline-const query feeding more robust, as all calls to `body_owned_by` will now yield a body for inline consts, too. I have not yet figured out a good way to make `tcx.hir().body()` return an inline-const body, but that can be done as a follow-up
…kingjubilee drop_in_place: weaken the claim of equivalence with drop(ptr.read()) The two are *not* semantically equivalent in all cases, so let's not be so definite about this. Fixes rust-lang#112015
…acrum Bump the stage0 compiler to beta.7 (2024-05-26) As mentioned at rust-lang#125016 (comment)
…, r=lqd Fix copy-paste error in `Duration::from_weeks` panic message.
compiletest: Unify `cmd2procres` with `run_command_to_procres` Historical context: I originally added `run_command_to_procres` in rust-lang#112300 and rust-lang#114843, because I didn't like the overly-specific failure message in `cmd2procres`, but at the time I didn't feel confident enough to change the existing code, so I just added my own similar code. Now I'm going back to remove this redundancy by eliminating `cmd2procress`, and adjusting all callers to use a slightly-tweaked `run_command_to_procres` instead.
coverage: Rename MC/DC `conditions_num` to `num_conditions` Updated version of rust-lang#124571, without the other changes that were split out into rust-lang#125108 and rust-lang#125700. This value represents a quantity of conditions, not an ID, so the new spelling is more appropriate. Some of the code touched by this PR could perhaps use some other changes, but I would prefer to keep this PR as a simple renaming and avoid scope creep. `@rustbot` label +A-code-coverage
rustbot
added
A-rustdoc-json
Member
Author
|
@bors r+ rollup=never p=7 |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
Collaborator
|
Finished benchmarking commit (f3ff2f1): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary 2.0%, secondary 3.5%)This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResults (primary 1.5%)This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 665.728s -> 668.976s (0.49%) |
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 13, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#125342 (Document platform-specifics for `Read` and `Write` of `File`) - rust-lang#125711 (Make `body_owned_by` return the `Body` instead of just the `BodyId`) - rust-lang#125739 (drop_in_place: weaken the claim of equivalence with drop(ptr.read())) - rust-lang#125745 (Bump the stage0 compiler to beta.7 (2024-05-26)) - rust-lang#125746 (Fix copy-paste error in `Duration::from_weeks` panic message.) - rust-lang#125753 (compiletest: Unify `cmd2procres` with `run_command_to_procres`) - rust-lang#125754 (coverage: Rename MC/DC `conditions_num` to `num_conditions`) r? `@ghost` `@rustbot` modify labels: rollup
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
10 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:
ReadandWriteofFile#125342 (Document platform-specifics forReadandWriteofFile)body_owned_byreturn theBodyinstead of just theBodyId#125711 (Makebody_owned_byreturn theBodyinstead of just theBodyId)Duration::from_weekspanic message. #125746 (Fix copy-paste error inDuration::from_weekspanic message.)cmd2procreswithrun_command_to_procres#125753 (compiletest: Unifycmd2procreswithrun_command_to_procres)conditions_numtonum_conditions#125754 (coverage: Rename MC/DCconditions_numtonum_conditions)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup