Skip to content

Rollup of 19 pull requests - #43802

Closed
MaloJaffre wants to merge 49 commits into
rust-lang:masterfrom
MaloJaffre:rollup
Closed

Rollup of 19 pull requests#43802
MaloJaffre wants to merge 49 commits into
rust-lang:masterfrom
MaloJaffre:rollup

Conversation

RalfJungand others added 30 commits July 11, 2017 17:44
Yellow is indeed a nice color for a bikeshed.
tidy will no longer complain about long lines containing links so there
is no reason to use a URL shortener here.
The spans previously encoded only span the first token after the opening
brace, up to the closing brace of inline `mod` declarations. Thus, when
examining exports from an external crate, the spans don't include the
header of inline `mod` declarations.
That makes ./x.py test --stage 1 work on x86_64-unknown-linux-gnu.
The layout is currently broken for struct/union fields and enum variants
in the search results when searching from a struct, union or enum page.
(this should not have been merged with this typo)
E0122: clarify wording
I *assume* the reason these constraints are not hard errors is backwards compatibility. If yes, I think the error explanation (at least the long form) should be clearer about that, which is what this PR does.
If not, the explanation should give some other suitable explanation.
…ark-Simulacrum
Detect relative urls in tidy check
This came up in rust-lang#43631: there can be long relative urls in Markdown comments, that do not start with `http://` or `https://`, so the tidy check will not detect them as urls and complain about the line length. This PR adds detection of relative urls starting with `../`.
Reexport all SyntaxExtension variants
This was previously done very inconsistently and made matches look weird since some variants had the `SyntaxExtension::` prefix while others didn't.
…reavus
Stop using URL shortener in docs
tidy will no longer complain about long lines containing links so there
is no reason to use a URL shortener here.
Provide more explanation for Deref in String docs
While working on a different project I encountered a point of confusion where using `&String` to dereference a `String` into `&str` did not compile. I found the explanation of [String Deref](https://doc.rust-lang.org/std/string/struct.String.html#deref), thought that it matched what I was trying to do, and was confused as to why my program did not compile when the docs stated that it would work with 'any function which takes a `&str`'. At the bottom it is mentioned that this will 'generally' work, unless `String` is needed, but I found this statement confusing based on the previous claim of 'any'. Looking further into the docs I was able to find the function `as_str()` that works instead.
I thought it might be helpful to mention here deref coercion, an instance in which using `&String` does not work, to explain why it does not work, then direct users to a different option that should work in this instance. A user casually skimming the page will likely come to this explanation first, then find `as_str()` later, but be no the wiser as to what potentially went wrong.
r? @steveklabnik
Encode proper module spans in crate metadata.
The spans previously encoded only span the first token after the opening
brace, up to the closing brace of inline `mod` declarations. Thus, when
examining exports from an external crate, the spans don't include the
header of inline `mod` declarations.
r? @eddyb
fix assertion - trait object pointers don't have infinite fields
r? @eddyb
…lacrum
Ignore tests that fail on stage1
That makes `./x.py test --stage 1` work on `x86_64-unknown-linux-gnu`.
Add IRC's `!union union` as a test, addresses rust-lang#43553
This pull request adds a new test, `union` to `weird-exprs.rs`.
…aumeGomez
rustdoc: Fix broken CSS in search results
The layout is currently broken for struct/union fields and enum variants
in the search results when searching from a struct, union or enum page.
Some examples:
https://doc.rust-lang.org/nightly/std/ops/struct.RangeInclusive.html?search=starthttps://doc.rust-lang.org/nightly/std/option/enum.Option.html?search=somerust-lang#34477 was an incomplete fix
fix a typo
(this should not have been merged with this typo)
…lacrum
Fix typo corersponding -> corresponding
I was reading the documentation of __Struct std::os::unix::net::UnixListener__ when I saw a typo inside.
Fix broken links in Arc documentation
Some link references had ticks, when they should not have had them.
…eklanik,imperio
Fix some typos
I wrote a really naive script and found those typos in the documentation.
…-style, r=QuietMisdreavus
Improve enum variants display
r? @rust-lang/docs
Before:
<img width="1440" alt="screen shot 2017-08-11 at 00 22 54" src="https://user-images.githubusercontent.com/3050060/29194776-728ce0e2-7e2b-11e7-8299-8300cc0c168b.png">
After:
<img width="1440" alt="screen shot 2017-08-11 at 00 22 57" src="https://user-images.githubusercontent.com/3050060/29194783-78867558-7e2b-11e7-9226-1327fd20163a.png">
(The doc of the variant is more aligned with the "[-]" now).
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @QuietMisdreavus

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

@GuillaumeGomez

Copy link
Copy Markdown
Member

Please don't open a rollup if you don't have r+ rights. Also, another rollup is currently being tested (#43800) so I'll close this one.

@MaloJaffre

Copy link
Copy Markdown
ContributorAuthor

My bad, it wasn't what I wanted to do.

@MaloJaffre
MaloJaffre deleted the rollup branch August 13, 2017 15:03
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 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.

18 participants

@MaloJaffre@rust-highfive@GuillaumeGomez@Centril@QuietMisdreavus@RalfJung@ruuda@arshiamufti@natboehm@oli-obk@ollie27@ibabushkin@Gankra@ubsan@mattico@prisme60@j-browne@Eijebong