Rollup of 8 pull requests#101733
Closed
GuillaumeGomez wants to merge 22 commits intorust-lang:masterfrom
Closed
Conversation
And into `AttrAnnotatedTokenTree::Token`. PR rust-lang#99887 did the same thing for `TokenStream`.
These two type names are long and have long matching prefixes. I find
them hard to read, especially in combinations like
`AttrAnnotatedTokenStream::new(vec![AttrAnnotatedTokenTree::Token(..)])`.
This commit renames them as `AttrToken{Stream,Tree}`.
The `AttrTokenStream` is always immediately turned into a `TokenStream`.
`To` is better than `Create` for indicating that this is a non-consuming conversion, rather than creating something out of nothing. And the addition of `Attr` is because the current names makes them sound like they relate to `TokenStream`, but really they relate to `AttrTokenStream`.
Based on some poor suggestions produced when stablizing this lint and running it on `manformed-generics.rs`
…sleywiser Fix `ReErased` leaking into typeck due to `typeof(...)` recovery Fixes rust-lang#100183
…=oli-obk
constify some `CStr` methods
This PR marks the following public APIs as `const`:
```rust
impl CStr {
// feature(const_cstr_from_bytes)
pub const fn from_bytes_until_nul(bytes: &[u8]) -> Result<&CStr, FromBytesUntilNulError>;
pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, FromBytesWithNulError>;
// feature(const_cstr_to_bytes)
pub const fn to_bytes(&self) -> &[u8];
pub const fn to_bytes_with_nul(&self) -> &[u8];
pub const fn to_str(&self) -> Result<&str, str::Utf8Error>;
}
```
r? `@oli-obk` (use of `const_eval_select` :P )
cc `@mina86` (you've asked for this <3 )
…rochenkov Streamline `AttrAnnotatedTokenStream` r? `@petrochenkov`
…avidtwco A `SubstitutionPart` is not considered a deletion if it replaces nothing with nothing Fixes rust-lang#101689
…errors Impove diagnostic for `.await`ing non-futures Strip leading whitespace from the span and use a non-verbose suggestion. fixes rust-lang#101715
…k, r=oli-obk Allow unauthenticated users to add the `const-hack` label Observed in rust-lang#101401. cc `@oli-obk`
…html-check, r=GuillaumeGomez rustdoc: improve rustdoc HTML suggestions handling of nested generics Based on some poor suggestions produced when stablizing this lint and running it on `manformed-generics.rs` in rust-lang#101720
rustbot
added
T-compiler
Member
Author
|
@bors r+ p=5 rollup=never |
Collaborator
bors
added
the
S-waiting-on-bors
Collaborator
|
⌛ Testing commit c8d5541 with merge 2c4563665f068d274f03eedd3d7cd66e220eddb5... |
Collaborator
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Contributor
|
I think it actually might be #101700 that failed here... |
This was referenced Sep 12, 2022
Member
Author
|
Oh thanks! I'll change the status of the other PR then. |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
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
10 participants
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:
ReErasedleaking into typeck due totypeof(...)recovery #100185 (FixReErasedleaking into typeck due totypeof(...)recovery)CStrmethods #100291 (constify someCStrmethods)AttrAnnotatedTokenStream#101602 (StreamlineAttrAnnotatedTokenStream)$crate->$ident:ident->identity_proc_macro!($ident)panics in the proc macro #101211)SubstitutionPartis not considered a deletion if it replaces nothing with nothing #101700 (ASubstitutionPartis not considered a deletion if it replaces nothing with nothing).awaiting non-futures #101723 (Impove diagnostic for.awaiting non-futures)const-hacklabel #101724 (Allow unauthenticated users to add theconst-hacklabel)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup