Rollup of 5 pull requests #134887
Merged
Rollup of 5 pull requests #134887
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
- librustdoc::clean::clean_lifetime doesn't need a mut doc context - librustdoc::clean::normalize doesn't need a mut doc context - move Some() wrapping up into `clean_predicate()` - simplify nested if in librustdoc::clean::record_extern_fqn()
… r=GuillaumeGomez nits: Cleanups in `librustdoc::clean` r? ````@GuillaumeGomez````
docs: inline `alloc::ffi::c_str` types to `alloc::ffi` like rust-lang#134791 but for `alloc` r? ``@tgross35`` ``@notriddle``
Bump compiler cc Fixes rust-lang#134657 Pulls in rust-lang/cc-rs#1330 try-job: x86_64-msvc
…jieyouxu bootstrap: Consolidate the macros for declaring compiletest test suites Instead of using a dizzying assortment of different macros to declare these test suite steps, we can mostly just use one `test!` macro with a few optional named arguments. I'm pretty sure that this doesn't change any behaviour, but please do double-check each of the individual declarations.
bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests` Running `./x check bootstrap` currently doesn't work, because it builds the bootstrap shim binaries with `cfg(test)`, and those binaries can't find a `tests` submodule when they include `shared_helpers.rs` via `#[path]`. This PR fixes that by taking the tests module and moving it to `super::tests::shared_helpers_tests` instead. (The extra `tests` submodule prevents tidy from complaining about unit tests that aren't in a dedicated tests module.) --- It would be nice to also run `./x check bootstrap compiletest` in CI, so that this and rust-lang#134848 don't regress, but I didn't want to bundle that change with this fix.
rustbot
added
S-waiting-on-review
|
@bors r+ rollup=never p=5 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR:
previous master: e7738afb70 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (64feb9b): 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 1.3%, secondary -1.8%)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.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 760.612s -> 761.12s (0.07%) |
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.
Successful merges:
librustdoc::clean#134799 (nits: Cleanups inlibrustdoc::clean)alloc::ffi::c_strtypes toalloc::ffi#134851 (docs: inlinealloc::ffi::c_strtypes toalloc::ffi)./x check bootstrapby movingshared_helpers::tests#134883 (bootstrap: Fix./x check bootstrapby movingshared_helpers::tests)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup