Skip to content

Rollup of 6 pull requests - #87698

Merged
bors merged 13 commits into
rust-lang:masterfrom
camsteffen:rollup-yvjfc26
Aug 2, 2021
Merged

Rollup of 6 pull requests#87698
bors merged 13 commits into
rust-lang:masterfrom
camsteffen:rollup-yvjfc26

Conversation

@camsteffen

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

FabianWolffand others added 13 commits July 31, 2021 15:21
When this gate is enabled, explicit generic arguments can be specified even
if `impl Trait` is used in argument position. Generic arguments can only be
specified for explicit generic parameters but not for the synthetic type
parameters from `impl Trait`
…ackh726
Implement a `explicit_generic_args_with_impl_trait` feature gate
Implements rust-lang#83701
When this gate is enabled, explicit generic arguments can be specified even if `impl Trait` is used in argument position. Generic arguments can only be specified for explicit generic parameters but not for the synthetic type parameters from `impl Trait`
So code like this will be accepted:
```rust
#![feature(explicit_generic_args_with_impl_trait)]
fn foo<T: ?Sized>(_f: impl AsRef<T>) {}
fn main() {
foo::<str>("".to_string());
}
```
…oc, r=scottmcm
Add documentation for the order of Option and Result
This resolves issue rust-lang#87238.
Fix invalid suggestions for non-ASCII characters in byte constants
Fixesrust-lang#87397.
Inline some macros
I factored out some macros that are not really necessary.
…, r=Mark-Simulacrum
Add missing "allocated object" doc link to `<*mut T>::add`
The portion of the documentation expecting the link was already there, but it was rendered as "[allocated object]". The added reference is just copied from the documentation for `<*const T>::add`.
@rustbotrustbot added the rollup A PR which is a rollup label Aug 2, 2021
@camsteffen

Copy link
Copy Markdown
ContributorAuthor

@bors r+ rollup=never p=6

@bors

bors commented Aug 2, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 7fc26e9 has been approved by camsteffen

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 2, 2021
@bors

bors commented Aug 2, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7fc26e9 with merge 6be8a06...

@bors

bors commented Aug 2, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: camsteffen
Pushing 6be8a06 to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@camsteffen@bors@rustbot@FabianWolff@estebank@jesyspa@sharnoff@nbdd0121