Skip to content

Rollup of 15 pull requests - #56549

Merged
bors merged 44 commits into
rust-lang:masterfrom
emilyalbini:rollup
Dec 6, 2018
Merged

Rollup of 15 pull requests#56549
bors merged 44 commits into
rust-lang:masterfrom
emilyalbini:rollup

Conversation

@emilyalbini

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Bastian Gruberand others added 30 commits November 21, 2018 09:59
This change removes the small bit of jslint config, replacing it
with eslint. I've currently configured eslint to mostly only report
the more serious of lints, although there are still some style nits
turned on.
Upcoming changes will start fixing lints.
Previous implementation wasn't correct, as an inner iterator
could have had side effects.
…ibstdpath, r=QuietMisdreavus
Document `From` implementations
This PR is solves part of rust-lang#51430. It's my first PR, so I might need some guidance from @skade (as already mentioned in the issue).
The purpose of the PR is to document the `impl From` inside `path.rs` and answering the questions:
- What does it convert?
- Does it allocate memory?
- How expensive are the allocations?
I gave it a first shot, though an experienced rust developer might want to look over it.
… r=QuietMisdreavus
Improve no result found sentence in doc search
Fixesrust-lang#55531.
Look:
<img width="1440" alt="screenshot 2018-11-01 at 02 21 56" src="https://user-images.githubusercontent.com/3050060/47827257-f6236c80-dd7c-11e8-9ea9-99c8cb4b2de5.png">
r? @QuietMisdreavus
Add Weak.ptr_eq
I hope the doc tests alone are good enough.
We also might want to discuss the dangling pointer case (from `Weak::new()`).
Updates rust-lang#55981.
…=TimNN
Utilize `?` instead of `return None`.
None
…ref, r=davidtwco
Refer to the second borrow as the "second borrow" in E0501.rs
Fixesrust-lang#55314.
r? @davidtwco
…nup, r=nikomatsakis
More MIR borrow check cleanup
* Fix some rustc doc links
* Remove the `region_map` field from `BorrowSet`
* Use `visit_local` to find 2PB activations
r? @nikomatsakis
…tsakis
data_structures: remove tuple_slice
It looks like we're not using it anywhere.
…match, r=QuietMisdreavus
Fix invalid line number match
If a code line is longer than the width, it then gets to the next line making the line number not matching it anymore.
r? @QuietMisdreavus
…es, r=kennytm
cleanup: remove static lifetimes from consts in libstd
…tMisdreavus
Fix line numbers display
Thanks to @talchas for finding the bug and suggesting the solution!
r? @QuietMisdreavus
Added a bare-bones eslint config (removing jslint)
This change removes the small bit of jslint config, replacing it
with eslint. I've currently configured eslint to mostly only report
the more serious of lints, although there are still some style nits
turned on.
Eslint better supports modern js, and will be a good pre-TypeScript code
quality aid.
Install eslint with `npm install -g eslint`. Run with `eslint html/static/*.js`,
or let your IDE do it. This requires no build step.
Upcoming changes will start fixing identified bugs and other lints (mostly unused and var redef issues).
Use inner iterator may_have_side_effect for Cloned
Previous implementation wasn't correct, as an inner iterator could have had side effects. Noticed by @bluss in rust-lang#56534.
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=15

Let's try with a lighter rollup this time.

@bors

bors commented Dec 5, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit f8ee5ab has been approved by pietroalbini

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

bors commented Dec 5, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f8ee5ab with merge 4988b09...

bors added a commit that referenced this pull request Dec 5, 2018
Rollup of 15 pull requests
Successful merges:
- #51753 (Document `From` implementations)
- #55563 (Improve no result found sentence in doc search)
- #55987 (Add Weak.ptr_eq)
- #56119 (Utilize `?` instead of `return None`.)
- #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
- #56388 (More MIR borrow check cleanup)
- #56424 (Mention raw-ident syntax)
- #56452 (Remove redundant clones)
- #56456 (Handle existential types in dead code analysis)
- #56466 (data_structures: remove tuple_slice)
- #56476 (Fix invalid line number match)
- #56497 (cleanup: remove static lifetimes from consts in libstd)
- #56498 (Fix line numbers display)
- #56523 (Added a bare-bones eslint config (removing jslint))
- #56538 (Use inner iterator may_have_side_effect for Cloned)
Failed merges:
r? @ghost
@bors

bors commented Dec 6, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 4988b09 to master...

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.

14 participants

@emilyalbini@bors@Centril@GuillaumeGomez@wildarch@matthewjasper@Thomasdezeeuw@oli-obk@ljedrz@mark-i-m@sinkuu@frewsxcv@JohnHeitmann@sugar700