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.

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

Move RST 'data' docstrings inline #17417

Merged

Conversation

MichaelHatherly
Copy link
Member

@MichaelHatherly MichaelHatherly commented Jul 14, 2016

This moves all .. data:: docstrings found in the RST docs into base/ source files, so all docstrings found in the docs are now actual docstrings. This will help with the markdown manual conversion.

Minor formatting changes include addition of some fullstops in several docstrings, and reformatting of the StackTrace docstring.


The only troublesome docstring is build_sysimg found in /devdocs/sysimg.rst, which doesn't actually exist as far as I can see. Not quite sure what to do about that one. "Fixed" now: in 32185da I've included the contrib/build_sysimg.jl file in doc/genstdlib.jl so that it's docstring can live in the appropriate place. Note that build_sysimg won't get called since I've made it's execution conditional on GenStdLib not being defined. If anyone has a more straightforward solution that would be great.

@MichaelHatherly MichaelHatherly added the docs This change adds or pertains to documentation label Jul 14, 2016
@@ -3,7 +3,7 @@ module GenStdLib
import Base.Docs: Binding, DocStr

# Constants.
const DOCSTRING_DIRECTIVE = r"^(.. (function|type|variable):: ).*"
const DOCSTRING_DIRECTIVE = r"^(.. (function|type|variable|data):: ).*"
Copy link
Member

@omus omus Jul 14, 2016

Choose a reason for hiding this comment

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

@MichaelHatherly I originally introduced the variable directive for the purpose of keeping docstrings in sync with the manual. We can definitely have the data directive sync with docstrings but then we should probably remove the variable directive then.

Ref #16328

Copy link
Member Author

@MichaelHatherly MichaelHatherly Jul 14, 2016

Choose a reason for hiding this comment

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

Done in c539a66.

@tkelman
Copy link
Contributor

tkelman commented Jul 15, 2016

does this close #16303 all the way?

to an `Int64`.
"""
Period(v)

# Instant types represent different monotonically increasing timelines
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess these comments are redundant now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, they say pretty much the same thing now. Will remove.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done in 6535f71.

@tkelman
Copy link
Contributor

tkelman commented Jul 15, 2016

LGTM!

This moves all `.. data::` docstrings found in the RST docs into
`base/` source files, so all docstrings found in the docs are now
actual docstrings. This will help with the markdown manual conversion.

Minor formatting changes include addition of some fullstops in
several docstrings, and reformatting of the `StackTrace` docstring.
This moves the docs for `build_sysimg` inline in `contrib/build_sysimg.jl`.
Adds an additional condition to the `build_sysimg.jl` file so that we
can safely include the file in `genstdlib.jl` without a system image being
built unintentionally.
Replace with `.. data::` instead since they are both used for the
same kind of docstrings.
@MichaelHatherly MichaelHatherly force-pushed the mh/missing-const-docs branch from 9e0a4d2 to c539a66 Compare July 15, 2016 05:25
@MichaelHatherly
Copy link
Member Author

Thanks for reviewing, I'll merge once CI is green then.

@MichaelHatherly
Copy link
Member Author

does this close #16303 all the way?

Yes, probably this plus #17369 is enough to close #16303 for the moment.

@tkelman
Copy link
Contributor

tkelman commented Jul 15, 2016

actually I think threadcall is still undocumented

@MichaelHatherly MichaelHatherly merged commit 54a6490 into JuliaLang:master Jul 15, 2016
@MichaelHatherly MichaelHatherly deleted the mh/missing-const-docs branch July 15, 2016 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs This change adds or pertains to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants