Skip to content

Rollup of 8 pull requests - #31370

Merged
bors merged 18 commits into
rust-lang:masterfrom
Manishearth:rollup
Feb 3, 2016
Merged

Rollup of 8 pull requests#31370
bors merged 18 commits into
rust-lang:masterfrom
Manishearth:rollup

Conversation

barosland others added 18 commits January 19, 2016 06:24
Any documentation comments that contain raw-string-looking sequences may
pretty-print invalid code when expanding them, as the current logic
always uses the `r"literal"` form, without appending any `#`s.
This commit calculates the minimum number of `#`s required to wrap a
comment correctly and appends `#`s appropriately.
Fixesrust-lang#27489.
ConstnessSpace has no knowledge of the type of item it's modifying, so
hide the constness a level up.
This is a behavior that some find confusing, so it deserves its own example.
Fixesrust-lang#31318
The context of the link is `Result` but it points to the docs on `Option`'s `expect`.
…nikomatsakis
Any documentation comments that contain raw-string-looking sequences may pretty-print invalid code when expanding them, as the current logic always uses the `r"literal"` form, without appending any `#`s.
This commit calculates the minimum number of `#`s required to wrap a comment correctly and appends `#`s appropriately.
Fixesrust-lang#27489.
Fixesrust-lang#30632
I'm not sure if this explanation is good enough. If it is, I will add it to filter as well.
… r=alexcrichton
Fixesrust-lang#31098
AFAICT this is the only place where rustdoc explicitly checks if we are on stable before emitting content, so I can't tell if this is the sane way to handle this, or if anything else should be done to make sure that nobody forgets to remove this check when `const` is stabilized.
Small modification to rust-lang#31288. Shows full path and line number for unused error codes.
This is a behavior that some find confusing, so it deserves its own example.
Fixesrust-lang#31318
I think this wording might be a bit strange, but I couldn't come up with anything better. Feedback very welcome.
The context of the link is `Result` but it points to the docs on `Option`'s `expect`.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@Manishearth

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=10

@bors

bors commented Feb 2, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 1a21dab has been approved by Manishearth

@bors

bors commented Feb 3, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1a21dab with merge a992241...

bors added a commit that referenced this pull request Feb 3, 2016
@bors
bors merged commit 1a21dab into rust-lang:masterFeb 3, 2016
@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 rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@Manishearth@rust-highfive@bors@alexcrichton@Centril@barosl@GuillaumeGomez@durka@quodlibetor@steveklabnik@paulsmith