Skip to content

Rollup of 5 pull requests - #51287

Merged
bors merged 14 commits into
rust-lang:masterfrom
Mark-Simulacrum:rollup
Jun 2, 2018
Merged

Rollup of 5 pull requests#51287
bors merged 14 commits into
rust-lang:masterfrom
Mark-Simulacrum:rollup

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

estebankand others added 14 commits May 27, 2018 13:30
When encountering an unexisting method for a given trait where an
associated function has the same name, suggest using the appropriate
syntax, instead of using `help` text.
When only one candidate is found, do not call it "candidate #1", just
call it "the candidate".
The old text was: "The precise definition is: a type T is Sync if &T is Send."
Since we've also got
```
impl<'a, T> Send for &'a T where
T: Sync + ?Sized,
```
I purpose we can change the `if` to `if and only if` to make it more precise.
This is stable, and so no longer needed
Tweak output on E0599 for assoc fn used as method
- Use suggestion instead of `help` when possible
- Add primary span label
- Remove incorrect `help` suggestion using incorrect syntax
- Do not refer to only one possible candidate as `candidate #1`, refer to it as `the candidate`
Replace `if` with `if and only if` in the definition dox of `Sync`
The old text was: "The precise definition is: a type `T` is `Sync` if `&T` is Send."
Since we've also got
```
impl<'a, T> Send for &'a T
where
T: Sync + ?Sized,
```
I purpose we can change the `if` to `if and only if` to make it more precise.
…ce, r=QuietMisdreavus
Add missing whitespace in num example
r? @QuietMisdreavus
…=QuietMisdreavus
Remove feature flag from fs::read_to_string example
This is stable, and so no longer needed
…s, r=Mark-Simulacrum
Pull 1.26.2 release notes into master
None
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2018
@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=10

r? @Mark-Simulacrum

@bors

bors commented Jun 1, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit c8f9b7c has been approved by Mark-Simulacrum

@borsbors 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 Jun 1, 2018
@bors

bors commented Jun 2, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c8f9b7c with merge 5f7c9da...

bors added a commit that referenced this pull request Jun 2, 2018
Rollup of 5 pull requests
Successful merges:
- #51135 (Tweak output on E0599 for assoc fn used as method)
- #51152 (Replace `if` with `if and only if` in the definition dox of `Sync`)
- #51262 (Add missing whitespace in num example)
- #51272 (Remove feature flag from fs::read_to_string example)
- #51286 (Pull 1.26.2 release notes into master)
Failed merges:
@bors

bors commented Jun 2, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 5f7c9da to master...

@bors
bors merged commit c8f9b7c into rust-lang:masterJun 2, 2018
@borsbors mentioned this pull request Jun 2, 2018
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

9 participants

@Mark-Simulacrum@rust-highfive@bors@pnkfelix@Centril@estebank@GuillaumeGomez@crlf0710@steveklabnik