Skip to content

Rollup of 5 pull requests #119190

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 17 commits into from
Dec 21, 2023
Merged

Rollup of 5 pull requests #119190

merged 17 commits into from
Dec 21, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

onur-ozkan and others added 17 commits December 19, 2023 18:09
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
In config.toml we use `rust-analyzer-proc-macro-srv` for building `rust-analyzer-proc-macro-srv`,
however, when we attempt to build it from the terminal, this cannot be used because we need to
use the actual path, which is `proc-macro-srv-cli`. Remapping should end this confusion with
improving the development experience.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
…lbini

Add release notes for 1.75.0

cc `@rust-lang/release`
r? `@Mark-Simulacrum`
…ulacrum

don't build `rust-analyzer-proc-macro-srv` on def config

Should be very easy to understand when reviewing commit-by-commit.

Blocker for rust-lang#118861
Simple modification of `non_lifetime_binders`'s diagnostic information to adapt to type binders

fixes rust-lang#119067

Replace diagnostic information "lifetime bounds cannot be used in this context" to "bounds cannot be used in this context".

```rust
#![allow(incomplete_features)]
#![feature(non_lifetime_binders)]

trait Trait {}

trait Trait2
    where for <T: Trait> ():{}
//~^ ERROR bounds cannot be used in this context
```
…-name-error, r=lqd

Fix name error in aarch64_apple_watchos tier 3 target

fix llvm_target wrong name `aarch-apple-watchos` to `aarch64-apple-watchos`, sorry for my mistake.

previous pr: rust-lang#119074

r? compiler-team
…nur-ozkan

Update sysinfo version to 0.30.0

Following last `sysinfo` update. Nothing much needs to be changed here apparently.

r? `@onur-ozkan`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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-release Relevant to the release subteam, 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 Dec 21, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 21, 2023

📌 Commit 6516e59 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 21, 2023
@bors
Copy link
Collaborator

bors commented Dec 21, 2023

⌛ Testing commit 6516e59 with merge d623b57...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#118729 (Add release notes for 1.75.0)
 - rust-lang#119124 (don't build `rust-analyzer-proc-macro-srv` on def config )
 - rust-lang#119154 (Simple modification of `non_lifetime_binders`'s diagnostic information to adapt to type binders)
 - rust-lang#119176 (Fix name error in aarch64_apple_watchos tier 3 target)
 - rust-lang#119182 (Update sysinfo version to 0.30.0)

r? `@ghost`
`@rustbot` modify labels: rollup
@pietroalbini
Copy link
Member

@bors retry

Yield priority to stable release.

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented Dec 21, 2023

⌛ Testing commit 6516e59 with merge 3d0e6be...

@bors
Copy link
Collaborator

bors commented Dec 21, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3d0e6be to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 21, 2023
@bors bors merged commit 3d0e6be into rust-lang:master Dec 21, 2023
@rustbot rustbot added this to the 1.77.0 milestone Dec 21, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#118729 Add release notes for 1.75.0 1e95d3fa62fc60f4707e9abcbe42da38b143090a (link)
#119124 don't build rust-analyzer-proc-macro-srv on def config 6360c9cdd6b8ee5ea9eb1e98bb998c929cda963e (link)
#119154 Simple modification of non_lifetime_binders's diagnostic … 116d32bd76737fcee76b966f5ab8a138ef1c8daf (link)
#119176 Fix name error in aarch64_apple_watchos tier 3 target 88560cf0e4335da93964792a39ccf40ffc25b929 (link)
#119182 Update sysinfo version to 0.30.0 03f878d2edbe9a5d614a0e0b0bab3ea0cba04afc (link)

previous master: 767453eb7c

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3d0e6be): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.3% [-1.3%, -1.3%] 1
All ❌✅ (primary) - - 0

Cycles

Results

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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 673.174s -> 674.232s (0.16%)
Artifact size: 312.82 MiB -> 312.80 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-jvl8vkj branch March 16, 2024 18:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-release Relevant to the release subteam, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.