Skip to content

Comments

Arc make_mut doc comment spelling correction.#97603

Merged
bors merged 3 commits intorust-lang:masterfrom
ximon18:arc-make-mut-spelling-correction
Jun 2, 2022
Merged

Arc make_mut doc comment spelling correction.#97603
bors merged 3 commits intorust-lang:masterfrom
ximon18:arc-make-mut-spelling-correction

Conversation

@ximon18
Copy link
Contributor

@ximon18 ximon18 commented May 31, 2022

No description provided.

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label May 31, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented May 31, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive
Copy link
Contributor

rust-highfive commented May 31, 2022

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @joshtriplett (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2022
GuillaumeGomez
GuillaumeGomez reviewed Jun 1, 2022
View reviewed changes
library/alloc/src/sync.rs Outdated
///
/// See also [`get_mut`], which will fail rather than cloning the inner value
/// or diassociating [`Weak`] pointers.
/// or disassociating [`Weak`] pointers.
Copy link
Member

@GuillaumeGomez GuillaumeGomez Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be dissociating?

Copy link
Contributor Author

@ximon18 ximon18 Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The paragraph above also says "disassociated" so this change would be consistent with that. From Googling I see that the two terms are synonyms having the same meaning and also being about the same age. Personally I don't use "dissociate" but instead use "disassociate", perhaps that's just what I grew up with in England, I assumed, wrongly it seems, that "dissociate" was American English

Copy link
Member

@GuillaumeGomez GuillaumeGomez Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh well, today both learned. I didn't know they meant the same thing or that "disassociate" existed ("disassociate" is actually closer to french so makes more sense to me ;) ).

GuillaumeGomez
GuillaumeGomez reviewed Jun 1, 2022
View reviewed changes
library/alloc/src/sync.rs Outdated
///
/// However, if there are no other `Arc` pointers to this allocation, but some [`Weak`]
/// pointers, then the [`Weak`] pointers will be disassociated and the inner value will not
/// pointers, then the [`Weak`] pointers will be disociated and the inner value will not
Copy link
Member

@GuillaumeGomez GuillaumeGomez Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing an s. ;)

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Jun 2, 2022

@bors r=GuillaumeGomez rollup

@bors
Copy link
Collaborator

bors commented Jun 2, 2022

📌 Commit f81269f has been approved by GuillaumeGomez

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 2, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Jun 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2022
@bors
Auto merge of rust-lang#97644 - Dylan-DPC:rollup-xaeio91, r=Dylan-DPC
9598b4b 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#96894 (Apply track_caller to closure on `expect_non_local()`)
 - rust-lang#97023 (Diagnose anonymous lifetimes errors more uniformly between async and regular fns)
 - rust-lang#97397 (Stabilize `box_into_pin`)
 - rust-lang#97587 (Migrate more diagnostics to use the `#[derive(SessionDiagnostic)]`)
 - rust-lang#97603 (Arc make_mut doc comment spelling correction.)
 - rust-lang#97635 (Fix file metadata documentation for Windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eb642d4 into rust-lang:master Jun 2, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 2, 2022
@ximon18 ximon18 deleted the arc-make-mut-spelling-correction branch June 2, 2022 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez left review comments

Assignees

@joshtriplett joshtriplett

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.63.0

Development

Successfully merging this pull request may close these issues.

7 participants

@ximon18 @rust-highfive @Dylan-DPC @bors @GuillaumeGomez @joshtriplett @rustbot