]> git.lizzy.rs Git - rust.git/log
rust.git
6 years agoRollup merge of #47986 - Gilnaa:libtest_relaxed, r=Mark-Simulacrum
kennytm [Tue, 6 Feb 2018 19:23:24 +0000 (03:23 +0800)]
Rollup merge of #47986 - Gilnaa:libtest_relaxed, r=Mark-Simulacrum

libtest: Replace panics with error messages

This replaces explicit panics on failures in libtest with prints to stderr.
Where "failures" == CLI argument parsing and such

Before:
```
$ ./foo-stable --not-an-option
thread 'main' panicked at '"Unrecognized option: \'not-an-option\'"', libtest/lib.rs:251:27
note: Run with `RUST_BACKTRACE=1` for a backtrace.
```

After:
```
$ ./foo-nightly --not-an-option
error: Unrecognized option: 'not-an-option'
```

6 years agoRollup merge of #46962 - clarcharr:os_raw_docs, r=QuietMisdreavus
kennytm [Tue, 6 Feb 2018 19:23:23 +0000 (03:23 +0800)]
Rollup merge of #46962 - clarcharr:os_raw_docs, r=QuietMisdreavus

Document std::os::raw.

This adds a brief explanation to each type and its definition according to C. This also helps clarify that the definitions of the types, as described by rustdoc, are not necessarily the same from platform to platform.

6 years agofix docs link
QuietMisdreavus [Tue, 6 Feb 2018 15:26:15 +0000 (09:26 -0600)]
fix docs link

6 years agoAuto merge of #47203 - varkor:output-filename-conflicts-with-directory, r=estebank
bors [Tue, 6 Feb 2018 09:51:03 +0000 (09:51 +0000)]
Auto merge of #47203 - varkor:output-filename-conflicts-with-directory, r=estebank

Warn when rustc output conflicts with existing directories

When the compiled executable would conflict with a directory, display a
rustc error instead of a verbose and potentially-confusing linker
error. This is a usability improvement, and doesn’t actually change
behaviour with regards to compilation success. This addresses the
concern in #35887. Fixes #13098.

6 years agoAuto merge of #48017 - kennytm:rollup, r=kennytm
bors [Tue, 6 Feb 2018 07:02:25 +0000 (07:02 +0000)]
Auto merge of #48017 - kennytm:rollup, r=kennytm

Rollup of 10 pull requests

- Successful merges: #46030, #47496, #47543, #47704, #47753, #47807, #47948, #47959, #48003, #48007
- Failed merges:

6 years agoRollup merge of #48007 - nrc:rls-field-init, r=eddyb
kennytm [Mon, 5 Feb 2018 18:13:55 +0000 (02:13 +0800)]
Rollup merge of #48007 - nrc:rls-field-init, r=eddyb

save-analysis: avoid implicit unwrap

When looking up a field defintion, since the name might be incorrect in the field init shorthand case.

cc https://github.com/rust-lang-nursery/rls/issues/699

r? @eddyb

6 years agoRollup merge of #48003 - mbrubeck:docs, r=steveklabnik
kennytm [Mon, 5 Feb 2018 18:13:54 +0000 (02:13 +0800)]
Rollup merge of #48003 - mbrubeck:docs, r=steveklabnik

Fix info about generic impls in AsMut docs

This text was copy-pasted from the `AsRef` docs to `AsMut`, but needed some additional adjustments for correctness.

6 years agoRollup merge of #47959 - Manishearth:rustdoc-ice, r=Mark-Simulacrum
kennytm [Mon, 5 Feb 2018 18:13:52 +0000 (02:13 +0800)]
Rollup merge of #47959 - Manishearth:rustdoc-ice, r=Mark-Simulacrum

Fix rustdoc ICE on macros defined within functions

fixes #47639

6 years agoRollup merge of #47948 - pietroalbini:use-nested-groups-stabilize, r=petrochenkov
kennytm [Mon, 5 Feb 2018 18:13:51 +0000 (02:13 +0800)]
Rollup merge of #47948 - pietroalbini:use-nested-groups-stabilize, r=petrochenkov

Stabilize use_nested_groups

As requested in #44494. Documentation PRs already sent.

6 years agoRollup merge of #47807 - tbu-:pr_doc_constanttime_cstr, r=steveklabnik
kennytm [Mon, 5 Feb 2018 18:13:50 +0000 (02:13 +0800)]
Rollup merge of #47807 - tbu-:pr_doc_constanttime_cstr, r=steveklabnik

Make wording around 0-cost casts more precise

6 years agoRollup merge of #47753 - steveklabnik:update-book, r=alexcrichton
kennytm [Mon, 5 Feb 2018 18:13:49 +0000 (02:13 +0800)]
Rollup merge of #47753 - steveklabnik:update-book, r=alexcrichton

Update book

This PR does two things:

1. update the book to include https://github.com/rust-lang/book/pull/1088
2. update to mdbook 0.1

Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires.

------------------------------

Locally, I'm seeing some weirdness around the reference and this:

![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png)

Putting this PR up so others can try and build and see if it reproduces for them.

6 years agoRollup merge of #47704 - dsprenkels:issue-44415, r=alexcrichton
kennytm [Mon, 5 Feb 2018 18:13:48 +0000 (02:13 +0800)]
Rollup merge of #47704 - dsprenkels:issue-44415, r=alexcrichton

Add a regression test for #44415

This PR adds a regression test for issue #44415.

Fixes #44415.

6 years agoRollup merge of #47543 - topecongiro:issue-42344, r=nikomatsakis
kennytm [Mon, 5 Feb 2018 18:13:46 +0000 (02:13 +0800)]
Rollup merge of #47543 - topecongiro:issue-42344, r=nikomatsakis

Disallow mutable borrow to non-mut statics

Closes #42344.

6 years agoRollup merge of #47496 - QuietMisdreavus:rls-doc-include, r=estebank
kennytm [Mon, 5 Feb 2018 18:13:45 +0000 (02:13 +0800)]
Rollup merge of #47496 - QuietMisdreavus:rls-doc-include, r=estebank

add documentation from doc(include) to analysis data

cc #44732

Currently save-analysis only loads docs from plain doc comments and doc attributes. Since `#[doc(include="filename.md")]` doesn't create a plain doc attribute when it loads the file, we need to be sure to pick up this info for the analysis data.

6 years agoRollup merge of #46030 - Zoxc:asm-volatile, r=nikomatsakis
kennytm [Mon, 5 Feb 2018 18:13:44 +0000 (02:13 +0800)]
Rollup merge of #46030 - Zoxc:asm-volatile, r=nikomatsakis

Make inline assembly volatile if it has no outputs. Fixes #46026

6 years agoAuto merge of #47881 - oli-obk:miri_clippy, r=Manishearth
bors [Mon, 5 Feb 2018 15:05:43 +0000 (15:05 +0000)]
Auto merge of #47881 - oli-obk:miri_clippy, r=Manishearth

Update clippy and miri submodule

r? @Manishearth

cc @kennytm I needed to touch the miri submodule's Cargo.toml to make sure that clippy gets the newest compiletest_rs. This will not fix miri, but since I touched the miri submodule, will this PR fail?

miri is unfixable until #46882 is merged

6 years agoMake inline assembly volatile if it has no outputs. Fixes #46026
John Kåre Alsaker [Thu, 16 Nov 2017 09:08:19 +0000 (10:08 +0100)]
Make inline assembly volatile if it has no outputs. Fixes #46026

6 years agoUpdate clippy and miri submodule
Oliver Schneider [Tue, 30 Jan 2018 14:12:12 +0000 (15:12 +0100)]
Update clippy and miri submodule

6 years agoStabilize use_nested_groups
Pietro Albini [Thu, 1 Feb 2018 21:55:20 +0000 (22:55 +0100)]
Stabilize use_nested_groups

6 years agoAuto merge of #47920 - Aaron1011:nll-overflow, r=pnkfelix
bors [Mon, 5 Feb 2018 09:17:00 +0000 (09:17 +0000)]
Auto merge of #47920 - Aaron1011:nll-overflow, r=pnkfelix

Fix overflow when performing drop check calculations in NLL

Clearing out the infcx's region constraints after processing each type
ends up interacting badly with normalizing associated types. This commit
keeps all region constraints intact until the end of
TypeLivenessGenerator.add_drop_live_constraint, ensuring that normalized
types are able to re-use existing inference variables.

Fixes #47589

6 years agoAuto merge of #47873 - Aaron1011:final-ref-coerce, r=nikomatsakis
bors [Mon, 5 Feb 2018 04:32:06 +0000 (04:32 +0000)]
Auto merge of #47873 - Aaron1011:final-ref-coerce, r=nikomatsakis

Fix ref-to-ptr coercions not working with NLL in certain cases

Implicit coercions from references to pointers were lowered to slightly
different Mir than explicit casts (e.g. 'foo as *mut T'). This resulted
in certain uses of self-referential structs compiling correctly when an
explicit cast was used, but not when the implicit coercion was used.

To fix this, this commit adds an outer 'Use' expr when applying a
raw-ptr-borrow adjustment. This makes the lowered Mir for coercions
identical to that of explicit coercions, allowing the original code to
compile regardless of how the raw ptr cast occurs.

Fixes #47722

6 years agoAuto merge of #47865 - Manishearth:cleanup-shim, r=nikomatsakis
bors [Mon, 5 Feb 2018 01:45:46 +0000 (01:45 +0000)]
Auto merge of #47865 - Manishearth:cleanup-shim, r=nikomatsakis

Cleanup the shim code

 - We now write directly to `RETURN_PLACE` instead of creating intermediates
 - `tuple_like_shim` takes an iterator (used by #47867)
 - `tuple_like_shim` no longer relies on it being the first thing to create blocks, and uses relative block indexing in a cleaner way (necessary for #47867)
 - All the shim builders take `dest, src` arguments instead of hardcoding RETURN_PLACE

r? @eddyb

6 years agoAuto merge of #47998 - kennytm:rollup, r=kennytm
bors [Sun, 4 Feb 2018 22:58:10 +0000 (22:58 +0000)]
Auto merge of #47998 - kennytm:rollup, r=kennytm

Rollup of 10 pull requests

- Successful merges: #47862, #47877, #47896, #47912, #47947, #47958, #47978, #47996, #47999, #47892
- Failed merges:

6 years agosave-analysis: avoid implicit unwrap
Nick Cameron [Sun, 4 Feb 2018 22:00:56 +0000 (11:00 +1300)]
save-analysis: avoid implicit unwrap

When looking up a field defintion, since the name might be incorrect in the field init shorthand case.

cc https://github.com/rust-lang-nursery/rls/issues/699

6 years agoadd exceptions for new deps
steveklabnik [Sat, 3 Feb 2018 16:00:39 +0000 (11:00 -0500)]
add exceptions for new deps

6 years agoupdate mdbook to 0.1.2
steveklabnik [Thu, 25 Jan 2018 17:32:25 +0000 (12:32 -0500)]
update mdbook to 0.1.2

and improve printing of errors

6 years agoupdate reference
steveklabnik [Fri, 26 Jan 2018 17:32:33 +0000 (12:32 -0500)]
update reference

6 years agoupdate trpl
steveklabnik [Thu, 25 Jan 2018 17:24:27 +0000 (12:24 -0500)]
update trpl

Includes https://github.com/rust-lang/book/pull/1088 and
https://github.com/rust-lang/book/commit/62210e326c27697e94ce429c1683dcea4e4887e4

6 years agoFix info about generic impls in AsMut docs
Matt Brubeck [Sun, 4 Feb 2018 19:57:36 +0000 (11:57 -0800)]
Fix info about generic impls in AsMut docs

This text was copy-pasted from the `AsRef` docs to `AsMut`, but needed
some additional adjustments for correctness.

6 years agoRollup merge of #47892 - Badel2:const_type_id_of, r=oli-obk
kennytm [Sun, 4 Feb 2018 17:27:36 +0000 (01:27 +0800)]
Rollup merge of #47892 - Badel2:const_type_id_of, r=oli-obk

Turn `type_id` into a constant intrinsic

https://github.com/rust-lang/rust/issues/27745

The method `get_type_id` in `Any` is intended to support reflection. It's currently unstable in favor of using an associated constant instead. This PR makes the `type_id` intrinsic a constant intrinsic, the same as `size_of` and `align_of`, allowing `TypeId::of` to be a `const fn`, which will allow using an associated constant in `Any`.

6 years agoRollup merge of #47999 - jaystrictor:master, r=Mark-Simulacrum
kennytm [Sun, 4 Feb 2018 17:20:56 +0000 (01:20 +0800)]
Rollup merge of #47999 - jaystrictor:master, r=Mark-Simulacrum

Remove 'the this' in doc comments.

6 years agoRollup merge of #47996 - Zoxc:run-make-last, r=Mark-Simulacrum
kennytm [Sun, 4 Feb 2018 17:19:41 +0000 (01:19 +0800)]
Rollup merge of #47996 - Zoxc:run-make-last, r=Mark-Simulacrum

Run the `run-make` tests last, so more tests run on Windows when `make` is unavailable

6 years agoRollup merge of #47978 - eddyb:iu, r=kennytm
kennytm [Sun, 4 Feb 2018 15:29:01 +0000 (23:29 +0800)]
Rollup merge of #47978 - eddyb:iu, r=kennytm

ui tests: diff from old (expected) to new (actual) instead of backwards.

Previously `actual` was "old" and `expected` was "new" which resulted in `+` before `-`.
AFAIK all diff tools put `-` before `+`, which made the previous behavior *very confusing*.

r? @nikomatsakis

6 years agoRollup merge of #47958 - frewsxcv:frewsxcv-try-clone, r=aidanhs
kennytm [Sun, 4 Feb 2018 15:28:59 +0000 (23:28 +0800)]
Rollup merge of #47958 - frewsxcv:frewsxcv-try-clone, r=aidanhs

Clarify shared file handler behavior of File::try_clone.

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

6 years agoRollup merge of #47947 - goodmanjonathan:stabilize_match_beginning_vert, r=petrochenkov
kennytm [Sun, 4 Feb 2018 15:28:58 +0000 (23:28 +0800)]
Rollup merge of #47947 - goodmanjonathan:stabilize_match_beginning_vert, r=petrochenkov

Stabilize feature(match_beginning_vert)

With this feature stabilized, match expressions can optionally have a `|` at the beginning of each arm.

Reference PR: rust-lang-nursery/reference#231

Closes #44101

6 years agoRollup merge of #47912 - cuviper:glibc-stack-guard, r=alexcrichton
kennytm [Sun, 4 Feb 2018 15:28:57 +0000 (23:28 +0800)]
Rollup merge of #47912 - cuviper:glibc-stack-guard, r=alexcrichton

Use a range to identify SIGSEGV in stack guards

Previously, the `guard::init()` and `guard::current()` functions were
returning a `usize` address representing the top of the stack guard,
respectively for the main thread and for spawned threads.  The `SIGSEGV`
handler on `unix` targets checked if a fault was within one page below that
address, if so reporting it as a stack overflow.

Now `unix` targets report a `Range<usize>` representing the guard memory,
so it can cover arbitrary guard sizes.  Non-`unix` targets which always
return `None` for guards now do so with `Option<!>`, so they don't pay any
overhead.

For `linux-gnu` in particular, the previous guard upper-bound was
`stackaddr + guardsize`, as the protected memory was *inside* the stack.
This was a glibc bug, and starting from 2.27 they are moving the guard
*past* the end of the stack.  However, there's no simple way for us to know
where the guard page actually lies, so now we declare it as the whole range
of `stackaddr ± guardsize`, and any fault therein will be called a stack
overflow.  This fixes #47863.

6 years agoRollup merge of #47896 - zackmdavis:and_the_case_of_the_necessary_unnecessary_parens...
kennytm [Sun, 4 Feb 2018 15:28:56 +0000 (23:28 +0800)]
Rollup merge of #47896 - zackmdavis:and_the_case_of_the_necessary_unnecessary_parens, r=nikomatsakis

decline to lint technically-unnecessary parens in function or method arguments inside of nested macros

In #46980 ("in which the unused-parens lint..." (14982db2d6)), the
unused-parens lint was made to check function and method arguments,
which it previously did not (seemingly due to oversight rather than
willful design). However, in #47775 and discussion thereon,
user–developers of Geal/nom and graphql-rust/juniper reported that the
lint was seemingly erroneously triggering on certain complex macros in
those projects. While this doesn't seem like a bug in the lint in the
particular strict sense that the expanded code would, in fact, contain
unncecessary parentheses, it also doesn't seem like the sort of thing
macro authors should have to think about: the spirit of the
unused-parens lint is to prevent needless clutter in code, not to give
macro authors extra heartache in the handling of token trees.

We propose the expediency of declining to lint unused parentheses in
function or method args inside of nested expansions: we believe that
this should eliminate the petty, troublesome lint warnings reported
in the issue, without forgoing the benefits of the lint in simpler
macros.

It seemed like too much duplicated code for the `Call` and `MethodCall`
match arms to duplicate the nested-macro check in addition to each
having their own `for` loop, so this occasioned a slight refactor so
that the function and method cases could share code—hopefully the
overall intent is at least no less clear to the gentle reader.

This is concerning #47775.

6 years agoRollup merge of #47877 - spastorino:lifetime-bounds-in-copy, r=nikomatsakis
kennytm [Sun, 4 Feb 2018 15:28:54 +0000 (23:28 +0800)]
Rollup merge of #47877 - spastorino:lifetime-bounds-in-copy, r=nikomatsakis

Do not ignore lifetime bounds in Copy impls

cc #29149

r? @nikomatsakis

6 years agoRollup merge of #47862 - GuillaumeGomez:const-evaluation-ice, r=eddyb
kennytm [Sun, 4 Feb 2018 15:28:53 +0000 (23:28 +0800)]
Rollup merge of #47862 - GuillaumeGomez:const-evaluation-ice, r=eddyb

Fix const evaluation ICE in rustdoc

Fixes #47860.

r? @eddyb

6 years agoRemove 'the this' in doc comments.
Jay Strict [Sun, 4 Feb 2018 15:24:18 +0000 (16:24 +0100)]
Remove 'the this' in doc comments.

6 years agoAuto merge of #47834 - Mark-Simulacrum:no-cgu-release, r=alexcrichton
bors [Sun, 4 Feb 2018 15:06:06 +0000 (15:06 +0000)]
Auto merge of #47834 - Mark-Simulacrum:no-cgu-release, r=alexcrichton

Do not enable ThinLTO on stable, beta, or nightly builds.

Fixes #45444

6 years agoRun the `run-make` tests last, so more tests run on Windows when `make` is unavailable
John Kåre Alsaker [Sun, 4 Feb 2018 13:52:31 +0000 (14:52 +0100)]
Run the `run-make` tests last, so more tests run on Windows when `make` is unavailable

6 years agoAuto merge of #47991 - nrc:update, r=alexcrichton
bors [Sun, 4 Feb 2018 12:26:09 +0000 (12:26 +0000)]
Auto merge of #47991 - nrc:update, r=alexcrichton

Update RLS and Rustfmt

r? @alexcrichton

6 years agoRemove delay_span_bug() in check_aliasability
Seiichi Uchida [Sun, 4 Feb 2018 08:31:00 +0000 (17:31 +0900)]
Remove delay_span_bug() in check_aliasability

This path was considered to be unreachable. However,
`&mut` could potentially live inside `static`.
For example, `static TAB: [&mut [u8]; 0] = [];`.

6 years agolibtest: Replace panics with error messages
Gilad Naaman [Sat, 27 Jan 2018 20:34:05 +0000 (22:34 +0200)]
libtest: Replace panics with error messages

6 years agoAuto merge of #47915 - eddyb:layout-of, r=nikomatsakis
bors [Sun, 4 Feb 2018 03:33:44 +0000 (03:33 +0000)]
Auto merge of #47915 - eddyb:layout-of, r=nikomatsakis

rustc: prefer ParamEnvAnd and LayoutCx over tuples for LayoutOf.

This PR provides `tcx.layout_of(param_env.and(ty))` as the idiomatic replacement for the existing `(tcx, param_env).layout_of(ty)` and removes fragile (coherence-wise) layout-related tuple impls.

r? @nikomatsakis

6 years agoUpdate RLS and Rustfmt
Nick Cameron [Thu, 1 Feb 2018 05:56:48 +0000 (18:56 +1300)]
Update RLS and Rustfmt

6 years agoDisable ThinLTO for dist builds.
Mark Simulacrum [Sun, 28 Jan 2018 22:50:03 +0000 (15:50 -0700)]
Disable ThinLTO for dist builds.

Dist builds should always be as fast as we can make them, and since
those run on CI we don't care quite as much for the build being somewhat
slower. As such, we don't automatically enable ThinLTO on builds for the
dist builders.

6 years agoAuto merge of #47845 - Zoxc:gen-fixes, r=nikomatsakis
bors [Sat, 3 Feb 2018 17:28:08 +0000 (17:28 +0000)]
Auto merge of #47845 - Zoxc:gen-fixes, r=nikomatsakis

Generator bugfixes

r? @nikomatsakis

6 years agoClarify shared file handler behavior of File::try_clone.
Corey Farwell [Fri, 2 Feb 2018 04:36:33 +0000 (23:36 -0500)]
Clarify shared file handler behavior of File::try_clone.

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

6 years agoAuto merge of #46254 - Dylan-DPC:ellided-lifetime, r=nikomatsakis
bors [Sat, 3 Feb 2018 14:38:52 +0000 (14:38 +0000)]
Auto merge of #46254 - Dylan-DPC:ellided-lifetime, r=nikomatsakis

elided lifetime

Closes #45992

Hey
Having a problem with my config so decided to make a WIP PR nevertheless. Will add some more tests.

6 years agoAuto merge of #47962 - kennytm:rollup, r=kennytm
bors [Sat, 3 Feb 2018 12:02:33 +0000 (12:02 +0000)]
Auto merge of #47962 - kennytm:rollup, r=kennytm

Rollup of 10 pull requests

- Successful merges: #46156, #47829, #47842, #47898, #47914, #47916, #47919, #47942, #47951, #47973
- Failed merges: #47753

6 years agoFix const evaluation ICE in rustdoc
Guillaume Gomez [Mon, 29 Jan 2018 22:04:43 +0000 (23:04 +0100)]
Fix const evaluation ICE in rustdoc

6 years agoRollup merge of #47973 - perlun:patch-1, r=dtolnay
kennytm [Sat, 3 Feb 2018 08:08:27 +0000 (16:08 +0800)]
Rollup merge of #47973 - perlun:patch-1, r=dtolnay

copy_nonoverlapping example: Fixed typo

The comment referred to a variable using an incorrect name. (it has probably been renamed since the comment was written, or the comment was copied elsewhere - I noted the example in libcore has the `tmp` name for the temporary variable.)

6 years agoAuto merge of #47791 - estebank:mismatched-trait-impl, r=nikomatsakis
bors [Sat, 3 Feb 2018 01:26:56 +0000 (01:26 +0000)]
Auto merge of #47791 - estebank:mismatched-trait-impl, r=nikomatsakis

Tweak presentation on lifetime trait mismatch

 - On trait/impl method discrepancy, add label pointing at trait signature.
 - Point only at method definition when referring to named lifetimes on lifetime mismatch.
 - When the sub and sup expectations are the same, tweak the output to avoid repeated spans.

Fix #30790, CC #18759.

6 years agoui tests: diff from old (expected) to new (actual) instead of backwards.
Eduard-Mihai Burtescu [Sat, 3 Feb 2018 00:51:16 +0000 (02:51 +0200)]
ui tests: diff from old (expected) to new (actual) instead of backwards.

6 years agocopy_nonoverlapping example: Fixed typo
Per Lundberg [Fri, 2 Feb 2018 20:44:14 +0000 (22:44 +0200)]
copy_nonoverlapping example: Fixed typo

The comment referred to a variable using an incorrect name. (it has probably been renamed since the comment was written, or the comment was copied elsewhere - I noted the example in libcore has the `tmp` name for the temporary variable.)

6 years agoRemove commented-out code
Aaron Hill [Fri, 2 Feb 2018 19:59:27 +0000 (14:59 -0500)]
Remove commented-out code

6 years agoRollup merge of #47951 - GuillaumeGomez:sidebar-hover, r=QuietMisdreavus Fix ugly...
kennytm [Fri, 2 Feb 2018 08:29:26 +0000 (16:29 +0800)]
Rollup merge of #47951 - GuillaumeGomez:sidebar-hover, r=QuietMisdreavus Fix ugly hover in sidebar In the sidebar, the elements under `Structs`, `Enums`... have an ugly hover if they're not selected. This fixes it. r? @QuietMisdreavus

6 years agoRollup merge of #47942 - estebank:macro-spans, r=nikomatsakis Minimize weird spans...
kennytm [Fri, 2 Feb 2018 08:29:24 +0000 (16:29 +0800)]
Rollup merge of #47942 - estebank:macro-spans, r=nikomatsakis Minimize weird spans involving macro context Sometimes the parser attempts to synthesize spans from within a macro context with the span for the captured argument, leading to non-sensical spans with very bad output. Given that an incorrect span is worse than a partially incomplete span, when detecting this situation return only one of the spans without merging them. Fix #32072, #47778. CC #23480.

6 years agoRollup merge of #47919 - varkor:to_degrees-precision, r=rkruppe Use constant for...
kennytm [Fri, 2 Feb 2018 08:29:23 +0000 (16:29 +0800)]
Rollup merge of #47919 - varkor:to_degrees-precision, r=rkruppe Use constant for 180/π in to_degrees The current `f32|f64.to_degrees` implementation uses a division to calculate `180/π`, which causes a loss of precision. Using a constant is still not perfect (implementing a maximally-precise algorithm would come with a high performance cost), but improves precision with a minimal change. As per the discussion in #29944, this fixes #29944 (the costs of improving the precision further would not outweigh the gains).

6 years agoRollup merge of #47916 - vmx:patch-2, r=kennytm Fix lang items box example code The...
kennytm [Fri, 2 Feb 2018 08:29:21 +0000 (16:29 +0800)]
Rollup merge of #47916 - vmx:patch-2, r=kennytm Fix lang items box example code The `exchange_free` lang item is gone in favour of `box_free` [1]. Some warnings are also fixed by this commit. [1]: https://github.com/rust-lang/rust/commit/ca115dd083a1fe1d2b4892c5e50e49eb83ff1f3

6 years agoRollup merge of #47914 - etaoins:improve-char-escape-in-lexer-msg, r=petrochenkov...
kennytm [Fri, 2 Feb 2018 08:29:20 +0000 (16:29 +0800)]
Rollup merge of #47914 - etaoins:improve-char-escape-in-lexer-msg, r=petrochenkov Improve char escaping in lexer messages Currently ', " and \ are escaped as \', \" and \\ respectively. This leads to confusing messages such as `error: unknown start of token: \\` when encountering a single backslash. Fix by emitting printable ASCII characters directly. This will still escape \r, \n, \t and Unicode characters. Fixes #47902

6 years agoRollup merge of #47898 - Aaron1011:static-ref-nll, r=nikomatsakis Fix ICE when assign...
kennytm [Fri, 2 Feb 2018 08:29:19 +0000 (16:29 +0800)]
Rollup merge of #47898 - Aaron1011:static-ref-nll, r=nikomatsakis Fix ICE when assigning references to a static mut with NLL is_unsafe_place only filters out statics in the rhs, not the lhs. Since it's possible to reach that 'Place::Static', we handle statics the same way as we do locals. Fixes #47789

6 years agoRollup merge of #47842 - Manishearth:dead-code, r=nagisa Remove dead code The Clone...
kennytm [Fri, 2 Feb 2018 08:29:17 +0000 (16:29 +0800)]
Rollup merge of #47842 - Manishearth:dead-code, r=nagisa Remove dead code The Clone impl makes the lint ignore the type.

6 years agoRollup merge of #47829 - estebank:break-in-for, r=cramertj Suggest removing value...
kennytm [Fri, 2 Feb 2018 08:29:16 +0000 (16:29 +0800)]
Rollup merge of #47829 - estebank:break-in-for, r=cramertj Suggest removing value from `break` when invalid When attempting to use `break` with a value in a type of loop where it'd be invalid (any non-`loop`), suggest using `break` on its own. Close #34359.

6 years agoRollup merge of #46156 - SimonSapin:patch-14, r=withoutboats
kennytm [Fri, 2 Feb 2018 08:29:11 +0000 (16:29 +0800)]
Rollup merge of #46156 - SimonSapin:patch-14, r=withoutboats

Document the size of bool

6 years agoAdd regression test
Manish Goregaokar [Fri, 2 Feb 2018 06:41:16 +0000 (12:11 +0530)]
Add regression test

6 years agoFix rustdoc ICE on macros defined within functions
Manish Goregaokar [Fri, 2 Feb 2018 06:39:25 +0000 (12:09 +0530)]
Fix rustdoc ICE on macros defined within functions

fixes #47639

6 years agoAuto merge of #47465 - estebank:include-space-after-mut, r=nikomatsakis
bors [Fri, 2 Feb 2018 04:19:12 +0000 (04:19 +0000)]
Auto merge of #47465 - estebank:include-space-after-mut, r=nikomatsakis

Include space in suggestion `mut` in bindings

Fix #46614.

6 years agoRemove dead code
Manish Goregaokar [Mon, 29 Jan 2018 05:44:55 +0000 (11:14 +0530)]
Remove dead code

6 years agoAuto merge of #47102 - Diggsey:wasm-syscall, r=alexcrichton
bors [Fri, 2 Feb 2018 01:27:14 +0000 (01:27 +0000)]
Auto merge of #47102 - Diggsey:wasm-syscall, r=alexcrichton

Implement extensible syscall interface for wasm

Currently it's possible to run tests with the native wasm target, but it's not possible to tell whether they pass or to capture the output, because libstd throws away stdout, stderr and the exit code. While advanced libstd features should probably require more specific targets (eg. wasm-unknown-web) I think even the unknown target should at least support basic I/O.

Any solution is constrained by these factors:
- It must not be javascript specific
- There must not be too strong coupling between libstd and the host environment (because it's an "unknown" target)
- WebAssembly does not allow "optional" imports - all imports *must* be resolved.
- WebAssembly does not support calling the host environment through any channel *other* than imports.

The best solution I could find to these constraints was to give libstd a single required import, and implement a syscall-style interface through that import. Each syscall is designed such that a no-op implementation gives the most reasonable fallback behaviour. This means that the following import table would be perfectly valid:
```javascript
imports.env = { rust_wasm_syscall: function(index, data) {} }
```

Currently I have implemented these system calls:
- Read from stdin
- Write to stdout/stderr
- Set the exit code
- Get command line arguments
- Get environment variable
- Set environment variable
- Get time

It need not be extended beyond this set if being able to run tests for this target is the only goal.

edit:
As part of this PR I had to make a further change. Previously, the rust entry point would be automatically called when the webassembly module was instantiated. This was problematic because from the javascript side it was impossible to call exported functions, access program memory or get a reference to the instance.

To solve this, ~I changed the default behaviour to not automatically call the entry point, and added a crate-level attribute to regain the old behaviour. (`#![wasm_auto_run]`)~ I disabled this behaviour when building tests.

6 years agoFix ugly hover in sidebar
Guillaume Gomez [Thu, 1 Feb 2018 22:40:23 +0000 (23:40 +0100)]
Fix ugly hover in sidebar

6 years agoTurn `type_id` into a constant intrinsic
Badel2 [Tue, 30 Jan 2018 20:33:33 +0000 (21:33 +0100)]
Turn `type_id` into a constant intrinsic

Add rustc_const_unstable attribute for `any::TypeId::of`

Add test for `const fn TypeId::of`

6 years agoadd ellided lifetime
dpc [Thu, 1 Feb 2018 20:40:10 +0000 (02:10 +0530)]
add ellided lifetime

6 years agoChange offset to `0`
Esteban Küber [Thu, 1 Feb 2018 20:02:22 +0000 (12:02 -0800)]
Change offset to `0`

6 years agoMinimize weird spans involving macro context
Esteban Küber [Thu, 1 Feb 2018 19:51:49 +0000 (11:51 -0800)]
Minimize weird spans involving macro context

Sometimes the parser attempts to synthesize spans from within a macro
context with the span for the captured argument, leading to non-sensical
spans with very bad output. Given that an incorrect span is worse than
a partially incomplete span, when detecting this situation return only
one of the spans without mergin them.

6 years agoUse constant for 180/π in to_degrees
varkor [Thu, 1 Feb 2018 18:35:51 +0000 (18:35 +0000)]
Use constant for 180/π in to_degrees

The current `f32|f64.to_degrees` implementation uses a division to calculate 180/π, which causes a loss of precision. Using a constant is still not perfect (implementing a maximally-precise algorithm would come with a high performance cost), but improves precision with a minimal change.

6 years agoAuto merge of #47738 - nikomatsakis:issue-47139-master, r=arielb1
bors [Thu, 1 Feb 2018 07:33:35 +0000 (07:33 +0000)]
Auto merge of #47738 - nikomatsakis:issue-47139-master, r=arielb1

remove intercrate ambiguity hints

The scheme was causing overflows during coherence checking (e.g. #47139). This is sort of a temporary fix; the proper fix I think involves reworking trait selection in deeper ways.

cc @sgrif -- this *should* fix diesel

cc @qnighy -- I'd like to discuss you with alternative techniques for achieving the same end. =) Actually, it might be good to put some energy into refactoring traits first.

r? @eddyb

6 years agoAuto merge of #47540 - Manishearth:suggestion, r=nrc
bors [Thu, 1 Feb 2018 04:47:46 +0000 (04:47 +0000)]
Auto merge of #47540 - Manishearth:suggestion, r=nrc

Add approximate suggestions for rustfix

This adds `span_approximate_suggestion()` that lets you emit a
suggestion marked as "non-machine applicable" in the JSON output. UI
users see no difference. This is for when rustc and clippy wish to
 emit suggestions which will make sense to the reader (e.g. they may
have placeholders like `<type>`) but are not source-applicable, so that
rustfix/etc can ignore these.

fixes #39254

6 years agoFix overflow when performing drop check calculations in NLL
Aaron Hill [Thu, 1 Feb 2018 03:11:50 +0000 (22:11 -0500)]
Fix overflow when performing drop check calculations in NLL

Clearing out the infcx's region constraints after processing each type
ends up interacting badly with normalizing associated types. This commit
keeps all region constraints intact until the end of
TypeLivenessGenerator.add_drop_live_constraint, ensuring that normalized
types are able to re-use existing inference variables.

Fixes #47589

6 years agoGeneralize tuple_like_shim's code to be useful for enums
Manish Goregaokar [Tue, 30 Jan 2018 12:06:19 +0000 (17:36 +0530)]
Generalize tuple_like_shim's code to be useful for enums

6 years agoEliminate ret_field and ret intermediates in array clone shim
Manish Goregaokar [Tue, 30 Jan 2018 12:00:15 +0000 (17:30 +0530)]
Eliminate ret_field and ret intermediates in array clone shim

6 years agoCorrectly subst the fn_sig so that we get the correct types
Manish Goregaokar [Tue, 30 Jan 2018 09:17:25 +0000 (14:47 +0530)]
Correctly subst the fn_sig so that we get the correct types

Otherwise we get random TySelfs there, which means operations on
RETURN_PLACE end up breaking down badly.

6 years agoFix lang items box example code
Volker Mische [Wed, 31 Jan 2018 23:21:43 +0000 (00:21 +0100)]
Fix lang items box example code

The `exchange_free` lang item is gone in favour of `box_free` [1].

Some warnings are also fixed by this commit.

[1]: https://github.com/rust-lang/rust/commit/ca115dd083a1fe1d2b4892c5e50e49eb83ff1f3

6 years agorustc: prefer ParamEnvAnd and LayoutCx over tuples for LayoutOf.
Eduard-Mihai Burtescu [Wed, 31 Jan 2018 22:00:38 +0000 (00:00 +0200)]
rustc: prefer ParamEnvAnd and LayoutCx over tuples for LayoutOf.

6 years agoImprove char escaping in lexer messages
Ryan Cumming [Wed, 31 Jan 2018 21:15:38 +0000 (08:15 +1100)]
Improve char escaping in lexer messages

Currently ', " and \ are escaped as \', \" and \\ respectively. This
leads to confusing messages such as `error: unknown start of token: \\`
when encountering a single backslash.

Fix by emitting printable ASCII characters directly. This will still
escape \r, \n, \t and Unicode characters.

Fixes #47902

6 years agoAuto merge of #47900 - kennytm:rollup, r=kennytm
bors [Wed, 31 Jan 2018 20:51:02 +0000 (20:51 +0000)]
Auto merge of #47900 - kennytm:rollup, r=kennytm

Rollup of 16 pull requests

- Successful merges: #47838, #47840, #47844, #47874, #47875, #47876, #47884, #47886, #47889, #47890, #47891, #47795, #47677, #47893, #47895, #47552
- Failed merges:

6 years agoUse a range to identify SIGSEGV in stack guards
Josh Stone [Wed, 31 Jan 2018 19:41:29 +0000 (11:41 -0800)]
Use a range to identify SIGSEGV in stack guards

Previously, the `guard::init()` and `guard::current()` functions were
returning a `usize` address representing the top of the stack guard,
respectively for the main thread and for spawned threads.  The `SIGSEGV`
handler on `unix` targets checked if a fault was within one page below
that address, if so reporting it as a stack overflow.

Now `unix` targets report a `Range<usize>` representing the guard
memory, so it can cover arbitrary guard sizes.  Non-`unix` targets which
always return `None` for guards now do so with `Option<!>`, so they
don't pay any overhead.

For `linux-gnu` in particular, the previous guard upper-bound was
`stackaddr + guardsize`, as the protected memory was *inside* the stack.
This was a glibc bug, and starting from 2.27 they are moving the guard
*past* the end of the stack.  However, there's no simple way for us to
know where the guard page actually lies, so now we declare it as the
whole range of `stackaddr ± guardsize`, and any fault therein will be
called a stack overflow.  This fixes #47863.

6 years agoEnable stack-probe tests with system LLVM >= 5.0
Josh Stone [Wed, 31 Jan 2018 00:47:30 +0000 (16:47 -0800)]
Enable stack-probe tests with system LLVM >= 5.0

6 years agoRollup merge of #47552 - oberien:stepby-nth, r=dtolnay
kennytm [Wed, 31 Jan 2018 18:34:15 +0000 (02:34 +0800)]
Rollup merge of #47552 - oberien:stepby-nth, r=dtolnay

Specialize StepBy::nth

This allows optimizations of implementations of the inner iterator's `.nth` method.

6 years agoRollup merge of #47895 - varkor:non-utf-stdin, r=estebank
kennytm [Wed, 31 Jan 2018 18:32:10 +0000 (02:32 +0800)]
Rollup merge of #47895 - varkor:non-utf-stdin, r=estebank

Fix ICE when reading non-UTF-8 input from stdin

Fixes #22387.

6 years agoRollup merge of #47893 - alexcrichton:move-codegen-backends, r=alexcrichton
kennytm [Wed, 31 Jan 2018 18:29:38 +0000 (02:29 +0800)]
Rollup merge of #47893 - alexcrichton:move-codegen-backends, r=alexcrichton

rustc: Move location of `codegen-backends` dir

Right now this directory is located under:

```
$sysroot/lib/rustlib/$target/lib/codegen-backends
```

but after seeing what we do in a few other places it seems that a more
appropriate location would be:

```
$sysroot/lib/rustlib/$target/codegen-backends
```

so this commit moves it!

6 years agoRollup merge of #47677 - etaoins:avoid-underflow-in-rennder-source-line, r=estebank
kennytm [Wed, 31 Jan 2018 18:26:48 +0000 (02:26 +0800)]
Rollup merge of #47677 - etaoins:avoid-underflow-in-rennder-source-line, r=estebank

Avoid underflow in render_source_line

While testing rust-lang/rust#47655 I was able to make the compiler panic when it's compiled with debug assertions:

```shell
> rustc /dev/null --crate-type proc-macro

error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

note: rustc 1.25.0-dev running on x86_64-apple-darwin

note: run with `RUST_BACKTRACE=1` for a backtrace

thread 'rustc' panicked at 'attempt to subtract with overflow', librustc_errors/emitter.rs:287:49
```

Without debug assertions the following warning is emitted:

```shell
> rustc /dev/null --crate-type proc-macro

warning: unused variable: `registrar`
 --> /dev/null:0:1
  |
  |
  = note: #[warn(unused_variables)] on by default
  = note: to avoid this warning, consider using `_registrar` instead
```

The panic is due to the unused variable warning being spanned to `/dev/null:0:1`. When `render_source_line` subtracts 1 from the line number to look up the source line it panics due to underflow. Without debug assertions this would wrap and cause us to return a blank string instead.

Fix by explicitly testing for 0 and exiting early. I'm unsure how to automatically test this now that rust-lang/rust#46655 has been approved.

6 years agorustc: Move location of `codegen-backends` dir
Alex Crichton [Tue, 30 Jan 2018 23:40:44 +0000 (15:40 -0800)]
rustc: Move location of `codegen-backends` dir

Right now this directory is located under:

  $sysroot/lib/rustlib/$target/lib/codegen-backends

but after seeing what we do in a few other places it seems that a more
appropriate location would be:

  $sysroot/lib/rustlib/$target/codegen-backends

so this commit moves it!

6 years agoRollup merge of #47795 - avborhanian:master, r=rkruppe
kennytm [Wed, 31 Jan 2018 14:11:12 +0000 (22:11 +0800)]
Rollup merge of #47795 - avborhanian:master, r=rkruppe

Adding ICH to the glossary.

Fixes #47782.

6 years agoUse file containing non-UTF-8 character instead of echo -e
varkor [Wed, 31 Jan 2018 11:56:15 +0000 (11:56 +0000)]
Use file containing non-UTF-8 character instead of echo -e

6 years agoAdd echo escape flag
varkor [Wed, 31 Jan 2018 10:23:15 +0000 (10:23 +0000)]
Add echo escape flag

6 years agoRollup merge of #47891 - eddyb:issue-47638, r=nikomatsakis
kennytm [Wed, 31 Jan 2018 08:36:18 +0000 (16:36 +0800)]
Rollup merge of #47891 - eddyb:issue-47638, r=nikomatsakis

rustc_trans: keep LLVM types for trait objects anonymous.

Fixes #47638 by reverting the addition of readable LLVM trait object type names.
r? @nikomatsakis

6 years agoRollup merge of #47890 - pftbest:no_trap, r=alexcrichton
kennytm [Wed, 31 Jan 2018 08:36:17 +0000 (16:36 +0800)]
Rollup merge of #47890 - pftbest:no_trap, r=alexcrichton

[MSP430] Don't enable trap_unreachable option by default on msp.

Since MSP430 doesn't meaningfully support faulting on illegal
instructions, LLVM generates a call to abort() function instead
of a trap instruction. Such calls are 4 bytes long, and that is
too much overhead for such small target.

r? @alexcrichton