Skip to content

Rollup of 8 pull requests - #100378

Merged
bors merged 19 commits into
rust-lang:masterfrom
compiler-errors:rollup-8vzsd92
Aug 10, 2022
Merged

Rollup of 8 pull requests#100378
bors merged 19 commits into
rust-lang:masterfrom
compiler-errors:rollup-8vzsd92

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

marysakaand others added 19 commits August 9, 2022 11:04
Also refactor iOS, watchOS and tvOS common code.
bootstrap panic when running x fmt --check.
running x fmt --check
This issue was most likely fixed by rust-lang#93805.
For some reason, adding some text to match against makes this test pass.
Before, when it was *more* general, it was failing!
This seems very likely to be a bug in htmldocck, which I'm going to
investigate.
…rochenkov
Add support for link-flavor rust-lld for macOS
Also refactor iOS, watchOS and tvOS common code.
The ``-arch`` argument was moved to the ``apple_base`` module instead of the target definitions for macOS.
As ld64 requires ``-syslibroot`` to be passed, ``add_apple_sdk`` was modified accordingly.
…r=eddyb
Remove logic related to deprecated nvptx-nvidia-cuda (32-bit) target
As described in the MCP rust-lang/compiler-team#496 (comment)
r? ``@eddyb``
Fixes bootstrap panic when running x fmt --check
closesrust-lang#100258 wherein bootstrap panics when running x fmt --check. Fixed by replacing resume_unwind in rust-lang#98994. with process::exit.
…son, r=lcnr
Refactor: remove a type string comparison
Fix doc links in core::time::Duration::as_secs
… r=lcnr
Special-case references to leafs in valtree pretty-printing
Fixesrust-lang#100313
…checked-rt-impl, r=scottmcm
Inline CStr::from_bytes_with_nul_unchecked::rt_impl
Currently `CStr::from_bytes_with_nul_unchecked::rt_impl` is not being inlined. The following function:
```rust
pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) {
CStr::from_bytes_with_nul_unchecked(bytes);
}
```
Outputs the following assembly on current nightly
```asm
example::from_bytes_with_nul_unchecked:
jmp qword ptr [rip + _ZN4core3ffi5c_str4CStr29from_bytes_with_nul_unchecked7rt_impl17h026f29f3d6a41333E@GOTPCREL]
```
Meanwhile on beta this provides the following assembly:
```asm
example::from_bytes_with_nul_unchecked:
ret
```
This pull request adds `#[inline]` annotation to`rt_impl` to fix a code generation regression for `CStr::from_bytes_with_nul_unchecked`.
@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 10, 2022
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=5

@bors

bors commented Aug 10, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit eff71b9 has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 10, 2022
@bors

bors commented Aug 10, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit eff71b9 with merge 7bc32fa...

@bors

bors commented Aug 10, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 7bc32fa to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 10, 2022
@bors
bors merged commit 7bc32fa into rust-lang:masterAug 10, 2022
@rustbotrustbot added this to the 1.65.0 milestone Aug 10, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (7bc32fa): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: ❌ relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions ❌
(primary)
2.2%2.2%1
Regressions ❌
(secondary)
N/AN/A0
Improvements ✅
(primary)
N/AN/A0
Improvements ✅
(secondary)
N/AN/A0
All ❌✅ (primary)2.2%2.2%1

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions ❌
(primary)
2.5%2.7%2
Regressions ❌
(secondary)
N/AN/A0
Improvements ✅
(primary)
-2.4%-2.4%1
Improvements ✅
(secondary)
N/AN/A0
All ❌✅ (primary)0.8%2.7%3

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change2

  2. number of relevant changes2

@compiler-errors
compiler-errors deleted the rollup-8vzsd92 branch August 11, 2023 20:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@compiler-errors@bors@rust-timer@rustbot@marysaka@kjetilkjeka@b-naber@shourya5@TaKO8Ki@camelid@theli-ua@sugar700