Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 20, 2019

Successful merges:

Failed merges:

r? @ghost

tmiasko and others added 17 commits October 11, 2019 22:29
Currently rustdoc does not forward `-Z` options to rustc when building
test executables. This makes impossible to use rustdoc to run test
samples when crate under test is instrumented with one of sanitizers
`-Zsanitizer=...`, since the final linking step will not include
sanitizer runtime library.

Forward `-Z` options to rustc to solve the issue.

Helps with rust-lang#43031.
This should also eliminate the ICE when using `include_bytes!`, `include_str!`
and `#[doc(include = "...")]`.

Fixes rust-lang#63900
This is disallowed with type or const generics.
rustdoc: forward -Z options to rustc

Currently rustdoc does not forward `-Z` options to rustc when building
test executables. This makes impossible to use rustdoc to run test
samples when crate under test is instrumented with one of sanitizers
`-Zsanitizer=...`, since the final linking step will not include
sanitizer runtime library.

Forward `-Z` options to rustc to solve the issue.

Helps with rust-lang#43031.
…eywiser

clarify const_prop ICE protection comment

This is based on discussion at https://github.com/rust-lang/rust/pull/64890/files#r334555787.

That said, why are function arguments the only unsized locals that could remain uninitialized? Couldn't we also fail to initialize some local but still go on with const_prop, and then hit a line that takes a reference to that? Cc @wesleywiser @oli-obk ; I don't know enough about const-prop to understand why this can happen only for function arguments.

~~The PR includes rust-lang#64890; the only new commit is 05e4e6ba0d5.~~
…nkov

Avoid ICE when include! is used by stdin crate

This should hopefully also eliminate the ICE when using `include_bytes!`, `include_str!` and `#[doc(include = "...")]` with a stdio input.

I couldn't see a clear way to write a compile-fail test using compiletest with a stdio input, so I haven't written any tests for this change.

Fixes rust-lang#63900
…tthewjasper

Improve error message for APIT with explicit generic arguments

This is disallowed with type or const generics. cc rust-lang#61410.
…ark-Simulacrum

Remove `borrowck_graphviz_postflow` from test

Resolves rust-lang#65071 (again).

Sorry. I've added a commit hook to prevent this from happening in the future.

r? @petrochenkov
Remove leading :: from paths in doc examples

Noted some pre-2018 path syntax in the doc examples, for example:
https://doc.rust-lang.org/std/process/fn.exit.html

```rust
fn main() {
    ::std::process::exit(match run_app() {
       Ok(_) => 0,
       ...
```

Couldn't find an existing issue on this (then again, "::" makes for an annoying thing to search for) so if there is already something fixing this and/or there's a reason to not fix it, just close this PR.

(Also fixed indentation in the `process::exit()` docs)
Rename the default argument 'def' to 'default'

Fixes: rust-lang#65492
@Centril
Copy link
Contributor Author

Centril commented Oct 20, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Oct 20, 2019

📌 Commit 836e45d has been approved by Centril

@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 Oct 20, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 20, 2019
@bors
Copy link
Collaborator

bors commented Oct 20, 2019

⌛ Testing commit 836e45d with merge 770b9e3...

bors added a commit that referenced this pull request Oct 20, 2019
Rollup of 8 pull requests

Successful merges:

 - #65314 (rustdoc: forward -Z options to rustc)
 - #65592 (clarify const_prop ICE protection comment)
 - #65603 (Avoid ICE when include! is used by stdin crate)
 - #65614 (Improve error message for APIT with explicit generic arguments)
 - #65629 (Remove `borrowck_graphviz_postflow` from test)
 - #65633 (Remove leading :: from paths in doc examples)
 - #65638 (Rename the default argument 'def' to 'default')
 - #65639 (Fix parameter name in documentation)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Oct 21, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 770b9e3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2019
@bors bors merged commit 836e45d into rust-lang:master Oct 21, 2019
@Centril Centril deleted the rollup-gez1xhe branch October 21, 2019 04:08
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.

10 participants