Skip to content

Audit traits and (partially) trait objects sections of Reference#25308

Closed
nham wants to merge 2 commits into
rust-lang:masterfrom
nham:audit_ref_traits
Closed

Audit traits and (partially) trait objects sections of Reference#25308
nham wants to merge 2 commits into
rust-lang:masterfrom
nham:audit_ref_traits

Conversation

@nham
Copy link
Copy Markdown
Contributor

@nham nham commented May 11, 2015

cc #16676

@rust-highfive
Copy link
Copy Markdown
Contributor

rust-highfive commented May 11, 2015

r? @alexcrichton

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

@nham nham mentioned this pull request May 11, 2015
Closed
alexcrichton
alexcrichton reviewed May 12, 2015
View reviewed changes
Comment thread src/doc/reference.md Outdated
Copy link
Copy Markdown
Member

@alexcrichton alexcrichton May 12, 2015

Choose a reason for hiding this comment

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

This sentence threw me for a bit of a spin, I think the grammar around "on an trait objects is" may need to be updated slightly, but it was a little odd talking about late bindings, then early bindings, then back to late bindings. Perhaps this could be restructured a bit?

Copy link
Copy Markdown
Contributor Author

@nham nham May 13, 2015

Choose a reason for hiding this comment

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

I've made an attempt at improving this.

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented May 12, 2015

Thanks for the edits! I think there's an interesting balance in the reference manual between defining what you can do as well as being a bit tutorial-like (because the book I believe also covers much of this material), but I think the updates here are fine regardless.

@steveklabnik
Copy link
Copy Markdown
Contributor

steveklabnik commented May 12, 2015

Same.

@bors
Copy link
Copy Markdown
Collaborator

bors commented May 13, 2015

☔ The latest upstream changes (presumably #25340) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Copy Markdown
Contributor

steveklabnik commented May 13, 2015

@nham this still can't merge, would you mind rebasing?

@nham
Copy link
Copy Markdown
Contributor Author

nham commented May 13, 2015

@steveklabnik On it.

The issue I'm seeing now is that @nikomatsakis made big changes to the "Traits" section as well, and in looking over his changes I'm now confused about the terminology here. My reading of Niko's changes is that:

  • a trait consists entirely of some collection of associated items (functions/types/constants/blah)
  • associated functions that take a self parameter are called "methods"
  • associated functions that do not take a self parameter are called "static methods"

This doesn't seem to be consistent with @alexcrichton's suggestion that "associated function" is the new name for a static method.

@nham nham force-pushed the audit_ref_traits branch from f25505e to b2f486f Compare May 13, 2015 04:35
@nham
Copy link
Copy Markdown
Contributor Author

nham commented May 13, 2015

@steveklabnik I've rebased now.

@nikomatsakis
Copy link
Copy Markdown
Contributor

nikomatsakis commented May 13, 2015

I don't particularly like the term "static method" -- if I used it, it was unintentional. I think associated fns are better, with methods being the term for a fn that takes a self argument.

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented May 13, 2015

It looks like there's not any current mentions of a "static method", so this all looks good to me, thanks @nham!

@bors: r+ b2f486f

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented May 13, 2015

@bors: rollup

Manishearth added a commit to Manishearth/rust that referenced this pull request May 13, 2015
@Manishearth
Rollup merge of rust-lang#25308 - nham:audit_ref_traits, r=alexcrichton
5173be1 
cc rust-lang#16676
@Manishearth Manishearth mentioned this pull request May 13, 2015
Closed
@bors
Copy link
Copy Markdown
Collaborator

bors commented May 13, 2015

⌛ Testing commit b2f486f with merge 0835189...

bors added a commit that referenced this pull request May 13, 2015
@bors
Auto merge of #25308 - nham:audit_ref_traits, r=alexcrichton
0835189 
cc #16676
@bors
Copy link
Copy Markdown
Collaborator

bors commented May 13, 2015

💔 Test failed - auto-mac-64-opt

steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 13, 2015
@steveklabnik
Rollup merge of rust-lang#25308 - nham:audit_ref_traits, r=alexcrichton
522ee20 
cc rust-lang#16676
@steveklabnik steveklabnik mentioned this pull request May 13, 2015
Merged
@nham nham force-pushed the audit_ref_traits branch from b2f486f to 6ca22f8 Compare May 13, 2015 21:04
@nham
Copy link
Copy Markdown
Contributor Author

nham commented May 13, 2015

Sorry, this was failing a test due to one of the code blocks. I think I've fixed it.

@steveklabnik
Copy link
Copy Markdown
Contributor

steveklabnik commented May 13, 2015

this needs 87c903a to fix it

@steveklabnik
Copy link
Copy Markdown
Contributor

steveklabnik commented May 13, 2015

(i've added it to the rollup)

bors added a commit that referenced this pull request May 13, 2015
@bors
Auto merge of #25384 - steveklabnik:rollup, r=steveklabnik
5a341ec 
- Successful merges: #25308, #25360, #25363, #25365, #25371, #25372, #25376, #25379, #25382
- Failed merges:
@nham
Copy link
Copy Markdown
Contributor Author

nham commented May 13, 2015

Oops, I shouldn't have squashed. Sorry, and thanks.

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented May 13, 2015

@bors: r+ 6ca22f8

No worries!

@bors
Copy link
Copy Markdown
Collaborator

bors commented May 13, 2015

☔ The latest upstream changes (presumably #25384) made this pull request unmergeable. Please resolve the merge conflicts.

@nham
Copy link
Copy Markdown
Contributor Author

nham commented May 13, 2015

Looks like this was merged in #25384 . Closing.

@nham nham closed this May 13, 2015
@nham nham mentioned this pull request May 14, 2015
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request May 14, 2015
@Manishearth
Rollup merge of rust-lang#25391 - nham:ref_rfc255_link, r=alexcrichton
3ce4b99 
This somehow got left out of rust-lang#25308
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nham @rust-highfive @alexcrichton @steveklabnik @bors @nikomatsakis