Skip to content

Rollup of 22 pull requests - #56340

Merged
bors merged 51 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup
Nov 29, 2018
Merged

Rollup of 22 pull requests#56340
bors merged 51 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

matthiaskrgrand others added 30 commits October 27, 2018 11:55
Remove the parts of atomic::Ordering's intro that wrongly claimed that
SeqCst prevents all reorderings around it.
Closesrust-lang#55196
This makes the error style consistent with the convention in error messages.
The std::io::read main documentation can lead to error because the
buffer is prefilled with 10 zeros that will pad the response.
Using an empty vector is better.
The `read_to_end` documentation is already correct though.
This is my first rust PR, don't hesitate to tell me if I did something
wrong.
Within this `Iterator` implementation, a function `unsafe_get` is
defined which unsafely allows _unchecked_ indexing of any element in a
slice. This should be marked as _unsafe_, but it is not.
To address this issue, I removed that inner function.
set to zero meant that the nested list was squished up against
subsequent list items/paragraphs
this changes the bottom margin to .6em, same as for paragraphs
an example demonstrating the difference with screenshots is given in the
pull request
…imNN
bootstrap: clean up a few clippy findings
remove useless format!()s
remove redundant field names in a few struct initializations
pass slice instead of a vector to a function
use is_empty() instead of comparisons to .len()
No functional change intended.
…cramertj
Remove unsafe `unsafe` inner function.
Within this `Iterator` implementation, a function `unsafe_get` is
defined which unsafely allows _unchecked_ indexing of any element in a
slice. This should be marked as _unsafe_, but it is not.
To address this issue, I removed that inner function.
…aelwoerister
Update outdated code comments in StringReader
For the detection of newlines in the lexer, this is now done in `analyze_source_file.rs`.
Fix small typo in comment of thread::stack_size
fix futures creating aliasing mutable and shared ref
Fixes the problem described in rust-lang/miri#532 (comment): `set_task_waker` takes a shared reference and puts a copy into the TLS (in a `NonNull`), but `get_task_waker` gets it back out as a mutable reference. That violates "mutable references must not alias anything"!
…illaumeGomez
rustdoc: add bottom margin spacing to nested lists
the current CSS for nested lists sets margin-bottom to zero, which means that a nested list is squished up against subsequent list items/paragraphs
this changes the bottom margin to .6em, same as for paragraphs
before:
![before](https://user-images.githubusercontent.com/33935229/49176291-699ba800-f342-11e8-9d33-c4acd4df2beb.png)
after:
![after](https://user-images.githubusercontent.com/33935229/49176299-6f918900-f342-11e8-90c3-aa14db195b45.png)
resolve: Fix false-positives from lint `absolute_paths_not_starting_with_crate`
Fixesrust-lang#56311 (stable-to-beta regression)
Clean up span in non-trailing `..` suggestion
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=22

@bors

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 3b64f86 has been approved by GuillaumeGomez

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

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3b64f86 with merge 0c1dc62...

bors added a commit that referenced this pull request Nov 29, 2018
Rollup of 22 pull requests
Successful merges:
- #55391 (bootstrap: clean up a few clippy findings)
- #56021 (avoid features_untracked)
- #56023 (atomic::Ordering: Get rid of misleading parts of intro)
- #56080 (Reduce the amount of bold text at doc.rlo)
- #56114 (Enclose type in backticks for "non-exhaustive patterns" error)
- #56124 (Fix small doc mistake on std::io::read::read_to_end)
- #56127 (Update an outdated comment in mir building)
- #56148 (Add rustc-guide as a submodule)
- #56149 (Make std::os::unix/linux::fs::MetadataExt::a/m/ctime* documentation clearer)
- #56220 (Suggest appropriate place for lifetime when declared after type arguments)
- #56223 (Make JSON output from -Zprofile-json valid)
- #56236 (Remove unsafe `unsafe` inner function.)
- #56255 (Update outdated code comments in StringReader)
- #56257 (rustc-guide has moved to rust-lang/)
- #56273 (Add missing doc link)
- #56289 (Fix small typo in comment of thread::stack_size)
- #56294 (Fix a typo in the documentation of std::ffi)
- #56312 (Deduplicate literal -> constant lowering)
- #56319 (fix futures creating aliasing mutable and shared ref)
- #56321 (rustdoc: add bottom margin spacing to nested lists)
- #56322 (resolve: Fix false-positives from lint `absolute_paths_not_starting_with_crate`)
- #56330 (Clean up span in non-trailing `..` suggestion)
Failed merges:
r? @ghost
@bors

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 0c1dc62 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.

19 participants

@GuillaumeGomez@bors@Centril@matthiaskrgr@vorner@mark-i-m@varkor@antoine-de@oli-obk@ariasuni@estebank@Mark-Simulacrum@frewsxcv@jasonl@RalfJung@marius@polyfloyd@jnqnfe@petrochenkov