Skip to content

Rollup of 20 pull requests #49317

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

Closed
wants to merge 83 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
683ad94
Add OnDrop
Zoxc Mar 15, 2018
3b43dcb
Replace Rc with Lrc
Zoxc Mar 14, 2018
910bf84
Always print `aborting due to n previous error(s)` and only print it …
Zoxc Mar 15, 2018
b1d872b
Update tests
Zoxc Mar 15, 2018
6fd4d67
rustbuild: Tweak where timing information goes
alexcrichton Mar 16, 2018
b57ea56
Stabilise FromUtf8Error::as_bytes
varkor Mar 17, 2018
b498192
Add a -Z flag for LLVM align attributes on arguments
scottmcm Mar 17, 2018
9a44448
add simd_select intrinsic
gnzlbg Mar 18, 2018
cca2604
add codegen test
gnzlbg Mar 18, 2018
c5c650d
Split out termination_trait_test feature gate
tmandry Mar 19, 2018
97b3bf9
Stabilize termination_trait
tmandry Mar 19, 2018
e5a55e7
Stabilize termination_trait in 1.25, not 1.26
tmandry Mar 19, 2018
be29e52
Match against friendly error message
tmandry Mar 20, 2018
5ccf3ff
diagnostics: Remove main return type errors from E0580
tmandry Mar 20, 2018
4eff4d9
ignore emscripten in run-pass test
gnzlbg Mar 20, 2018
1ef6948
Stabilize i128_type
mark-i-m Mar 17, 2018
0fe791c
Update nightly book
mark-i-m Mar 17, 2018
b5e991e
Stabilize i128 feature too
mark-i-m Mar 17, 2018
b7bec01
Rename unstable-book chapter
mark-i-m Mar 17, 2018
e4457b3
Rename unstable book correctly
mark-i-m Mar 17, 2018
8a334c9
remove unneeded import
mark-i-m Mar 17, 2018
1197f9a
Fix missed i128 feature gates
mark-i-m Mar 17, 2018
0027e98
Fix a few more
mark-i-m Mar 17, 2018
bca8eeb
Fix a few more unstables that I missed
mark-i-m Mar 18, 2018
a347bb3
update test
mark-i-m Mar 18, 2018
cf41fde
Fix e0658 ui test
mark-i-m Mar 18, 2018
116dd62
Remove library feature test
mark-i-m Mar 18, 2018
53405ec
Update to master of libcompiler_builtins
mark-i-m Mar 20, 2018
72334fe
typeck: Report main return type errors on return type span
tmandry Mar 20, 2018
57896ab
Make resuming generators unsafe instead of the creation of immovable …
Zoxc Mar 19, 2018
ac33ec7
did i get it right now?
mark-i-m Mar 21, 2018
1937661
Revert "Stabilize termination_trait in 1.25, not 1.26"
tmandry Mar 21, 2018
94bdeb6
termination_trait: Add () example to error message
tmandry Mar 21, 2018
2cdc7af
Use NOTE instead of error-pattern directive
tmandry Mar 21, 2018
06f8103
Bump racer and home
Eijebong Mar 21, 2018
75dcc61
Cargo fmt libtest
topecongiro Mar 21, 2018
b6934c9
termination_trait: Put examples in error help, not label
tmandry Mar 21, 2018
178652a
Add support to rustbuild for a 'rustc docs' component tarball
davidtwco Mar 20, 2018
1392179
Configure the dist-x86_64-linux builder to produce compiler documenta…
davidtwco Mar 20, 2018
f6a35aa
implement minmax intrinsics
gnzlbg Mar 21, 2018
c116b0e
Fixed clockwise/counter-clockwise in atan2 documentation in f32 and f64
Tacklebox Mar 22, 2018
2b13d95
termination_trait: Make error message more helpful
tmandry Mar 22, 2018
ecafa7b
add tests
gnzlbg Mar 22, 2018
a1a3bf2
Fix DefKey lookup for proc-macro crates.
michaelwoerister Mar 22, 2018
88268d7
require llvm 6
gnzlbg Mar 22, 2018
9839e5f
Remove slow HashSet during miri stack frame creation
oli-obk Mar 22, 2018
0118a65
properly handle the case when LLVM does not have min/maxnum
gnzlbg Mar 22, 2018
9fa14e4
Skip checking for Storage* statements in constants/statics
oli-obk Mar 22, 2018
d87b403
set min-llvm-version 6.0, ignore-emscripten
gnzlbg Mar 22, 2018
1b0e9f5
Only generate documentation for local rustc crates.
davidtwco Mar 22, 2018
73fa6d5
Remove std/test documentation from compiler docs.
davidtwco Mar 22, 2018
86f7d89
Allow installing rustfmt without config.extended
cuviper Mar 23, 2018
a09e9e9
ci: Don't use Travis caches for docker images
alexcrichton Mar 22, 2018
bf8e4f2
Vec<_> -> IndexVec<Local, _>
oli-obk Mar 23, 2018
b18b776
Replace uses of `Hash(Map|Set)` with `FxHash(Map|Set)` in miri
oli-obk Mar 23, 2018
4ea4dd2
Don't allocate a local array at all if there are no locals
oli-obk Mar 23, 2018
f9019ae
Simplify local accessors
oli-obk Mar 23, 2018
90588a9
Fix IE11 search
GuillaumeGomez Mar 23, 2018
700fd5a
Remove getopts leftover from tree
Mark-Simulacrum Mar 23, 2018
8921c16
Rollup merge of #48482 - davidtwco:issue-47184, r=nikomatsakis
alexcrichton Mar 23, 2018
19f8431
Rollup merge of #49046 - Zoxc:error-summary, r=michaelwoerister
alexcrichton Mar 23, 2018
d17afd1
Rollup merge of #49089 - alexcrichton:fix-timings, r=Mark-Simulacrum
alexcrichton Mar 23, 2018
20b5bf6
Rollup merge of #49101 - mark-i-m:stabilize_i128, r=nagisa
alexcrichton Mar 23, 2018
59b5887
Rollup merge of #49121 - varkor:stabilise-from_utf8_error_as_bytes, r…
alexcrichton Mar 23, 2018
4a3b5f7
Rollup merge of #49122 - scottmcm:z-align-attr, r=cramertj
alexcrichton Mar 23, 2018
9b0a43e
Rollup merge of #49141 - gnzlbg:simd_select, r=alexcrichton
alexcrichton Mar 23, 2018
6986057
Rollup merge of #49193 - davidtwco:issue-29893, r=alexcrichton
alexcrichton Mar 23, 2018
23ce530
Rollup merge of #49194 - Zoxc:unsafe-generator, r=cramertj
alexcrichton Mar 23, 2018
7fbc373
Rollup merge of #49203 - Eijebong:lets-cleanup-dependencies, r=Mark-S…
alexcrichton Mar 23, 2018
414e1d8
Rollup merge of #49235 - topecongiro:run-rustfmt/libtest, r=nrc
alexcrichton Mar 23, 2018
913adba
Rollup merge of #49249 - gnzlbg:simd_minmax, r=alexcrichton
alexcrichton Mar 23, 2018
8a1731a
Rollup merge of #49254 - Tacklebox:atan2_doc, r=QuietMisdreavus
alexcrichton Mar 23, 2018
cd9fb22
Rollup merge of #49273 - michaelwoerister:fix-extern-proc-macro-defke…
alexcrichton Mar 23, 2018
f0ea0c7
Rollup merge of #49274 - oli-obk:slow_miri, r=michaelwoerister,eddyb
alexcrichton Mar 23, 2018
8c653a7
Rollup merge of #49284 - alexcrichton:use-our-own-cache, r=kennytm
alexcrichton Mar 23, 2018
6c73231
Rollup merge of #49290 - cuviper:unextended-dist-rustfmt, r=nikomatsakis
alexcrichton Mar 23, 2018
0615e6b
Rollup merge of #49311 - SimonSapin:bootstrap-vs-rustflags-the-return…
alexcrichton Mar 23, 2018
8cb9b83
Rollup merge of #49312 - GuillaumeGomez:fix-ie11-search, r=QuietMisdr…
alexcrichton Mar 23, 2018
b928781
Rollup merge of #49314 - Mark-Simulacrum:remove-getopts, r=alexcrichton
alexcrichton Mar 23, 2018
ba92a7b
Merge branch 'stabilize-termination-trait' of https://github.com/tman…
alexcrichton Mar 23, 2018
bbdb20a
Test fixes and merge conflicts
alexcrichton Mar 23, 2018
455e542
Merge remote-tracking branch 'origin/master' into rollup
alexcrichton Mar 24, 2018
fc23686
More test fixes
alexcrichton Mar 24, 2018
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
Update tests
  • Loading branch information
Zoxc committed Mar 16, 2018
commit b1d872b38eaacefbef73faa6a4a0c07622a8c941
2 changes: 2 additions & 0 deletions src/test/ui-fulldeps/custom-derive/issue-36935.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ LL | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
|
= help: message: lolnope

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui-fulldeps/proc-macro/load-panic.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ LL | #[derive(A)]
|
= help: message: nope!

error: aborting due to previous error

3 changes: 2 additions & 1 deletion src/test/ui/codemap_tests/two_files.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ error[E0404]: expected trait, found type alias `Bar`
LL | impl Bar for Baz { } //~ ERROR expected trait, found type alias
| ^^^ type aliases cannot be used for traits

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0404`.
2 changes: 2 additions & 0 deletions src/test/ui/cross-file-errors/main.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ LL | _
LL | underscore!();
| -------------- in this macro invocation

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/did_you_mean/recursion_limit_macro.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ LL | recurse!(0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9);
|
= help: consider adding a `#![recursion_limit="20"]` attribute to your crate

error: aborting due to previous error

3 changes: 2 additions & 1 deletion src/test/ui/error-codes/E0404.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ error[E0404]: expected trait, found struct `Foo`
LL | fn baz<T: Foo>(_: T) {} //~ ERROR E0404
| ^^^ not a trait

error: cannot continue compilation due to previous error
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0404`.
3 changes: 2 additions & 1 deletion src/test/ui/error-codes/E0405.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ error[E0405]: cannot find trait `SomeTrait` in this scope
LL | impl SomeTrait for Foo {} //~ ERROR E0405
| ^^^^^^^^^ not found in this scope

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0405`.
2 changes: 2 additions & 0 deletions src/test/ui/feature-gate-fn_must_use-cap-lints-allow.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ error: compilation successful
LL | fn main() {} //~ ERROR compilation successful
| ^^^^^^^^^^^^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/feature-gate-fn_must_use.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ error: compilation successful
LL | fn main() {} //~ ERROR compilation successful
| ^^^^^^^^^^^^

error: aborting due to previous error

Original file line number Diff line number Diff line change
Expand Up @@ -1316,3 +1316,5 @@ LL | | println!("Hello World");
LL | | }
| |_^

error: aborting due to previous error

Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ LL | | println!("Hello World");
LL | | }
| |_^

error: aborting due to previous error

4 changes: 3 additions & 1 deletion src/test/ui/impl-trait/universal_wrong_bounds.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ help: possible candidate is found in another module, you can import it into scop
LL | use std::fmt::Debug;
|

error: cannot continue compilation due to previous error
error: aborting due to 3 previous errors

Some errors occurred: E0405, E0425.
For more information about an error, try `rustc --explain E0405`.
2 changes: 2 additions & 0 deletions src/test/ui/issue-22644.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,5 @@ error: expected type, found `4`
LL | println!("{}", a: &mut 4); //~ ERROR expected type, found `4`
| ^ expecting a type here because of type ascription

error: aborting due to 9 previous errors

2 changes: 2 additions & 0 deletions src/test/ui/issue-44406.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ LL | bar(baz: $rest)
LL | foo!(true); //~ ERROR expected type, found keyword
| ^^^^ expecting a type here because of type ascription

error: aborting due to 2 previous errors

2 changes: 2 additions & 0 deletions src/test/ui/lint-output-format-2.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ LL | | let _y = bar();
LL | | }
| |_^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/loops-reject-duplicate-labels-2.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ LL | | foo();
LL | | }
| |_^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/loops-reject-duplicate-labels.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,5 @@ LL | | foo();
LL | | }
| |_^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,5 @@ LL | | foo();
LL | | }
| |_^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/loops-reject-lifetime-shadowing-label.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ LL | | foo();
LL | | }
| |_^

error: aborting due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/macro-context.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ LL | () => ( i ; typeof ); //~ ERROR expected expression, found reserved k
LL | m!();
| ----- in this macro invocation

error: aborting due to 4 previous errors

3 changes: 2 additions & 1 deletion src/test/ui/macros/macro_path_as_generic_bound.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ error[E0433]: failed to resolve. Use of undeclared type or module `m`
LL | foo!(m::m2::A); //~ ERROR failed to resolve
| ^ Use of undeclared type or module `m`

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0433`.
2 changes: 2 additions & 0 deletions src/test/ui/macros/trace_faulty_macros.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ LL | my_recursive_macro!();
= note: expanding `my_recursive_macro! { }`
= note: to `my_recursive_macro ! ( ) ;`

error: aborting due to 2 previous errors

2 changes: 2 additions & 0 deletions src/test/ui/raw_string.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ LL | let x = r##"lol"#;
|
= note: this raw string should be terminated with `"##`

error: aborting due to previous error

4 changes: 3 additions & 1 deletion src/test/ui/resolve/issue-21221-1.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,7 @@ help: possible candidate is found in another module, you can import it into scop
LL | use std::ops::Div;
|

error: cannot continue compilation due to previous error
error: aborting due to 4 previous errors

Some errors occurred: E0405, E0412.
For more information about an error, try `rustc --explain E0405`.
3 changes: 2 additions & 1 deletion src/test/ui/resolve/issue-21221-2.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ help: possible candidate is found in another module, you can import it into scop
LL | use foo::bar::T;
|

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0405`.
3 changes: 2 additions & 1 deletion src/test/ui/resolve/issue-21221-3.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ help: possible candidate is found in another module, you can import it into scop
LL | use issue_21221_3::outer::OuterTrait;
|

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0405`.
3 changes: 2 additions & 1 deletion src/test/ui/resolve/issue-21221-4.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ help: possible candidate is found in another module, you can import it into scop
LL | use issue_21221_4::T;
|

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0405`.
3 changes: 2 additions & 1 deletion src/test/ui/resolve/issue-3907.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ help: possible better candidate is found in another module, you can import it in
LL | use issue_3907::Foo;
|

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0404`.
4 changes: 3 additions & 1 deletion src/test/ui/resolve/issue-5035.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ LL | impl K for isize {} //~ ERROR expected trait, found type alias `K`
| did you mean `I`?
| type aliases cannot be used for traits

error: cannot continue compilation due to previous error
error: aborting due to 2 previous errors

Some errors occurred: E0404, E0432.
For more information about an error, try `rustc --explain E0404`.
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ error[E0404]: expected trait, found type alias `Typedef`
LL | fn g<F:Typedef(isize) -> isize>(x: F) {}
| ^^^^^^^^^^^^^^^^^^^^^^^ type aliases cannot be used for traits

error: cannot continue compilation due to previous error
error: aborting due to 2 previous errors

Some errors occurred: E0404, E0405.
For more information about an error, try `rustc --explain E0404`.
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
error: cannot continue compilation due to previous error

2 changes: 2 additions & 0 deletions src/test/ui/span/issue-24690.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ LL | | println!("{}", theTwo);
LL | | }
| |_^

error: aborting due to previous error

3 changes: 2 additions & 1 deletion src/test/ui/span/issue-35987.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ help: possible better candidate is found in another module, you can import it in
LL | use std::ops::Add;
|

error: cannot continue compilation due to previous error
error: aborting due to previous error

For more information about this error, try `rustc --explain E0404`.