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.

Sign up for GitHub

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

Jump to bottom

Fix typo in task::Waker #65336

Merged
merged 2 commits into from Oct 13, 2019
Merged

Fix typo in task::Waker #65336

merged 2 commits into from Oct 13, 2019

Conversation

ghost
Copy link

@ghost ghost commented Oct 12, 2019

fixes #65323

in libstd/error.rs there are a few mentions of trait@Send and trait@Sync. Are they wrong as well?

@rust-highfive
Copy link
Collaborator

r? @dtolnay

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2019
@ghost ghost changed the title Fix typo Fix typo in task::Waker Oct 12, 2019
@dtolnay
Copy link
Member

dtolnay commented Oct 12, 2019 •
edited
Loading

r? @petrochenkov

This was introduced in https://github.com/rust-lang/rust/pull/62086/files#diff-5573182938909e346b0dfe09641235e1. What does it mean?

@Mark-Simulacrum
Copy link
Member

It appears there are several other cases of it in that diff just searching for trait@ so probably worth fixing those as well...

@petrochenkov
Copy link
Contributor

petrochenkov commented Oct 12, 2019 •
edited
Loading

This was introduced in https://github.com/rust-lang/rust/pull/62086/files#diff-5573182938909e346b0dfe09641235e1. What's the deal?

Undisambiguated Send and Sync referred to both the traits and the derive macros (as intra-doc links), and rustdoc didn't like that and reported ambiguity errors.

Both Send and Sync derives are removed now though, so trait@Send and trait@Sync can be replaced with just Send and Sync.

That said, rustdoc rendering the disambiguated form as literally trait@Send is probably a bug.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2019
@dtolnay dtolnay mentioned this pull request Oct 13, 2019
Closed
@dtolnay
Copy link
Member

dtolnay commented Oct 13, 2019

That said, rustdoc rendering the disambiguated form as literally trait@Send is probably a bug.

Thanks! I filed #65354 to fix the issue in rustdoc.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 13, 2019

📌 Commit 37018e0 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 13, 2019
@Centril
Rollup merge of rust-lang#65336 - BO41:typo, r=petrochenkov
1a2835b 
Fix typo in task::Waker

fixes  rust-lang#65323

in `libstd/error.rs` there are a few mentions of `trait@Send` and `trait@Sync`. Are they wrong as well?
@Centril Centril mentioned this pull request Oct 13, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 13, 2019
@Centril
Rollup merge of rust-lang#65336 - BO41:typo, r=petrochenkov
d10702b 
Fix typo in task::Waker

fixes  rust-lang#65323

in `libstd/error.rs` there are a few mentions of `trait@Send` and `trait@Sync`. Are they wrong as well?
@Centril Centril mentioned this pull request Oct 13, 2019
Merged
bors added a commit that referenced this pull request Oct 13, 2019
@bors
Auto merge of #65388 - Centril:rollup-rhg0dvs, r=Centril
c27f756 
Rollup of 10 pull requests

Successful merges:

 - #65214 (Split non-CAS atomic support off into target_has_atomic_load_store)
 - #65246 (vxWorks: implement get_path() and get_mode() for File fmt::Debug)
 - #65312 (improve performance of signed saturating_mul)
 - #65336 (Fix typo in task::Waker)
 - #65346 (nounwind tests and cleanup)
 - #65347 (Fix #[unwind(abort)] with Rust ABI)
 - #65366 (Implement Error::source on IntoStringError + Remove superfluous cause impls)
 - #65369 (Don't discard value names when using address or memory sanitizer)
 - #65370 (Add `dyn` to `Any` documentation)
 - #65373 (Fix typo in docs for `Rc`)

Failed merges:

r? @ghost
@bors bors merged commit 37018e0 into rust-lang:master Oct 13, 2019
@ghost ghost deleted the typo branch October 14, 2019 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Messed up docs for std::task::Waker
5 participants
@rust-highfive @dtolnay @Mark-Simulacrum @petrochenkov @bors