Rollup of 4 pull requests#125643
Closed
matthiaskrgr wants to merge 22 commits intorust-lang:masterfrom
Closed
Conversation
- Restrict const-anon exception diag to relevant places - Invoke bounds (and type-inference) in non_local_defs - Specialize diagnostic for impl without Trait
- Remove wrong exception text for non-local macro_rules! - Simplify anonymous const exception note
…=estebank Improve diagnostic output the `non_local_definitions` lint This PR improves (or at least tries to improve) the diagnostic output the `non_local_definitions` lint, by simplifying the wording, by adding a "sort of" explanation of bounds interaction that leak the impl... This PR is best reviewed commit by commit and is voluntarily made a bit vague as to have a starting point to improve on. Related to https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/non_local_defs.20wording.20improvements Fixes rust-lang#125068 Fixes rust-lang#124396 cc `@workingjubilee` r? `@estebank`
…, r=compiler-errors `-Znext-solver`: eagerly normalize when adding goals fixes rust-lang#125269. I am not totally with this fix and going to keep this open until we have a more general discussion about how to handle hangs caused by lazy norm in the new solver.
Stabilise `IpvNAddr::{BITS, to_bits, from_bits}` (`ip_bits`)
This completed FCP in rust-lang#113744. (Closes rust-lang#113744.)
Stabilises the following APIs:
```rust
impl Ipv4Addr {
pub const BITS: u32 = 32;
pub const fn from_bits(bits: u32) -> Ipv4Addr;
pub const fn to_bits(self) -> u32;
}
impl Ipv6Addr {
pub const BITS: u32 = 128;
pub const fn from_bits(bits: u128) -> Ipv4Addr;
pub const fn to_bits(self) -> u128;
}
```
…, r=lcnr Make `ProofTreeBuilder` actually generic over `Interner` Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`. r? lcnr
Member
Author
|
@bors r+ rollup=never p=4 |
Collaborator
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Member
|
@bors r- |
Member
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
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:
non_local_definitionslint #125089 (Improve diagnostic output thenon_local_definitionslint)-Znext-solver: eagerly normalize when adding goals #125343 (-Znext-solver: eagerly normalize when adding goals)IpvNAddr::{BITS, to_bits, from_bits}(ip_bits) #125551 (StabiliseIpvNAddr::{BITS, to_bits, from_bits}(ip_bits))ProofTreeBuilderactually generic overInterner#125598 (MakeProofTreeBuilderactually generic overInterner)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup