Commit Graph

110182 Commits

Author SHA1 Message Date
Guillaume Gomez
eed4b219e2 Clean up E0517 explanation 2020-04-14 13:26:17 +02:00
bors
ba72b15666 Auto merge of #70893 - tmiasko:llvm-sanitizers, r=cuviper
Update LLVM submodule fixing sanitizers build with glibc 2.31

Fixes #69556.
2020-04-14 10:04:47 +00:00
marmeladema
c15e13ae16 Remove DUMMY_HIR_ID 2020-04-14 08:46:07 +01:00
marmeladema
b9161ab880 Do not use DUMMY_HIR_ID as placeholder value in node_id_to_hir_id table
Some helpers functions have been introduced to deal with (buggy) cases
where either a `NodeId` or a `DefId` do not have a corresponding `HirId`.
Those cases are tracked in issue #71104.
2020-04-14 08:46:07 +01:00
Waffle
2c23bd4914 make vec![,] uncompilable
Fix regression introduced in commit #3ae2d21
2020-04-14 10:27:55 +03:00
Bastian Kauschke
647f810d7b update 32 bit mir-opt tests 2020-04-14 09:14:58 +02:00
bors
a3ef360368 Auto merge of #70679 - tmandry:issue-68112, r=nikomatsakis
Improve async-await/generator obligation errors in some cases

Fixes #68112.

This change is best read one commit at a time (I add a test at the beginning and update it in each change after).

The `test2` function is a case I found while writing the test that we don't handle with this code yet. I don't attempt to fix it in this PR, but it's a good candidate for future work.

r? @davidtwco, @nikomatsakis
2020-04-14 06:47:38 +00:00
bors
513a6473d6 Auto merge of #70643 - Rustin-Liu:rustin-patch-rename, r=eddyb
Rename AssocKind::Method to AssocKind::Fn

Part of https://github.com/rust-lang/rust/issues/60163.

https://github.com/rust-lang/rust/issues/60163#issuecomment-607284413
2020-04-14 03:11:12 +00:00
Tyler Mandry
4326d959f4 Update test after rebase 2020-04-13 19:14:26 -07:00
Tyler Mandry
df64c5d260 Incorporate feedback into diagnostics 2020-04-13 18:58:17 -07:00
Tyler Mandry
00795a9940 Fix style nits 2020-04-13 18:58:17 -07:00
Tyler Mandry
df0a16b29f Include type info when available for awaited expr 2020-04-13 18:58:17 -07:00
Tyler Mandry
8ce334d53c rustfmt 2020-04-13 18:58:17 -07:00
Tyler Mandry
e340375ef8 Don't double-annotate the same Span 2020-04-13 18:58:17 -07:00
Tyler Mandry
aed7c30e4f Use clearer message when obligation is caused by await expr 2020-04-13 18:58:11 -07:00
Tyler Mandry
6edfd66c5d Use "generator" instead of "future" when appropriate 2020-04-13 18:48:55 -07:00
Tyler Mandry
7127ff3d94 Don't annotate type when type is opaque 2020-04-13 18:48:55 -07:00
Tyler Mandry
db0a5a1056 Improve span label 2020-04-13 18:48:55 -07:00
Tyler Mandry
a40ec13262 Add test for #68112 (existing output) 2020-04-13 18:48:55 -07:00
Tyler Mandry
b129b32afa Use inner/outer generator naming instead of first/last
I personally find this clearer.
2020-04-13 18:48:55 -07:00
Josh Stone
9ede5b04d0 Remove the last remnant of unsigned Neg
It's been gone since #23945, before Rust 1.0. The former wrapping
semantics have also been available as inherent methods for a long time
now. There's no reason to keep this unused macro around.
2020-04-13 18:37:06 -07:00
bors
47f49695df Auto merge of #71111 - Dylan-DPC:rollup-esp17qn, r=Dylan-DPC
Rollup of 4 pull requests

Successful merges:

 - #70654 (Explain how to work with subtree)
 - #71092 (Remove some usage of `DUMMY_HIR_ID`)
 - #71103 (Add test case for type aliasing `impl Sized`)
 - #71109 (allow const generics in const fn)

Failed merges:

r? @ghost
2020-04-13 23:54:52 +00:00
Dylan DPC
dd27462ea9
Rollup merge of #71109 - lcnr:generics_in_const_fn, r=eddyb
allow const generics in const fn

This was explicitly forbidden before. As we were unable to think of a reason
why this should still be the case, this check has been removed.

r? @eddyb
cc @varkor @Centril
2020-04-14 01:24:18 +02:00
Dylan DPC
e261ef0622
Rollup merge of #71103 - samrat:tait-sized, r=estebank
Add test case for type aliasing `impl Sized`

Fixes #71085
2020-04-14 01:24:16 +02:00
Dylan DPC
9de2a792fb
Rollup merge of #71092 - marmeladema:dummy-hir-id-removal, r=eddyb
Remove some usage of `DUMMY_HIR_ID`
2020-04-14 01:24:15 +02:00
Dylan DPC
048c8426e8
Rollup merge of #70654 - oli-obk:subrepo_docs, r=Mark-Simulacrum
Explain how to work with subtree

cc #70651

r? @centril @RalfJung

This PR just contains the usage documentation, we'll do actual moves in later PRs
2020-04-14 01:24:13 +02:00
Rustin-Liu
b07e7fe047 Rename AssocKind::Method to AssocKind::Fn
Rename fn_has_self_argument to fn_has_self_parameter

Rename AssocItemKind::Method to AssocItemKind::Fn

Refine has_no_input_arg

Refine has_no_input_arg

Revert has_no_input_arg

Refine suggestion_descr

Move as_def_kind into AssocKind

Signed-off-by: Rustin-Liu <rustin.liu@gmail.com>

Fix tidy check issue

Signed-off-by: Rustin-Liu <rustin.liu@gmail.com>
2020-04-14 07:12:07 +08:00
Bastian Kauschke
4714e202ae bless mir opt tests 2020-04-13 22:39:10 +02:00
Bastian Kauschke
db83fdc46c unit rvalue: use constant () instead of tuple 2020-04-13 22:39:10 +02:00
Bastian Kauschke
50eb39757e allow const generics in const fn 2020-04-13 22:37:20 +02:00
bors
8e18e26f12 Auto merge of #71105 - Dylan-DPC:rollup-nezezxr, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #70656 (Improve scrollbar display in rustdoc)
 - #71051 (Suggest .into() over try_into() when it would work)
 - #71087 (Remove `FnCtxt::impl_self_ty`)
 - #71097 (Pattern docs)
 - #71101 (Miri: let machine hook dynamically decide about alignment checks)

Failed merges:

r? @ghost
2020-04-13 19:47:23 +00:00
Dylan DPC
73e56dec93
Rollup merge of #71101 - RalfJung:miri-alignment-check, r=ecstatic-morse
Miri: let machine hook dynamically decide about alignment checks

This is needed for https://github.com/rust-lang/miri/pull/1332.
2020-04-13 20:23:33 +02:00
Dylan DPC
eb49f7fd74
Rollup merge of #71097 - pickfire:pattern-docs, r=Dylan-DPC
Pattern docs

https://doc.rust-lang.org/std/str/pattern/trait.Pattern.html#implementors
2020-04-13 20:23:32 +02:00
Dylan DPC
fd1b057004
Rollup merge of #71087 - JohnTitor:impl-self-ty, r=eddyb
Remove `FnCtxt::impl_self_ty`

Fixes #69489
r? @eddyb cc @Centril
2020-04-13 20:23:30 +02:00
Dylan DPC
f551d8a410
Rollup merge of #71051 - ryr3:fix_try_into, r=estebank
Suggest .into() over try_into() when it would work

It would be better to suggest x.into() instead, which is shorter, cannot fail, and doesn't require importing a trait.
Tests have been added and made up to date.
Fixes #70851
2020-04-13 20:23:29 +02:00
Dylan DPC
3f61c730d4
Rollup merge of #70656 - GuillaumeGomez:scrollbar-display, r=kinnison
Improve scrollbar display in rustdoc

The scrollbar of the left sidebar in rustdoc looks very bad on firefox (on dark theme). This PR improves it:

<div style="display:inline-block;">
<div style="width:50%;display:inline-block;float:left;">
<image src="https://user-images.githubusercontent.com/3050060/78148412-202b0380-7435-11ea-8ff3-79f02ea8f9ed.png">
</div>
<div style="width:50%;display:inline-block;float:left;">
<image src="https://user-images.githubusercontent.com/3050060/78148437-28833e80-7435-11ea-946b-a6fc9320b705.png">
</div>
</div>

With light theme:

![old-firefox-light](https://user-images.githubusercontent.com/3050060/78148718-7bf58c80-7435-11ea-93d3-2a2cafd5c6ae.png)
![firefox-light](https://user-images.githubusercontent.com/3050060/78148736-7f891380-7435-11ea-8b10-a8898f73b4c9.png)

And on chrome:

![chrome-light](https://user-images.githubusercontent.com/3050060/78148903-ac3d2b00-7435-11ea-9a10-6c0376a675c3.png)
![chrome-dark](https://user-images.githubusercontent.com/3050060/78148907-ae9f8500-7435-11ea-9b89-0397b977753c.png)

Small extra question: should I extend it to all scrollbars? I think it'd be better but just in case...

r? @kinnison
2020-04-13 20:23:27 +02:00
Jonas Schievink
8c50006829 Don't always run add_call_guards pass 2020-04-13 20:22:45 +02:00
marmeladema
d0409ead2f Remove usage of DUMMY_HIR_ID in FnCtxt::get_conversion_methods 2020-04-13 19:14:19 +01:00
Samrat Man Singh
38bfba659e Add test case for type aliasing impl Sized 2020-04-13 22:14:08 +05:30
bors
c58c532744 Auto merge of #70989 - eddyb:mir-opt-32-pr-ci, r=Mark-Simulacrum
ci: run mir-opt tests on PR CI also as 32-bit (for `EMIT_MIR_FOR_EACH_BIT_WIDTH`).

Background: #69916 and [`src/test/mir-opt/README.md`](https://github.com/rust-lang/rust/blob/master/src/test/mir-opt/README.md):
> By default 32 bit and 64 bit targets use the same dump files, which can be problematic in the
presence of pointers in constants or other bit width dependent things. In that case you can add
>
> ```
> // EMIT_MIR_FOR_EACH_BIT_WIDTH
> ```
>
> to your test, causing separate files to be generated for 32bit and 64bit systems.

However, if you change the output of such a test (intentionally or not), or if you add a test and it varies between 32-bit and 64-bit platforms, you have to run this command (for a x64 linux host):
`./x.py test --stage 1 --target x86_64-unknown-linux-gnu --target i686-unknown-linux-gnu --bless  src/test/mir-opt`

Otherwise, bors trying to merge the PR will fail, since we test 32-bit targets there.
But we don't on PR CI, which means there's no way the PR author would know (unless they were burnt by this already and know what to look for).

This PR resolves that by running `mir-opt` tests for ~~`i686-unknown-linux-gnu`~~, on PR CI.
**EDIT**: switched to `armv5te-unknown-linux-gnueabi` to work around LLVM 7 crashes (see https://github.com/rust-lang/compiler-builtins/pull/311#issuecomment-612270089), found during testing.

cc @rust-lang/wg-mir-opt @rust-lang/infra
2020-04-13 16:28:57 +00:00
Ralf Jung
f2d4c93c6c fmt 2020-04-13 18:05:05 +02:00
Ralf Jung
28e6b1a602 Miri: let machine hook dynamically decide about alignment checks 2020-04-13 17:59:12 +02:00
Vadim Petrochenkov
8392e477e7 Address review comments 2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
57870ea2ca rustc_target: Introduce msvc_base
and inherit both `windows_msvc_base` and `uefi_msvc_base` from it.
2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
88c480279b rustc_target: Inherit windows_uwp_gnu_base from windows_gnu_base 2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
fd0e2987ed rustc_target: Inherit windows_uwp_msvc_base from windows_msvc_base 2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
9c9db3ab4b rustc_target: Remove some useless imports 2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
6580ceb9e1 rustc_target: windows(_uwp)_base -> windows(_uwp)_gnu_base
The old naming is from ancient times when there was no MSVC support.

Also `uefi_base` -> `uefi_msvc_base`.
It will inherit from `msvc_base` in a future commit, plus a GNU UEFI target is also potentially possible.
2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
cfe90ebfe3 linker: Pass /NODEFAULTLIB in a more regular way 2020-04-13 18:37:51 +03:00
Vadim Petrochenkov
7a4f059add rustc_target: Move tests into a separate unconfigured file
as much as possible.
2020-04-13 18:37:51 +03:00