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 8 pull requests #73240

Closed
wants to merge 30 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

euclio and others added 30 commits May 15, 2020 23:56
Clippy's tests were failing the build, but that failure was ignored in favor of
checking toolstate. This is the correct behavior for toolstate-checked tools,
but Clippy no longer updates its toolstate status as it should always build.
This is only really useful in debug messages, so I've switched to
calling `span_to_string` in any place that causes a `Span` to end up in
user-visible output.
…Dylan-DPC

remove extra space from crate-level doctest names

Before:

```
running 2 tests
test src/test/rustdoc-ui/doctest-output.rs - foo::bar (line 11) ... ok
test src/test/rustdoc-ui/doctest-output.rs -  (line 5) ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
```

After:

```
running 2 tests
test src/test/rustdoc-ui/doctest-output.rs - foo::bar (line 11) ... ok
test src/test/rustdoc-ui/doctest-output.rs - (line 5) ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
```
…, r=nikomatsakis

Further tweak lifetime errors involving `dyn Trait` and `impl Trait` in return position

* Suggest substituting `'static` lifetime in impl/dyn `Trait + 'static` instead of `Trait + 'static + '_`
* When `'static` is explicit, also suggest constraining argument with it
* Reduce verbosity of suggestion message and mention lifetime in label
* Tweak output for overlapping required/captured spans
* Give these errors an error code

Follow up to rust-lang#72543.

r? @nikomatsakis
…r=matthewjasper

Show `SyntaxContext` in formatted `Span` debug output

This is only really useful in debug messages, so I've switched to
calling `span_to_string` in any place that causes a `Span` to end up in
user-visible output.
Fix #[thread_local] statics as asm! sym operands

The `asm!` RFC specifies that `#[thread_local]` statics may be used as `sym` operands for inline assembly.

This also fixes a regression in the handling of `#[thread_local]` during monomorphization which caused link-time errors with multiple codegen units, most likely introduced by rust-lang#71192.

r? @oli-obk
…matthewjasper

Export `#[inline]` fns with extern indicators

In ancient history (rust-lang#36280) we stopped `#[inline]` fns being codegened if they weren't used. However,

- rust-lang#72944
- rust-lang#72463

observe that when writing something like

```rust
#![crate_type = "cdylib"]

#[no_mangle]
#[inline]
pub extern "C" fn foo() {
    // ...
}
```

we really _do_ want `foo` to be codegened. This change makes this the case.

Resolves rust-lang#72944, resolves rust-lang#72463 (and maybe some more)
Try_run must only be used if toolstate is populated

Clippy's tests were failing the build, but that failure was ignored in favor of checking toolstate. This is the correct behavior for toolstate-checked tools, but Clippy no longer updates its toolstate status as it should always build.

The previous PR of this kind didn't catch this as I expected x.py failures to always lead to a non-successful build in CI, but that's not the case specifically for tool testing.
…imulacrum

Remove missed `cfg(bootstrap)`
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jun 11, 2020

📌 Commit df213d5 has been approved by Dylan-DPC

@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 Jun 11, 2020
@bors
Copy link
Contributor

bors commented Jun 11, 2020

⌛ Testing commit df213d5 with merge a4e3a4ff54380674640017b70c565808e1740cda...

@bors
Copy link
Contributor

bors commented Jun 11, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 11, 2020
@Aaron1011
Copy link
Member

Error:

failures:

---- [codegen] codegen/sanitizer-no-sanitize-inlining.rs#ASAN stdout ----


------------------------------------------
stderr:
------------------------------------------
/Users/runner/runners/2.170.1/work/1/s/src/test/codegen/sanitizer-no-sanitize-inlining.rs:16:10: error: ASAN: expected string not found in input
// ASAN:***@random_inline
         ^
/Users/runner/runners/2.170.1/work/1/s/build/x86_64-apple-darwin/test/codegen/sanitizer-no-sanitize-inlining.ASAN/sanitizer-no-sanitize-inlining.ll:9:18: note: scanning from here
define void @test(i32* nocapture align 4 dereferenceable(4) %n) unnamed_addr #0 {
                 ^
/Users/runner/runners/2.170.1/work/1/s/build/x86_64-apple-darwin/test/codegen/sanitizer-no-sanitize-inlining.ASAN/sanitizer-no-sanitize-inlining.ll:11:2: note: possible intended match here
 tail call void @random_inline(i32* nonnull align 4 dereferenceable(4) %n)
 ^

------------------------------------------



failures:
    [codegen] codegen/sanitizer-no-sanitize-inlining.rs#ASAN

test result: FAILED. 165 passed; 1 failed; 29 ignored; 0 measured; 0 filtered out

I suspect that #73034 is responsible, since it affects codegen for #[inline] functions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.