Commit Graph

110264 Commits

Author SHA1 Message Date
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
Vadim Petrochenkov
3ad8c8858e rustc_target: Make sure lld-link is treated as link.exe by default
The differences if they are discovered will need to be explicitly documented
2020-04-13 18:37:51 +03:00
Ralf Jung
7b90ff9ae6 add after_stack_push hook; add public ImmTy::from_immediate method, and make ImmTy::imm field private 2020-04-13 17:08:27 +02:00
marmeladema
e08ad7ae58 Use CRATE_HIR_ID instead of DUMMY_HIR_ID when appropriate.
Those usage ends up forwarded to a `ObligationClause` which uses
`CRATE_HIR_ID` for dummy value as seen in `ObligationClause::dummy`.
2020-04-13 15:42:01 +01:00
Ivan Tham
7a22cf6415 Add examples to Pattern docs 2020-04-13 22:25:15 +08:00
Ivan Tham
cbe96b04ad Add period to Pattern docs 2020-04-13 22:24:58 +08:00
Ralf Jung
1a3bda6487 Miri: let push_frame hook also access and mutate the rest of the frame data 2020-04-13 16:06:51 +02:00
bors
5179ebe206 Auto merge of #70961 - ecstatic-morse:into-def-id, r=eddyb
Take `impl Into<DefId>` for query methods on `TyCtxt`

Alternative implementation of #70956. cc #70853.
2020-04-13 12:50:43 +00:00
marmeladema
95fb7bf108 Just unwrap() instead of unwrap_or(DUMMY_HIR_ID).
A valid hir id should always be returned in this case.
2020-04-13 13:43:44 +01:00
marmeladema
830e4fde0f Remove usage of DUMMY_HIR_ID in some visitors 2020-04-13 13:43:44 +01:00
marmeladema
795fa0a006 Remove useless calls to assemble_extension_candidates_for_traits_in_scope
Calls to `assemble_extension_candidates_for_traits_in_scope` with
`DUMMY_HIR_ID` as `expr_hir_id` are useless because the first thing
that this function does is to return `Ok(())` in this case.
2020-04-13 13:43:44 +01:00
PankajChaudhary5
908436f3bb Add proper explanation of error code E0657 2020-04-13 13:36:22 +05:30
bors
d28a46444e Auto merge of #70882 - tmiasko:llvm-version-suffix, r=Mark-Simulacrum
Make LLVM version suffix independent of rustc version on dev channel

Remove rustc version from LLVM version suffix on dev channel,
avoiding the need for full rebuilds when switching between
branches with different LLVM submodule & rustc version.

Note: To avoid full rebuild, on subsequent LLVM submodule update, copy the
current value of `LLVM_VERSION_SUFFIX` from `build/*/llvm/build/CMakeCache.txt`,
to `version-suffix` in `config.toml`.
2020-04-13 07:34:11 +00:00
bors
a00bd29e01 Auto merge of #71056 - matthiaskrgr:submodule_upd, r=Dylan-DPC
submodules: update clippy from d342cee7 to af5940b7

Changes:
````
Allow UUID style formatting for `inconsistent_digit_grouping` lint
rustup https://github.com/rust-lang/rust/pull/70986
rustup https://github.com/rust-lang/rust/pull/69745
Rustup to https://github.com/rust-lang/rust/pull/70913
compare with the second largest instead of the smallest variant
Revert "Downgrade new_ret_no_self to pedantic"
Check for clone-on-copy in argument positions
Check fn header along with decl when suggesting to implement trait
Downgrade implicit_hasher to pedantic
Move cognitive_complexity to nursery
Run fmt and update test
Use int assoc consts in MANUAL_SATURATING_ARITHMETIC
Use int assoc consts in checked_conversions lint
Use primitive type assoc consts in more tests
Use integer assoc consts in more lint example code
Don't import primitive type modules
Use assoc const NAN for zero_div_zero lint
Fix float cmp to use assoc fxx::EPSILON
Fix NAN comparison lint to use assoc NAN
Refine lint message.
Lint on opt.as_ref().map(|x| &**x).
Include OpAssign in suspicious_op_assign_impl
result_map_or_into_option: fix syntax error in example
result_map_or_into: fix dogfood_clippy error => {h,l}int
CONTRIBUTING.md: fix broken triage link
result_map_or_into_option: fix `cargo dev fmt --check` errors
result_map_or_into_option: move arg checks into tuple assignment
result_map_or_into_option: add `opt.map_or(None, |_| Some(y))` test
result_map_or_into_option: destructure lint tuple or return early
result_map_or_into_option: add good and bad examples
result_map_or_into_option: explicitly note absence of known problems
Downgrade new_ret_no_self to pedantic
Downgrade unreadable_literal to pedantic
Update CONTRIBUTING.md
Rename rustc -> rustc_middle in doc links
result_map_or_into_option: add lint to catch manually adpating Result -> Option
Move matches test in matches module
Run update_lints
Make lint modules private
Don't filter lints in code generation functions
Build lint lists once and the reuse them to update files
Get rid of Lint::is_internal method
Clean up update_lints
Downgrade inefficient_to_string to pedantic
Downgrade trivially_copy_pass_by_ref to pedantic
Downgrade let_unit_value to pedantic
````
Fixes #70993

r? @Dylan-DPC
2020-04-13 04:16:08 +00:00
Yuki Okushi
ef07cf4518
Remove FnCtxt::impl_self_ty 2020-04-13 11:36:37 +09:00
bors
cc072281f9 Auto merge of #71023 - mati865:mingw-unwind-linking-cleanup, r=Amanieu
[windows] Add testscase for self-contained executables and fix pthread linking

Fixes https://github.com/rust-lang/rust/issues/71061
2020-04-13 00:59:36 +00:00
bors
9fed360550 Auto merge of #71079 - Dylan-DPC:rollup-g7yh3sn, r=Dylan-DPC
Rollup of 4 pull requests

Successful merges:

 - #67766 (Fix warning for unused variables in or pattern (issue #67691))
 - #71013 (Pass the `PlaceElem::Index` local to `visit_local`)
 - #71064 (fix issue 69130)
 - #71069 (Remove some usage of `DUMMY_HIR_ID`)

Failed merges:

r? @ghost
2020-04-12 21:48:24 +00:00
Dylan DPC
69862b74fa
Rollup merge of #71069 - marmeladema:dummy-hir-id-obligation-clause, r=eddyb
Remove some usage of `DUMMY_HIR_ID`

Use `ObligationClause::dummy()` when appropriate or replace `hir::DUMMY_HIR_ID`by `hir::CRATE_HIR_ID`, as used in `ObligationClause::dummy()`.
2020-04-12 23:47:41 +02:00
Dylan DPC
ebb1a8b6ff
Rollup merge of #71064 - dwrensha:issue-69130, r=eddyb
fix issue 69130

Closes #69130.
2020-04-12 23:47:39 +02:00
Dylan DPC
c076da080c
Rollup merge of #71013 - jonas-schievink:visit-projection, r=eddyb
Pass the `PlaceElem::Index` local to `visit_local`

Fixes https://github.com/rust-lang/rust/issues/71008

cc @rust-lang/wg-mir-opt

r? @spastorino
2020-04-12 23:47:38 +02:00
Dylan DPC
6947dec3a6
Rollup merge of #67766 - sapir:fix-unused-in-or-pattern-warning, r=matthewjasper
Fix warning for unused variables in or pattern (issue #67691)

Is this a good way to fix it?

Also, the tests fail, the "fixed" code output says `{ i, j }` instead of `{ i, j: _ }`, how can I fix that?
2020-04-12 23:47:36 +02:00
marmeladema
0634789dee Remove usage of DUMMY_HIR_ID in Scope::hir_id 2020-04-12 21:01:55 +01:00
marmeladema
502ae0e898 Remove usage of DUMMY_HIR_ID in CheckAttrVisitor::check_inline 2020-04-12 21:01:55 +01:00
marmeladema
b4edda9849 Remove usage of DUMMY_HIR_ID in CheckLoopVisitor 2020-04-12 21:01:55 +01:00
marmeladema
812854cdd3 Remove usage of DUMMY_HIR_ID in calls to ObligationClause::misc
Use `ObligationClause::dummy()` when appropriate or replace
`hir::DUMMY_HIR_ID` by `hir::CRATE_HIR_ID`, as used in
`ObligationClause::dummy()`.
2020-04-12 21:01:55 +01:00