Skip to content

Rollup of 8 pull requests - #54215

Merged
bors merged 32 commits into
rust-lang:masterfrom
kennytm:rollup
Sep 14, 2018
Merged

Rollup of 8 pull requests#54215
bors merged 32 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

@kennytm

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

weiznichand others added 30 commits August 9, 2018 11:02
I was dabbling recently seeing what it would take to compile `rustfmt` to the
`wasm32-unknown-unknown` target and it turns out not much effort is needed!
Currently `rustfmt` depends on a few rustc crates published to crates.io, so
this commit touches up those crates to compile for wasm themselves. Notably:
* The `rustc_data_structures` crate's `flock` implementation is stubbed out to
unconditionally return errors on unsupported platforms.
* The `rustc_errors` crate is extended to not do any locking for all non-windows
platforms.
In both of these cases if we port the compiler to new platforms the
functionality isn't critical but will be discovered over time as it comes up, so
this hopefully doesn't make it too too hard to compile to new platforms!
This adds a suggestion to the `invalid_crate_types` lint.
The suggestion is based on the Levenshtein distance to existing crate
types. If no suggestion is found it will show the lint without any
suggestions.
This was added and stabilized in commit 0250302, but while that
claimed to be for 1.28.0, it didn't actually make it until 1.29.0.
Should bring in some nice progress bars for compilations!
…=KodrAus
Add a implementation of `From` for converting `&'a Option<T>` into `Option<&'a T>`
I'm not sure if any annotations regarding the stabilization are needed or in general what's the correct process of adding such an impl.
cc @sgrif (We have talked about this)
…rochenkov
Fix compiling some rustc crates to wasm
I was dabbling recently seeing what it would take to compile `rustfmt` to the
`wasm32-unknown-unknown` target and it turns out not much effort is needed!
Currently `rustfmt` depends on a few rustc crates published to crates.io, so
this commit touches up those crates to compile for wasm themselves. Notably:
* The `rustc_data_structures` crate's `flock` implementation is stubbed out to
unconditionally return errors on unsupported platforms.
* The `rustc_errors` crate is extended to not do any locking for all non-windows
platforms.
In both of these cases if we port the compiler to new platforms the
functionality isn't critical but will be discovered over time as it comes up, so
this hopefully doesn't make it too too hard to compile to new platforms!
Rename all mentions of `nil` to `unit`
Fixesrust-lang#53719.
Renamed keywords nil to unit.
…=estebank
Suggest valid crate type if invalid crate type is found
This adds a suggestion to the `invalid_crate_types` lint.
The suggestion is based on the Levenshtein distance to existing crate
types. If no suggestion is found it will show the lint without any
suggestions.
Closesrust-lang#53958
Remove println!() statement from HashMap unit test
…=estebank
Fix the stable release of os_str_str_ref_eq
This was added and stabilized in commit 0250302, but while that
claimed to be for 1.28.0, it didn't actually make it until 1.29.0.
Fixesrust-lang#54195.
…kennytm
re-mark the never docs as unstable
Fixesrust-lang#54198
This stability attribute was removed in rust-lang#47630, but not replaced with a `#[stable]` attribute, and when rust-lang#50121 reverted that stabilization, it didn't set the docs back to unstable. I'm concerned as to why it was allowed to not have the stability attribute at all, but at least this can put it back.
I'm nominating this for beta backport because it's a really small change, and right now our docs are in an awkward position where the `!` type is technically unstable to use, but the docs don't say so the same way any other library feature would. (And this is also the case *on stable* now, but i'm not suggesting a stable backport for a docs fix.)
Update Cargo
Should bring in some nice progress bars for compilations!
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8

@bors

bors commented Sep 14, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit dd4f5a2 has been approved by kennytm

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 14, 2018
@bors

bors commented Sep 14, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dd4f5a2 with merge fccde00...

bors added a commit that referenced this pull request Sep 14, 2018
Rollup of 8 pull requests
Successful merges:
- #53218 (Add a implementation of `From` for converting `&'a Option<T>` into `Option<&'a T>`)
- #54024 (Fix compiling some rustc crates to wasm)
- #54095 (Rename all mentions of `nil` to `unit`)
- #54173 (Suggest valid crate type if invalid crate type is found)
- #54194 (Remove println!() statement from HashMap unit test)
- #54203 (Fix the stable release of os_str_str_ref_eq)
- #54207 (re-mark the never docs as unstable)
- #54210 (Update Cargo)
Failed merges:
r? @ghost
@bors

bors commented Sep 14, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing fccde00 to master...

@bors
bors merged commit dd4f5a2 into rust-lang:masterSep 14, 2018
@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 rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@kennytm@bors@Centril@weiznich@alexcrichton@kenta7777@fintelia@phansch@cuviper@QuietMisdreavus