Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #134559

Merged
merged 13 commits into from
Dec 20, 2024
Merged

Rollup of 5 pull requests #134559

merged 13 commits into from
Dec 20, 2024

Conversation

dianqk
Copy link
Member

@dianqk dianqk commented Dec 20, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

uwaces and others added 13 commits December 16, 2024 23:34
There is a logical issue around what counts as leading white-space.
There is code which does a subtraction assuming that no errors will be reported
inside the leading whitespace. However we compute the length of
that whitespace with std::char::is_whitespace and not
rustc_lexer::is_whitespace. The former will include a no-break space while
later will excluded it. We can only safely make the assumption that no errors
will be reported  in whitespace if it is all "Rust Standard" whitespace.
Indeed an error does occur in unicode whitespace if it contains a no-break
space.
During coverage instrumentation, this variable always holds the coverage graph,
which is a simplified view of the MIR control-flow graph. The new name is
clearer in context, and also shorter.
…avidtwco

Fix logical error with what text is considered whitespace.

There appears to be a logical issue around what counts as leading white-space. There is code which does a subtraction assuming that no errors will be reported inside the leading whitespace. However we compute the length of that whitespace with std::char::is_whitespace and not rustc_lexer::is_whitespace. The former will include a no-break space while later will excluded it. We can only safely make the assumption that no errors will be reported  in whitespace if it is all "Rust Standard" whitespace. Indeed an error does occur in unicode whitespace if it contains a no-break space. In that case the subtraction will cause a ICE (for a compiler in debug mode) as described in rust-lang#132918.
…eyouxu

Improve dependency_format a bit

* Make `DependencyList` an `IndexVec` rather than emulating one using a `Vec` (which was off-by-one as LOCAL_CRATE was intentionally skipped)
* Update some comments for the fact that we now use `#[global_allocator]` rather than `extern crate alloc_system;`/`extern crate alloc_jemalloc;` for specifying which allocator to use. We still use a similar mechanism for the panic runtime, so refer to the panic runtime in those comments instead.
* An unrelated refactor to `create_and_enter_global_ctxt` I forgot to include in rust-lang#134302. This refactor is too small to be worth it's own PR.
…obzol

ci: use ubuntu `24` instead of `latest`
coverage: Rename `basic_coverage_blocks` to just `graph`

During coverage instrumentation, this variable always holds the current function's coverage graph, which is a simplified view of its MIR control-flow graph. The new name is clearer in context, and also shorter.

---

This is purely a rename, so there is no functional change.
…=oli-obk

add member constraints comment

r? `@oli-obk` i guess
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 20, 2024
@dianqk
Copy link
Member Author

dianqk commented Dec 20, 2024

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 20, 2024

📌 Commit 594e74d has been approved by DianQK

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 20, 2024
@pietroalbini
Copy link
Member

@bors treeclosee=1000

Doing bors maintenance.

@pietroalbini
Copy link
Member

@bors treeclose=1000

@pietroalbini
Copy link
Member

@bors treeclosed=1000

I swear I know how to use bors.

@pietroalbini
Copy link
Member

@bors treeclosed-

Redeploy happened, let's see if it handles this PR correctly.

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134366 (Fix logical error with what text is considered whitespace.)
 - rust-lang#134514 (Improve dependency_format a bit)
 - rust-lang#134519 (ci: use ubuntu `24` instead of `latest`)
 - rust-lang#134551 (coverage: Rename `basic_coverage_blocks` to just `graph`)
 - rust-lang#134553 (add member constraints comment)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Dec 20, 2024

⌛ Testing commit 594e74d with merge 46245e3...

@pietroalbini
Copy link
Member

Need to do another bors deploy, sorry!

@bors treeclosed=1000 retry

@pietroalbini
Copy link
Member

Deployed!

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Dec 20, 2024

⌛ Testing commit 594e74d with merge fcc1615...

@bors
Copy link
Contributor

bors commented Dec 20, 2024

☀️ Test successful - checks-actions
Approved by: DianQK
Pushing fcc1615 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 20, 2024
@bors bors merged commit fcc1615 into rust-lang:master Dec 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 20, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134366 Fix logical error with what text is considered whitespace. 3d938662d9ea1a2bd5e89c5dd12f397b9713bffb (link)
#134514 Improve dependency_format a bit 08f8f9da1d958c21afd26244b6bb737475df000c (link)
#134519 ci: use ubuntu 24 instead of latest 0926f65b259f3163f739f1c8e8406f2935c430ff (link)
#134551 coverage: Rename basic_coverage_blocks to just graph 9d71120304e8d2c5615712c6941f572ff8448148 (link)
#134553 add member constraints comment 7d52741a2291257112a46ba2dd282b136949d776 (link)

previous master: 8a1f8039a7

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 (fcc1615): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.5% [-1.4%, -0.1%] 17
Improvements ✅
(secondary)
-3.1% [-4.7%, -1.5%] 3
All ❌✅ (primary) -0.5% [-1.4%, -0.1%] 17

Max RSS (memory usage)

Results (primary -2.2%, secondary -5.0%)

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)
1.0% [1.0%, 1.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.9% [-3.2%, -2.2%] 5
Improvements ✅
(secondary)
-5.0% [-6.8%, -3.2%] 2
All ❌✅ (primary) -2.2% [-3.2%, 1.0%] 6

Cycles

Results (primary -2.4%, secondary -5.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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-2.4%, -2.4%] 1
Improvements ✅
(secondary)
-5.8% [-6.3%, -5.3%] 2
All ❌✅ (primary) -2.4% [-2.4%, -2.4%] 1

Binary size

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

Bootstrap: 769.09s -> 767.743s (-0.18%)
Artifact size: 330.24 MiB -> 330.26 MiB (0.01%)

@dianqk dianqk deleted the rollup-22iraj9 branch December 20, 2024 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants