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 10 pull requests #120620

Merged
merged 38 commits into from
Feb 4, 2024
Merged

Rollup of 10 pull requests #120620

merged 38 commits into from
Feb 4, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

usamoi and others added 30 commits January 13, 2024 13:50
`take` + `into_iter` + pattern matching is nicer than `drain` + `map` +
`collect`.
In rust-lang#119972 the code should have become `E0123` rather than `0123`. This
fix doesn't affect the outcome because the proc macro errors out before
the type of the code is checked, but the fix makes the test's code
consistent with other similar code elsewhere.
It contains an `i128`, but when creating them we convert any number
outside the range -100..100 to a string, because Fluent uses an `f64`.
It's all a bit strange.

This commit changes the `i128` to an `i32`, which fits safely in
Fluent's `f64`, and removes the -100..100 range check. This means that
only integers outside the range of `i32` will be converted to strings.
When there are two possibilities, both of which use a `String`, it's
nicer to use a struct than an enum. Especially when mapping the contents
into a tuple.
Some of these tests were originally written as part of a custom `run-make`
test, so at that time they weren't able to use the normal compiletest header
directive parser.

Now that they're properly integrated, there's no need for them to use
`compile-flags` to specify the edition, since they can use `edition` instead.
* Get rid of a typo in a function name
* Rename `currently_processing_generics`: The old name confused me at first since
  I assumed it referred to generic *parameters* when it was in fact referring to
  generic *arguments*. Generics are typically short for generic params.
* Get rid of a few unwraps by properly leveraging slice patterns
It has no effect. Note that `infcx.set_tainted_by_errors()` is still
called, so taintedness is still being propagated.
`BorrowckErrors` stores a mix of error and non-error diags in
`buffered`. As a result, it downgrades `DiagnosticBuilder`s to
`Diagnostic`s, losing the emission guarantees, and so has to use a
`tainted_by_errors` field to record whether an error has occurred.

This commit splits `buffered` into `buffered_errors` and
`buffered_non_errors`, keeping them as `DiagnosticBuilder`s and
preserving the emission guarantees.

This also requires fixing a bunch of incorrect lifetimes on
`DiagnosticBuilder` use points.
And some related things. Because it can hold non-error diagnostics.
`DiagnosticBuilderInner` was removed some time ago.
- `emitted_at` isn't used outside the crate.
- `code` and `messages` are public fields, so there's no point have
  trivial getters/setters for them.
- `suggestions` is public, so the comment about "functionality on
  `Diagnostic`" isn't needed.
`emit_future_breakage` calls
`self.dcx().take_future_breakage_diagnostics()` and then passes the
result to `self.dcx().emit_future_breakage_report(diags)`. This commit
removes the first of these and lets `emit_future_breakage_report` do the
taking.

It also inlines and removes what is left of `emit_future_breakage`,
which has a single call site.
It's only ever used with a reference to `OwnerInfo` as an argument.
Co-authored-by: Michael Goulet <michael@errs.io>
add avx512fp16 to x86 target features

std_detect avx512fp16: rust-lang/stdarch#1508
…ark-Simulacrum

Release notes for 1.76

Cargo, library stabilizations and some cleanups, particularly to future compat, still pending.

cc `@cuviper` `@rust-lang/release`
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=109

@bors
Copy link
Contributor

bors commented Feb 3, 2024

📌 Commit 326839b has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 3, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Feb 3, 2024
@bors
Copy link
Contributor

bors commented Feb 4, 2024

⌛ Testing commit 326839b with merge 16c7256...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#119543 (add avx512fp16 to x86 target features)
 - rust-lang#120004 (Release notes for 1.76)
 - rust-lang#120562 (Revert unsound libcore changes)
 - rust-lang#120566 (coverage: Use normal `edition:` headers in coverage tests)
 - rust-lang#120570 (Suggest changing type to const parameters if we encounter a type in the trait bound position)
 - rust-lang#120571 (Miscellaneous diagnostics cleanups)
 - rust-lang#120573 (Remove `BorrowckErrors::tainted_by_errors`)
 - rust-lang#120592 (Remove unnecessary `.to_string()`/`.as_str()`s)
 - rust-lang#120610 (hir: Remove the generic type parameter from `MaybeOwned`)
 - rust-lang#120616 (Fix ICE on field access on a tainted type after const-eval failure)

Failed merges:

 - rust-lang#120569 (coverage: Improve handling of function/closure spans)

r? `@ghost`
`@rustbot` modify labels: rollup
@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)

@matthiaskrgr
Copy link
Member Author

@bors retry
Error: fatal: unable to access 'https://github.com/rust-lang-ci/rust/': Could not resolve host: github.com

@bors
Copy link
Contributor

bors commented Feb 4, 2024

⌛ Testing commit 326839b with merge 4e3eed4...

@bors
Copy link
Contributor

bors commented Feb 4, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4e3eed4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 4, 2024
@bors bors merged commit 4e3eed4 into rust-lang:master Feb 4, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 4, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119543 add avx512fp16 to x86 target features 688abc1565aff88cdd308321e785bfd37a5784f1 (link)
#120004 Release notes for 1.76 e60bd209c9b1d75dba03ac66fb4703f681856b2c (link)
#120562 Revert unsound libcore changes 4312e3699a896ed799445ee4d7eac5fde4e64663 (link)
#120566 coverage: Use normal edition: headers in coverage tests eaec8314438f17720328c681bfea5e84139ac0ea (link)
#120570 Suggest changing type to const parameters if we encounter a… a5e46233ae76a025281d5b1468523a45d56d196e (link)
#120571 Miscellaneous diagnostics cleanups 8827d11a32287cf48bc753efb9a02b03daca6ae7 (link)
#120573 Remove BorrowckErrors::tainted_by_errors 66fd99c9c2ad2abe5c9b57fb1d253e37889c5b19 (link)
#120592 Remove unnecessary .to_string()/.as_str()s fa27c7ab03ba1aa05f130222e49eaaafb7553ef4 (link)
#120610 hir: Remove the generic type parameter from MaybeOwned 900fa1d274559864a29a8c8d762f9c70391aa554 (link)
#120616 Fix ICE on field access on a tainted type after const-eval … 12d796b1f0e4965cf4aa7c6d6f3702b049aecee6 (link)

previous master: 671eb38a4e

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 (4e3eed4): 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.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

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)
-2.4% [-2.7%, -2.2%] 3
Improvements ✅
(secondary)
-2.6% [-3.2%, -2.1%] 4
All ❌✅ (primary) -2.4% [-2.7%, -2.2%] 3

Cycles

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

Binary size

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.1% [0.0%, 0.2%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.1%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.1%, 0.2%] 4

Bootstrap: 660.289s -> 661.383s (0.17%)
Artifact size: 308.12 MiB -> 308.07 MiB (-0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-sscmbsm branch March 16, 2024 18:19
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. T-libs Relevant to the library 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.