Commit graph

123560 commits

Author SHA1 Message Date
Eric Huss
8c6c1dd3d3 Automatically calculate std::env::consts::ARCH.
This simplifies the definition for ARCH.

Note that this changes asmjs-unknown-emscripten ARCH to `wasm32`,
which reflects the actual target arch.
2020-07-15 08:38:10 -07:00
Joshua Nelson
281ca13916 Use the default providers in rustc_interface instead of adding our own
This avoids duplicating the same struct twice.
2020-07-15 11:10:46 -04:00
Joshua Nelson
e117b47f75 Catch errors for any new item, not just trait implementations
This matches the previous behavior of everybody_loops and is also more
consistent than special-casing impls.
2020-07-15 10:54:06 -04:00
Joshua Nelson
6eec9fb5d1 Address review comments
- Move static variables into the innermost scope in which they are used
- Clean up comments
- Remove external_providers; rename local_providers -> providers
2020-07-15 10:54:06 -04:00
Joshua Nelson
ac9157b482 EMPTY_MAP -> EMPTY_SET 2020-07-15 10:54:06 -04:00
Joshua Nelson
b2ff0e703e Fix comment 2020-07-15 10:54:06 -04:00
Joshua Nelson
4c88070c87 Use mem::replace instead of rewriting it 2020-07-15 10:54:06 -04:00
Joshua Nelson
02a24c8e2f Don't ICE on infinitely recursive types
`evaluate_obligation` can only be run on types that are already valid.
So rustdoc still has to run typeck even though it doesn't care about the
result.
2020-07-15 10:54:05 -04:00
Joshua Nelson
2d0e8e2162 --bless 2020-07-15 10:54:05 -04:00
Joshua Nelson
0759a55fef Remove unnecessary lifetime parameter
TyCtxt is a reference type and so can be passed by value.
2020-07-15 10:54:05 -04:00
Joshua Nelson
763d373dab Use tcx as the only context for visitor
Previously two different parts of the context had to be passed
separately; there were two sources of truth.
2020-07-15 10:54:05 -04:00
Joshua Nelson
2f29e696ab Mention cargo check in help message 2020-07-15 10:54:05 -04:00
Joshua Nelson
bbe4971095 Don't crash on Vec<DoesNotExist> 2020-07-15 10:54:05 -04:00
Joshua Nelson
3576f5d7e1 Address review comments about code style 2020-07-15 10:54:05 -04:00
Joshua Nelson
0cbc1cddcc Avoid unnecessary enum
Just use a boolean instead.
2020-07-15 10:54:05 -04:00
Joshua Nelson
cf844d2eab Don't make typeck_tables_of public 2020-07-15 10:54:05 -04:00
Joshua Nelson
d01044305a Add test case for #65863 2020-07-15 10:54:05 -04:00
Joshua Nelson
a93bcc9a7b Recurse into function bodies, but don't typeck closures
Previously, rustdoc would issue a delay_span_bug ICE on the following code:

```rust
pub fn a() -> impl Fn() -> u32 {
    || content::doesnt::matter()
}
```

This wasn't picked up earlier because having `type Alias = impl Trait;`
in the same module caused _all closures_ to be typechecked, even if they
wouldn't normally. Additionally, if _any_ error was emitted, no
delay_span_bug would be emitted. So as part of this commit all of the
tests were separated out into different files.
2020-07-15 10:54:05 -04:00
Joshua Nelson
768d6a4950 Don't ICE on errors in function returning impl trait
Instead, report the error.

This emits the errors on-demand, without special-casing `impl Trait`, so
it should catch all ICEs of this kind, including ones that haven't been
found yet.

Since the error is emitted during type-checking there is less info about
the error; see comments in the code for details.

- Add test case for -> impl Trait
- Add test for impl trait with alias
- Move EmitIgnoredResolutionErrors to rustdoc

This makes `fn typeck_item_bodies` public, which is not desired behavior.
That change should be removed once
https://github.com/rust-lang/rust/pull/74070 is merged.

- Don't visit nested closures twice
2020-07-15 10:54:05 -04:00
Dylan MacKenzie
14a8707cde Add rustdoc tests from #72088 2020-07-15 10:54:05 -04:00
Joshua Nelson
1b8accb749 Add an option not to report resolution errors for rustdoc
- Remove unnecessary `should_loop` variable
- Report errors for trait implementations

These should give resolution errors because they are visible outside the
current scope. Without these errors, rustdoc will give ICEs:

```
thread 'rustc' panicked at 'attempted .def_id() on invalid res: Err', /home/joshua/src/rust/src/libstd/macros.rs:16:9
  15: rustc_hir::def::Res<Id>::def_id
             at /home/joshua/src/rust/src/librustc_hir/def.rs:382
  16: rustdoc::clean::utils::register_res
             at src/librustdoc/clean/utils.rs:627
  17: rustdoc::clean::utils::resolve_type
             at src/librustdoc/clean/utils.rs:587
```

- Add much more extensive tests
  + fn -> impl -> fn
  + fn -> impl -> fn -> macro
  + errors in function parameters
  + errors in trait bounds
  + errors in the type implementing the trait
  + unknown bounds for the type
  + unknown types in function bodies
  + errors generated by macros

- Use explicit state instead of trying to reconstruct it from random info
- Use an enum instead of a boolean
- Add example of ignored error
2020-07-15 10:54:05 -04:00
Joshua Nelson
b3187aabd2 Don't run analysis pass in rustdoc
- Explicitly check for missing docs
- Don't run any lints except those we explicitly specified
2020-07-15 10:54:05 -04:00
Joshua Nelson
a5275ff415 Don't run everybody_loops for rustdoc
Instead, ignore resolution errors that occur in item bodies.

The reason this can't ignore item bodies altogether is because
`const fn` could be used in generic types, for example `[T; f()]`
2020-07-15 10:54:05 -04:00
Joshua Nelson
f6764c42ab Initialize default providers only once
This avoids copying a new `Providers` struct for each downstream crate
that wants to use it.
2020-07-15 10:53:36 -04:00
bors
7e11379f3b Auto merge of #74113 - lcnr:type-dependent-consts-2, r=eddyb
Support const args in type dependent paths (Take 2)

once more, except it is sound this time 🥰 previously #71154

-----
```rust
#![feature(const_generics)]

struct A;
impl A {
    fn foo<const N: usize>(&self) -> usize { N }
}
struct B;
impl B {
    fn foo<const N: usize>(&self) -> usize { 42 }
}

fn main() {
    let a = A;
    a.foo::<7>();
}
```
When calling `type_of` for generic const arguments, we now use the `TypeckTables` of the surrounding body to get the expected type.

This alone causes cycle errors though, as we now have `typeck_tables_of(main)` -> `...` ->
`type_of(main_ANON0 := 7)` -> `typeck_tables_of(main)`  (see https://github.com/rust-lang/rust/issues/68400#issuecomment-611760290)

To prevent this we must not call `type_of(const_arg)` during `typeck_tables_of`. This is achieved by
calling `type_of(param_def_id)` instead.

We have to somehow remember the `DefId` of the param through all of typeck, which is done using the
struct `ty::WithOptConstParam<DefId>`, which replaces `DefId` where needed and contains an `Option<DefId>` to
be able to store the const parameter in case it exists.

Queries which are currently cached on disk are split into two variants: `query_name`(cached) and `query_name_(of|for)_const_arg`(not cached), with `query_name_of_const_arg` taking a pair `(did, param_did): (LocalDefId, DefId)`.

For some queries a method `query_name_of_opt_const_arg` is added to `TyCtxt` which takes a `ty::WithOptConstParam` and either calls `query_name` or `query_name_of_const_arg` depending on the value of `const_param_did`.

r? @eddyb @varkor
2020-07-15 12:49:25 +00:00
Bastian Kauschke
2666aed498 unify Instance::resolve 2020-07-15 13:06:47 +02:00
Bastian Kauschke
e070b45e6a unsafety_check_result_for_const_arg 2020-07-15 13:06:47 +02:00
Bastian Kauschke
aca66bd052 WithOptConstParam::dummy -> WithOptConstParam::unknown 2020-07-15 13:06:47 +02:00
Bastian Kauschke
8003ccfdcd ty_def_id -> def_id_for_type_of 2020-07-15 13:06:47 +02:00
Bastian Kauschke
a909eb6b65 improve naming 2020-07-15 13:06:47 +02:00
Bastian Kauschke
805c44d5d3 cleanup 2020-07-15 12:58:33 +02:00
Bastian Kauschke
a7fe4df04a update promoted_mir 2020-07-15 12:58:33 +02:00
Bastian Kauschke
ae80d7e012 update const arg queries 2020-07-15 12:58:33 +02:00
Bastian Kauschke
08394eb121 update test 2020-07-15 12:58:32 +02:00
Bastian Kauschke
29b5844c2d only call typeck_tables_of_const_arg for const args 2020-07-15 12:58:32 +02:00
Bastian Kauschke
9df03ccf62 mir opt cross compile 2020-07-15 12:58:32 +02:00
Bastian Kauschke
d4cb820528 mir_built is a lie 2020-07-15 12:58:32 +02:00
Bastian Kauschke
aa02692570 decode stuff 2020-07-15 12:58:32 +02:00
Bastian Kauschke
050acc0213 ui test diff 2020-07-15 12:58:32 +02:00
Bastian Kauschke
4ef1029f5c mir opt diff 2020-07-15 12:58:32 +02:00
Bastian Kauschke
48bbf49765 const generics work! 2020-07-15 12:58:32 +02:00
Bastian Kauschke
b615b98f33 continue mir pipeline 2020-07-15 12:58:32 +02:00
Bastian Kauschke
316128c38a optimized_mir 2020-07-15 12:58:32 +02:00
Bastian Kauschke
a8419099d1 InstanceDef::Item 2020-07-15 12:58:32 +02:00
Bastian Kauschke
178c6507f6 typeck all the tables 2020-07-15 12:58:32 +02:00
Bastian Kauschke
2e6bf0923b const_eval_resolve 2020-07-15 12:58:32 +02:00
Bastian Kauschke
58031c7cb2 ConstKind::Unevaluated 2020-07-15 12:58:32 +02:00
Bastian Kauschke
08865d94e5 begin using WithOptParam 2020-07-15 12:58:32 +02:00
Bastian Kauschke
37a6103e1a introduce the query opt_const_param_of 2020-07-15 12:58:32 +02:00
Bastian Kauschke
2111d6f276 add const generic tests 2020-07-15 12:58:32 +02:00