Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #66109

Merged
merged 26 commits into from
Nov 5, 2019
Merged

Rollup of 10 pull requests #66109

merged 26 commits into from
Nov 5, 2019

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

ehuss and others added 26 commits October 26, 2019 09:06
Co-Authored-By: Daniel Silverstone <dsilvers@digital-scurf.org>
The example claims SuperiorThanZero and presumably Zero is not Superior than itself so it should not be allowed.
the docs are great at explaining that .len() isn't like in other
languages but stops short of explaining how to get the character length.

r? @steveklabnik
Just to make it useable for profiling and such inside
rustc itself.  It was vaguely useful in
https://wiki.alopex.li/WhereRustcSpendsItsTime and I figured
I might as well upstream it; I may or may not ever get around
to doing more with it (hopefully I will), but it may be useful
for others.
These errors are suboptimal, but they will be fixed by the new
`check_consts` pass.
…an-DPC

Update codegen option documentation.

Some documentation updates:

- Add more detail to codegen options.
- Add missing options:
    - `force-frame-pointers`
    - `default-linker-libraries`
    - `linker-plugin-lto`
- Add fragment anchors for all command-line-arguments.
- Add some cross links between options.
…Centril

docs: improve disclaimer regarding LinkedList
…=rkruppe

Add FFI bindings for LLVM's Module::getInstructionCount()

Just to make it usable for profiling and such inside
rustc itself.  It was vaguely useful in
https://wiki.alopex.li/WhereRustcSpendsItsTime and I figured
I might as well upstream it; I may or may not ever get around
to doing more with it (hopefully I will), but it may be useful
for others.
[doc] fixes for unix/vxworks `OpenOptionsExt::mode`
Fix logic in example.

The example claims SuperiorThanZero and presumably Zero is not Superior than itself so it should not be allowed.
…=Mark-Simulacrum

Improved std::iter::Chain documentation

Replaces `strings two iterators` by `links two iterators` in `std::iter::Chain` documentation.

I didn't find any meaning of `strings` which can be evaluated as `links` or `joins`.

I don't think that `std::iter:Chain` works as a stringer or plays billiards. (https://www.lexico.com/en/definition/string).
doc(str): show example of chars().count() under len()

the docs are great at explaining that .len() isn't like in other
languages but stops short of explaining how to get the character length.
…-ref-current-trait, r=estebank

Suggest correct code when encountering an incorrect trait bound referencing the current trait

Fixes rust-lang#65985 and also improves the suggestion for code like this:

```
trait Grab {
    type Value;
    fn grab(&self) -> Grab::Value;
}
```

To suggest `<Self as Grab>::Value`.

I wasn't sure which of the syntax versions is better (`<Self as ..>::` vs `Self::`), so I used the former simply because it was less change to the existing code.

r? @estebank
…ntril

Do not needlessly write-lock

Just removes a needless `borrow_mut()` by using `borrow()` instead.
…entril

Add a failing UI test for multiple loops of all kinds in a `const`

This simply demonstrates the current behavior and ensures we don't allow anything by accident.

The new const checker will be able to improve the diagnostics here. While working on it, I didn't see very many tests with non-`while` loops in a `const`, and there were no tests with multiple loops.
@pietroalbini
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Nov 5, 2019

📌 Commit 1ffa93e has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 5, 2019
@bors
Copy link
Contributor

bors commented Nov 5, 2019

⌛ Testing commit 1ffa93e with merge d1fff4a...

bors added a commit that referenced this pull request Nov 5, 2019
Rollup of 10 pull requests

Successful merges:

 - #65136 (Update codegen option documentation.)
 - #65574 (docs: improve disclaimer regarding LinkedList)
 - #65720 (Add FFI bindings for LLVM's Module::getInstructionCount())
 - #65905 ([doc] fixes for unix/vxworks `OpenOptionsExt::mode`)
 - #65962 (Fix logic in example.)
 - #66019 (Improved std::iter::Chain documentation)
 - #66038 (doc(str): show example of chars().count() under len())
 - #66042 (Suggest correct code when encountering an incorrect trait bound referencing the current trait)
 - #66073 (Do not needlessly write-lock)
 - #66096 (Add a failing UI test for multiple loops of all kinds in a `const`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 5, 2019

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing d1fff4a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 5, 2019
@bors bors merged commit 1ffa93e into rust-lang:master Nov 5, 2019
@pietroalbini pietroalbini deleted the rollup-2npidna branch November 7, 2019 08:07
@Centril Centril added the rollup A PR which is a rollup label Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.