8000 Rollup of 8 pull requests by Centril · Pull Request #70351 · rust-lang/rust · GitHub
[go: up one dir, main page]

Skip to content

Rollup of 8 pull requests #70351

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

Merged
merged 46 commits into from
Mar 24, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b90edfc
Fix sequence of Type and Trait in optin-builtin-traits in Unstable Book
ArekPiekarz Mar 6, 2020
c54ce49
Remove unused `ModuleConfig::emit_lto_bc` field.
nnethercote Mar 19, 2020
d8448d2
infer: export methods on `InferCtxt` instead of `ShallowResolver`.
eddyb Mar 21, 2020
40f73e7
traits/fulfill: allow `stalled_on` to track `ty::Const::Infer(_)` (un…
eddyb Mar 21, 2020
78c178b
traits/fulfill: add a couple FIXME comments about potential optimizat…
eddyb Mar 21, 2020
4f40511
Resolve worsened debug build codegen
wesleywiser Mar 22, 2020
61d3be8
Use Reveal::All in MIR inliner
wesleywiser Mar 22, 2020
645fedd
correctly handle const params in type_of
lcnr Mar 22, 2020
d156bf6
Remove some local variables.
nnethercote Mar 20, 2020
47c8f3f
Combine `ModuleConfig::embed_bitcode{,_marker}`.
nnethercote Mar 20, 2020
e4b36ba
Remove an unnecessary block scope.
nnethercote Mar 20, 2020
f8261b4
Factor out a repeated `config.obj_is_bitcode` test.
nnethercote Mar 20, 2020
a147cd0
Introduce a local variable `config_emit_normal_obj`.
nnethercote Mar 20, 2020
ca0f997
Factor out a repeated `config.no_integrated_as` test.
nnethercote Mar 20, 2020
96e2d03
Store idents for `DefPathData` into crate metadata
Aaron1011 Mar 17, 2020
86b8dea
Ignore tests on some platforms due to #53081
Aaron1011 Mar 23, 2020
6a7106c
type_of AnonConst AssocTy does not require parent
lcnr Mar 23, 2020
0a17c4c
fix comment
lcnr Mar 23, 2020
e8f0a64
Make the `type_of` return a generic type for generators
Zoxc Jan 14, 2020
47a84f2
Update tests
Zoxc Feb 6, 2020
0f2d968
rustc_expand::base: nix panictry! uses
Centril Mar 17, 2020
0a8db69
nix panictry! in ParserAnyMacro::make
Centril Mar 17, 2020
b7909b2
nix remaining rustc_expand::panictry! uses.
Centril Mar 17, 2020
b0537e2
generic_extension: defatalize Error case
Centril Mar 17, 2020
35cca74
defatalize BangProcMacro::expand
Centril Mar 17, 2020
ce8880d
defatalize AttrProcMacro::expand
Centril Mar 17, 2020
c1ef1b3
defatalize ProcMacroDerive::expand
Centril Mar 17, 2020
ad26401
remove ExtCxt::struct_span_warn
Centril Mar 17, 2020
df9cec2
mbe::transcribe: defatalize errors.
Centril Mar 17, 2020
1bfa248
defatalize `compile_declarative_macro`
Centril Mar 17, 2020
2868045
expand: nix unused method
Centril Mar 17, 2020
0e0f931
defatalize get_test_runner
Centril Mar 17, 2020
3979964
defatalize expand_test_or_bench
Centril Mar 17, 2020
21944b3
expand: add recovery for parse_nt
Centril Mar 17, 2020
d8080d8
expand: address review comments
Centril Mar 18, 2020
d071035
fix rebase fallout
Centril Mar 20, 2020
c415f12
fix rebase fallout due to #69497.
Centril Mar 21, 2020
470e163
pacify missing sysroot spans issue
Centril Mar 23, 2020
a130954
Rollup merge of #68884 - Zoxc:gen-type, r=nikomatsakis
Centril Mar 24, 2020
0a39964
Rollup merge of #69788 - ArekPiekarz:unstable_book_optin_builtin_trai…
Centril Mar 24, 2020
3d8b961
Rollup merge of #70074 - Centril:unpanictry, r=petrochenkov
Centril Mar 24, 2020
d626f5b
Rollup merge of #70077 - Aaron1011:feature/new-def-path-ident, r=petr…
Centril Mar 24, 2020
7bd86ce
Rollup merge of #70213 - eddyb:stalled-on-ty-or-const, r=nikomatsakis
Centril Mar 24, 2020
0d5b83d
Rollup merge of #70259 - wesleywiser:use_reveal_all, r=eddyb
Centril Mar 24, 2020
d309058
Rollup merge of #70284 - lcnr:issue70273-what-the-heck-git, r=eddyb
Centril Mar 24, 2020
170112c
Rollup merge of #70289 - nnethercote:refactor-codegen, r=eddyb
Centril Mar 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ignore tests on some platforms due to #53081
  • Loading branch information
Aaron1011 committed Mar 23, 2020
commit 86b8dea5ecb10dd12f9e352e9f31ced88a16e5e8
5 changes: 5 additions & 0 deletions src/test/ui/copy-a-resource.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

#[derive(Debug)]
struct Foo {
i: isize,
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/copy-a-resource.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for struct `Foo` in the current scope
--> $DIR/copy-a-resource.rs:18:16
--> $DIR/copy-a-resource.rs:23:16
|
LL | struct Foo {
| ---------- method `clone` not found for this
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/derives/derive-assoc-type-not-impl.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

trait Foo {
type X;
fn method(&self) {}
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/derives/derive-assoc-type-not-impl.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for struct `Bar<NotClone>` in the current scope
--> $DIR/derive-assoc-type-not-impl.rs:18:30
--> $DIR/derive-assoc-type-not-impl.rs:23:30
|
LL | struct Bar<T: Foo> {
| ------------------
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/error-codes/E0004-2.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

fn main() {
let x = Some(1);

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/error-codes/E0004-2.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: `None` and `Some(_)` not covered
--> $DIR/E0004-2.rs:4:11
--> $DIR/E0004-2.rs:9:11
|
LL | match x { }
| ^ patterns `None` and `Some(_)` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/error-codes/E0005.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

fn main() {
let x = Some(1);
let Some(y) = x; //~ ERROR E0005
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/error-codes/E0005.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `None` not covered
--> $DIR/E0005.rs:3:9
--> $DIR/E0005.rs:8:9
|
LL | let Some(y) = x;
| ^^^^^^^ pattern `None` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/error-codes/E0297.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

fn main() {
let xs : Vec<Option<i32>> = vec![Some(1), None];

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/error-codes/E0297.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in `for` loop binding: `None` not covered
--> $DIR/E0297.rs:4:9
--> $DIR/E0297.rs:9:9
|
LL | for Some(x) in xs {}
| ^^^^^^^ pattern `None` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

#![feature(never_type)]

fn foo() -> Result<u32, !> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `Err(_)` not covered
--> $DIR/feature-gate-exhaustive-patterns.rs:8:9
--> $DIR/feature-gate-exhaustive-patterns.rs:13:9
|
LL | let Ok(_x) = foo();
| ^^^^^^ pattern `Err(_)` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/generic-associated-types/iterable.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

#![allow(incomplete_features)]
#![feature(generic_associated_types)]

Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/generic-associated-types/iterable.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0271]: type mismatch resolving `for<'a> <<std::vec::Vec<T> as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <std::vec::Vec<T> as Iterable>::Item<'a>`
--> $DIR/iterable.rs:15:5
--> $DIR/iterable.rs:20:5
|
LL | impl<T> Iterable for Vec<T> {
| --------------------------- in this `impl` item
Expand All @@ -17,7 +17,7 @@ LL | type Item;
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html

error[E0271]: type mismatch resolving `for<'a> <<[T] as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <[T] as Iterable>::Item<'a>`
--> $DIR/iterable.rs:27:5
--> $DIR/iterable.rs:32:5
|
LL | impl<T> Iterable for [T] {
| ------------------------ in this `impl` item
Expand All @@ -35,7 +35,7 @@ LL | type Item;
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html

error[E0271]: type mismatch resolving `for<'a> <<std::vec::Vec<T> as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <std::vec::Vec<T> as Iterable>::Item<'a>`
--> $DIR/iterable.rs:19:30
--> $DIR/iterable.rs:24:30
|
LL | trait Iterable {
| -------------- required by `Iterable`
Expand All @@ -49,7 +49,7 @@ LL | fn iter<'a>(&'a self) -> Self::Iter<'a> {
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html

error[E0271]: type mismatch resolving `for<'a> <<[T] as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <[T] as Iterable>::Item<'a>`
--> $DIR/iterable.rs:31:30
--> $DIR/iterable.rs:36:30
|
LL | trait Iterable {
| -------------- required by `Iterable`
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/issues/issue-2823.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

struct C {
x: isize,
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-2823.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for struct `C` in the current scope
--> $DIR/issue-2823.rs:13:16
--> $DIR/issue-2823.rs:18:16
|
LL | struct C {
| -------- method `clone` not found for this
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/issues/issue-69725.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

// aux-build:issue-69725.rs

extern crate issue_69725;
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-69725.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for struct `issue_69725::Struct<A>` in the current scope
--> $DIR/issue-69725.rs:7:32
--> $DIR/issue-69725.rs:12:32
|
LL | let _ = Struct::<A>::new().clone();
| ^^^^^ method not found in `issue_69725::Struct<A>`
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/non-copyable-void.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

// ignore-wasm32-bare no libc to test ffi with

#![feature(rustc_private)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/non-copyable-void.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for enum `libc::c_void` in the current scope
--> $DIR/non-copyable-void.rs:11:23
--> $DIR/non-copyable-void.rs:16:23
|
LL | let _z = (*y).clone();
| ^^^^^ method not found in `libc::c_void`
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/noncopyable-class.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

// Test that a class with a non-copyable field can't be
// copied

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/noncopyable-class.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0599]: no method named `clone` found for struct `Foo` in the current scope
--> $DIR/noncopyable-class.rs:34:16
--> $DIR/noncopyable-class.rs:39:16
|
LL | struct Foo {
| ---------- method `clone` not found for this
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/pattern/usefulness/match-arm-statics-2.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

use self::Direction::{North, East, South, West};

#[derive(PartialEq, Eq)]
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/pattern/usefulness/match-arm-statics-2.stderr
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
error[E0004]: non-exhaustive patterns: `(true, false)` not covered
--> $DIR/match-arm-statics-2.rs:17:11
--> $DIR/match-arm-statics-2.rs:22:11
|
LL | match (true, false) {
| ^^^^^^^^^^^^^ pattern `(true, false)` not covered
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `Some(Some(West))` not covered
--> $DIR/match-arm-statics-2.rs:29:11
--> $DIR/match-arm-statics-2.rs:34:11
|
LL | match Some(Some(North)) {
| ^^^^^^^^^^^^^^^^^ pattern `Some(Some(West))` not covered
Expand All @@ -23,7 +23,7 @@ LL | Some(#[stable(feature = "rust1", since = "1.0.0")] T),
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `Foo { bar: Some(North), baz: NewBool(true) }` not covered
--> $DIR/match-arm-statics-2.rs:48:11
--> $DIR/match-arm-statics-2.rs:53:11
|
LL | / struct Foo {
LL | | bar: Option<Direction>,
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/pattern/usefulness/match-privately-empty.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

#![feature(never_type)]
#![feature(exhaustive_patterns)]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: `Some(Private { misc: true, .. })` not covered
--> $DIR/match-privately-empty.rs:13:11
--> $DIR/match-privately-empty.rs:18:11
|
LL | match private::DATA {
| ^^^^^^^^^^^^^ pattern `Some(Private { misc: true, .. })` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/pattern/usefulness/non-exhaustive-match.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

#![allow(illegal_floating_point_literal_pattern)]

enum T { A, B }
Expand Down
16 changes: 8 additions & 8 deletions src/test/ui/pattern/usefulness/non-exhaustive-match.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: `A` not covered
--> $DIR/non-exhaustive-match.rs:7:11
--> $DIR/non-exhaustive-match.rs:12:11
|
LL | enum T { A, B }
| ---------------
Expand All @@ -13,15 +13,15 @@ LL | match x { T::B => { } }
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `false` not covered
--> $DIR/non-exhaustive-match.rs:8:11
--> $DIR/non-exhaustive-match.rs:13:11
|
LL | match true {
| ^^^^ pattern `false` not covered
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `Some(_)` not covered
--> $DIR/non-exhaustive-match.rs:11:11
--> $DIR/non-exhaustive-match.rs:16:11
|
LL | match Some(10) {
| ^^^^^^^^ pattern `Some(_)` not covered
Expand All @@ -34,23 +34,23 @@ LL | Some(#[stable(feature = "rust1", since = "1.0.0")] T),
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `(_, _, std::i32::MIN..=3i32)` and `(_, _, 5i32..=std::i32::MAX)` not covered
--> $DIR/non-exhaustive-match.rs:14:11
--> $DIR/non-exhaustive-match.rs:19:11
|
LL | match (2, 3, 4) {
| ^^^^^^^^^ patterns `(_, _, std::i32::MIN..=3i32)` and `(_, _, 5i32..=std::i32::MAX)` not covered
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `(A, A)` not covered
--> $DIR/non-exhaustive-match.rs:18:11
--> $DIR/non-exhaustive-match.rs:23:11
|
LL | match (T::A, T::A) {
| ^^^^^^^^^^^^ pattern `(A, A)` not covered
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `B` not covered
--> $DIR/non-exhaustive-match.rs:22:11
--> $DIR/non-exhaustive-match.rs:27:11
|
LL | enum T { A, B }
| ---------------
Expand All @@ -64,15 +64,15 @@ LL | match T::A {
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `[]` not covered
--> $DIR/non-exhaustive-match.rs:33:11
--> $DIR/non-exhaustive-match.rs:38:11
|
LL | match *vec {
| ^^^^ pattern `[]` not covered
|
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms

error[E0004]: non-exhaustive patterns: `[_, _, _, _, ..]` not covered
--> $DIR/non-exhaustive-match.rs:46:11
--> $DIR/non-exhaustive-match.rs:51:11
|
LL | match *vec {
| ^^^^ pattern `[_, _, _, _, ..]` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/recursion/recursive-types-are-not-uninhabited.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

struct R<'a> {
r: &'a R<'a>,
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `Err(_)` not covered
--> $DIR/recursive-types-are-not-uninhabited.rs:6:9
--> $DIR/recursive-types-are-not-uninhabited.rs:11:9
|
LL | let Ok(x) = res;
| ^^^^^ pattern `Err(_)` not covered
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl

use std::mem::zeroed;
enum Void {}

Expand Down
Loading
0