about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorLines
2020-03-23Add `wake_trait` feature directive to stdWithout Boats-0/+1
2020-03-23Add Wake trait for safe construction of Wakers.Without Boats-0/+97
Currently, constructing a waker requires calling the unsafe `Waker::from_raw` API. This API requires the user to manually construct a vtable for the waker themself - which is both cumbersome and very error prone. This API would provide an ergonomic, straightforward and guaranteed memory-safe way of constructing a waker. It has been our longstanding intention that the `Waker` type essentially function as an `Arc<dyn Wake>`, with a `Wake` trait as defined here. Two considerations prevented the original API from being shipped as simply an `Arc<dyn Wake>`: - We want to support futures on embedded systems, which may not have an allocator, and in optimized executors for which this API may not be best-suited. Therefore, we have always explicitly supported the maximally-flexible (but also memory-unsafe) `RawWaker` API, and `Waker` has always lived in libcore. - Because `Waker` lives in libcore and `Arc` lives in liballoc, it has not been feasible to provide a constructor for `Waker` from `Arc<dyn Wake>`. Therefore, the Wake trait was left out of the initial version of the task waker API. However, as Rust 1.41, it is possible under the more flexible orphan rules to implement `From<Arc<W>> for Waker where W: Wake` in liballoc. Therefore, we can now define this constructor even though `Waker` lives in libcore. This PR adds these APIs: - A `Wake` trait, which contains two methods - A required method `wake`, which is called by `Waker::wake` - A provided method `wake_by_ref`, which is called by `Waker::wake_by_ref` and which implementors can override if they can optimize this use case. - An implementation of `From<Arc<W>> for Waker where W: Wake + Send + Sync + 'static` - A similar implementation of `From<Arc<W>> for RawWaker`.
2020-03-23Auto merge of #70305 - Centril:rollup-zi13fz4, r=Centrilbors-1103/+1334
Rollup of 8 pull requests Successful merges: - #69080 (rustc_codegen_llvm: don't generate any type debuginfo for -Cdebuginfo=1.) - #69940 (librustc_codegen_llvm: Replace deprecated API usage) - #69942 (Increase verbosity when suggesting subtle code changes) - #69968 (rustc: keep upvars tupled in {Closure,Generator}Substs.) - #70123 (Ensure LLVM is in the link path for rustc tools) - #70159 (Update the bundled wasi-libc with libstd) - #70233 (resolve: Do not resolve visibilities on proc macro definitions twice) - #70286 (Miri error type: remove UbExperimental variant) Failed merges: r? @ghost
2020-03-23Rollup merge of #70286 - RalfJung:no-experiments, r=petrochenkovMazdak Farrokhzad-5/+2
Miri error type: remove UbExperimental variant In https://github.com/rust-lang/miri/pull/1250, I will move Miri away from that variant, and use a custom `MachineStop` exception instead.
2020-03-23Rollup merge of #70233 - petrochenkov:superproc, r=ecstatic-morseMazdak Farrokhzad-1/+47
resolve: Do not resolve visibilities on proc macro definitions twice Fixes https://github.com/rust-lang/rust/issues/68921
2020-03-23Rollup merge of #70159 - alexcrichton:update-wasi, r=pietroalbiniMazdak Farrokhzad-1/+1
Update the bundled wasi-libc with libstd Brings in WebAssembly/wasi-libc#184 which can help standalone programs with environment variables!
2020-03-23Rollup merge of #70123 - cuviper:library-path, r=Mark-SimulacrumMazdak Farrokhzad-45/+57
Ensure LLVM is in the link path for rustc tools The build script for `rustc_llvm` outputs LLVM information in `cargo:rustc-link-lib` and `cargo:rustc-link-search` so the compiler can be linked correctly. However, while the lib is carried along in metadata, the search paths are not. So when cargo is invoked again later for rustc _tools_, they'll also try to link with LLVM, but the necessary paths may be left out. Rustbuild can use the environment to set the LLVM link path for tools -- `LIB` for MSVC toolchains and `LIBRARY_PATH` for everyone else. Fixes #68714.
2020-03-23Rollup merge of #69968 - eddyb:tupled-closure-captures, r=nikomatsakisMazdak Farrokhzad-367/+356
rustc: keep upvars tupled in {Closure,Generator}Substs. Previously, each closure/generator capture's (aka "upvar") type was tracked as one "synthetic" type parameter in the closure/generator substs, and figuring out where the parent `fn`'s generics end and the synthetics start involved slicing at `tcx.generics_of(def_id).parent_count`. Needing to query `generics_of` limited @davidtwco (who wants to compute some `TypeFlags` differently for parent generics vs upvars, and `TyCtxt` is not available there), which is how I got started on this, but it's also possible that the `generics_of` queries are slowing down `{Closure,Generator}Substs` methods. To give an example, for a `foo::<T, U>::{closure#0}` with captures `x: X` and `y: Y`, substs are: * before this PR: `[T, U, /*kind*/, /*signature*/, X, Y]` * after this PR: `[T, U, /*kind*/, /*signature*/, (X, Y)]` You can see that, with this PR, no matter how many captures, the last 3 entries in the substs (or 5 for a generator) are always the "synthetic" ones, with the last one being the tuple of capture types. r? @nikomatsakis cc @Zoxc
2020-03-23Rollup merge of #69942 - estebank:sized-verbose-sugg, r=matthewjasperMazdak Farrokhzad-663/+818
Increase verbosity when suggesting subtle code changes Do not suggest changes that are actually quite small inline, to minimize the likelihood of confusion. Fix #69243.
2020-03-23Rollup merge of #69940 - tmiasko:llvm-api, r=hanna-kruppeMazdak Farrokhzad-16/+23
librustc_codegen_llvm: Replace deprecated API usage
2020-03-23Rollup merge of #69080 - eddyb:one-billion-dwarves-walk-into-a-bar, ↵Mazdak Farrokhzad-5/+30
r=michaelwoerister rustc_codegen_llvm: don't generate any type debuginfo for -Cdebuginfo=1. Works towards #69074 by adding more checks for `DebugInfo::Full` in a few places in `rustc_codegen_llvm`, bringing us in line with what `clang -g1` generates (no debuginfo types, nor debuginfo for `static`s). <hr/> My local build's (`debuginfo-level=1`, `debug-assertions=1`) `librustc_driver-*.so` went from just over 1GiB (1019MiB) down to 402MiB. It's still bad, but the `.debug_*` sections themselves (as reported by `objdump`) went from something like 853MiB down to 236MiB, i.e. roughly a 3.6x reduction. <hr/> Sadly, I don't think this is enough to justify *shipping* all of this debuginfo, but now it's more plausible that we could at least *build* with `debuginfo-level=1` *then* strip it. That would give us real backtraces for e.g. ICEs during builds, but I don't know how often that's relevant. We could also look into split DWARF, and maybe have a `rustc-debuginfo` component in `rustup`. There's also the possibility of making it slimmer by omitting parameters to functions, or perhaps some deduplication (I think right now there is no DWARF reuse across CGUs? maybe ThinLTO helps?). r? @michaelwoerister cc @rust-lang/wg-codegen @alexcrichton @Mark-Simulacrum
2020-03-23resolve: Do not resolve visibilities on proc macro definitions twiceVadim Petrochenkov-1/+47
2020-03-23Auto merge of #70296 - Centril:rollup-wvfmb3n, r=Centrilbors-340/+468
Rollup of 9 pull requests Successful merges: - #69251 (#[track_caller] in traits) - #69880 (miri engine: turn error sanity checks into assertions) - #70207 (Use getentropy(2) on macos) - #70227 (Only display definition when suggesting a typo) - #70236 (resolve: Avoid "self-confirming" import resolutions in one more case) - #70248 (parser: simplify & remove unused field) - #70249 (handle ConstKind::Unresolved after monomorphizing) - #70269 (remove redundant closures (clippy::redundant_closure)) - #70270 (Clean up E0449 explanation) Failed merges: r? @ghost
2020-03-23Rollup merge of #70270 - GuillaumeGomez:cleanup-e0449, r=Dylan-DPCMazdak Farrokhzad-2/+3
Clean up E0449 explanation r? @Dylan-DPC
2020-03-23Rollup merge of #70269 - matthiaskrgr:clippy_closures, r=Dylan-DPCMazdak Farrokhzad-41/+33
remove redundant closures (clippy::redundant_closure)
2020-03-23Rollup merge of #70249 - lcnr:issue70125, r=eddybMazdak Farrokhzad-24/+70
handle ConstKind::Unresolved after monomorphizing fixes #70125 r? @bjorn3
2020-03-23Rollup merge of #70248 - Centril:unroot, r=petrochenkovMazdak Farrokhzad-32/+11
parser: simplify & remove unused field r? @petrochenkov
2020-03-23Rollup merge of #70236 - petrochenkov:globimpice, r=ecstatic-morseMazdak Farrokhzad-0/+24
resolve: Avoid "self-confirming" import resolutions in one more case So the idea behind "blacklisted bindings" is that we must ignore some name definitions during resolution because otherwise they cause infinite cycles. E.g. import ```rust use my_crate; ``` would refer to itself (on 2018 edition) without this blacklisting, because `use my_crate;` is the first name in scope when we are resolving `my_crate` here. In this PR we are doing this blacklisting for the case ```rust use same::same; ``` , namely blacklisting the second `same` when resolving the first `same`. This was previously forgotten. Fixes https://github.com/rust-lang/rust/issues/62767
2020-03-23Rollup merge of #70227 - LeSeulArtichaut:typo-def, r=CentrilMazdak Farrokhzad-116/+69
Only display definition when suggesting a typo Closes #70206 r? @Centril
2020-03-23Rollup merge of #70207 - hatoo:macos-getentropy, r=dtolnayMazdak Farrokhzad-0/+37
Use getentropy(2) on macos resolves #70179
2020-03-23Rollup merge of #69880 - RalfJung:miri-assert-error-sanity, r=oli-obkMazdak Farrokhzad-6/+4
miri engine: turn error sanity checks into assertions We had these as debug assertions so far to make sure our test suite is clean, but really these are conditions that should never arise and also @eddyb told me to turn non-performance-critical debug assertions into full assertions so here we go. ;) I propose that we do a check-only crater run to make sure this does not actually happen in practice. r? @oli-obk
2020-03-23Rollup merge of #69251 - anp:track-caller-in-traits, r=eddybMazdak Farrokhzad-119/+217
#[track_caller] in traits Per https://github.com/rust-lang/rust/issues/47809#issuecomment-572791760, this allows the `#[track_caller]` attribute on trait methods. Includes tests for `#[track_caller]` with: * "regular" trait impls * default trait impls * "blanket-tracked" trait impls, where the annotation is in the trait definition and is inherited by "regular" impls of the trait
2020-03-23Auto merge of #70204 - Centril:unshackled-lowering, r=Zoxcbors-375/+384
Liberate `rustc_ast_lowering` from `rustc` The whole point of this PR is the very last commit, in which we remove `rustc` as one of `rustc_ast_lowering`'s dependencies, thereby improving `./x.py` parallelism and working towards https://github.com/rust-lang/rust/issues/65031. Noteworthy: - From `rustc::arena` we move logic into `arena`, in particular `declare_arena!`. This is then used in `rustc_ast_lowering` so that lowering has its own separate arena. - Some linting code is unfortunately moved to `rustc_session::lint` cause its used both in `rustc_lint` and `rustc_ast_lowering`, and this is their common dependency. - `rustc_session::CrateDisambiguator` is moved into `rustc_ast` so that `rustc::hir::map::definitions` can be moved into `rustc_hir`, so that `rustc_ast_lowering` can stop referring to `rustc::hir`. r? @Zoxc
2020-03-23rustc_llvm: don't use -g when LLVM_NDEBUG is set.Eduard-Mihai Burtescu-0/+1
2020-03-23rustc_codegen_llvm: don't generate static and vtable debuginfo for ↵Eduard-Mihai Burtescu-0/+10
-Cdebuginfo=1.
2020-03-23rustc_codegen_llvm: don't generate Self type debuginfo for methods for ↵Eduard-Mihai Burtescu-1/+6
-Cdebuginfo=1.
2020-03-23rustc_codegen_llvm: don't generate "lexical block" scopes for -Cdebuginfo=1.Eduard-Mihai Burtescu-4/+13
2020-03-22Remove special-casing from TyCtxt::impl_of_method.Adam Perry-12/+2
We can do this now that opt_associated_item doesn't have any panicking paths.
2020-03-22Allow #[track_caller] in traits.Adam Perry-107/+215
The codegen implementation already works for this, so we're: * propagating track_caller attr from trait def to impl * relaxing errors * adding tests Approved in a recent lang team meeting: https://github.com/rust-lang/lang-team/blob/master/minutes/2020-01-09.md
2020-03-22Use more targetted span for error labelEsteban Küber-36/+36
2020-03-22Normalize wording of privacy access labelsEsteban Küber-332/+370
2020-03-22Auto merge of #69778 - Marwes:dep_graph, r=davidtwcobors-11/+24
perf(dep_graph): Avoid allocating a set on when the number reads are … …small `reserve_and_rehash` takes up 1.4% of the runtime on the `packed-simd` benchmark which I believe is due to the number of reads are very low in many cases (see https://github.com/rust-lang/rust/pull/50565 for instance). This avoids allocating the set until we start allocating the `reads` `SmallVec` but it is possible that a lower limit might be better (not tested since the improvement will be hard to spot either way).
2020-03-22remove UbExperimental variantRalf Jung-5/+2
2020-03-22miri engine: turn error sanity checks into assertionsRalf Jung-6/+4
2020-03-22Auto merge of #69079 - CAD97:layout-of-ptr, r=RalfJungbors-8/+142
Allow calculating the layout behind a pointer There was some discussion around allowing this previously. This does make the requirement for raw pointers to have valid metadata exposed as part of the std API (as a safety invariant, not validity invariant), though I think this is not strictly necessarily required as of current. cc @rust-lang/wg-unsafe-code-guidelines Naming is hard; I picked the best "obvious" name I could come up with. If it's agreed that this is actually a desired API surface, I'll file a tracking issue and update the attributes.
2020-03-22Add span label to primary error spanEsteban Küber-80/+76
2020-03-22Increase verbosity when suggesting subtle code changesEsteban Küber-239/+360
2020-03-22Auto merge of #70275 - Dylan-DPC:rollup-1fbosob, r=Dylan-DPCbors-255/+321
Rollup of 10 pull requests Successful merges: - #68099 (Amend Rc/Arc::from_raw() docs regarding unsafety) - #70172 (parse/lexer: support `StringReader::retokenize` called on external files.) - #70209 (parser: recover on `for<'a> |...| body` closures) - #70223 (fix type of const params in associated types.) - #70229 (more clippy fixes) - #70240 (Return NonZeroU64 from ThreadId::as_u64.) - #70250 (Remove wrong entry from RELEASES.md) - #70253 (Remove another wrong entry from RELEASES.md) - #70254 (couple more clippy fixes (let_and_return, if_same_then_else)) - #70266 (proc_macro_harness: Use item header spans for errors) Failed merges: r? @ghost
2020-03-22Rollup merge of #70266 - petrochenkov:prochead, r=varkorDylan DPC-31/+20
proc_macro_harness: Use item header spans for errors Addresses https://github.com/rust-lang/rust/pull/70233#discussion_r396043004.
2020-03-22Rollup merge of #70254 - matthiaskrgr:cl4ppy, r=CentrilDylan DPC-67/+34
couple more clippy fixes (let_and_return, if_same_then_else) * summarize if-else-code with identical blocks (clippy::if_same_then_else) * don't create variable bindings just to return the bound value immediately (clippy::let_and_return)
2020-03-22Rollup merge of #70253 - jplatte:patch-2, r=Mark-SimulacrumDylan DPC-1/+0
Remove another wrong entry from RELEASES.md The entry is under 1.11.0, but the feature is only available since 1.12.0 (for which an identical entry exists). ![Screenshot_2020-03-22 Support `cfg_attr` on `path` attributes by jseyfried · Pull Request #34546 · rust-lang rust](https://user-images.githubusercontent.com/951129/77238862-85c8f580-6bd4-11ea-8d31-77e2994a4b5a.png)
2020-03-22Rollup merge of #70250 - jplatte:patch-1, r=CentrilDylan DPC-2/+0
Remove wrong entry from RELEASES.md resolves #70247
2020-03-22Rollup merge of #70240 - brain0:thread_id, r=Mark-SimulacrumDylan DPC-4/+4
Return NonZeroU64 from ThreadId::as_u64. As discussed in #67939, this allows turning Option<ThreadId> into Option<NonZeroU64> which can then be stored inside an AtomicU64.
2020-03-22Rollup merge of #70229 - matthiaskrgr:cl3ppy, r=Mark-SimulacrumDylan DPC-115/+92
more clippy fixes * remove unused unit values (clippy::unused_unit) * make some let-if-bindings more idiomatic (clippy::useless_let_if_seq) * clarify when we pass () to functions (clippy::unit_arg) * don't redundantly repeat field names (clippy::redundant_field_names) * remove redundant returns (clippy::needless_return) * use let instead of match for matches with single bindings (clippy::match_single_binding) * don't convert results to options just for matching (clippy::if_let_some_result)
2020-03-22Rollup merge of #70223 - lcnr:issue70167, r=eddybDylan DPC-4/+54
fix type of const params in associated types. fixes #66906 fixes #70167 r? @eddyb
2020-03-22Rollup merge of #70209 - Centril:recover-quant-closure, r=petrochenkovDylan DPC-14/+66
parser: recover on `for<'a> |...| body` closures When encountering `for` and `<` is 1 token ahead, interpret this as an explicitly quantified generic closure and recover, rather than attempting to parse a `for` loop. This provides both improved diagnostics as well as an insurance policy for the ability to use this as the syntax for generic closures in the future. As requested by r? @eddyb
2020-03-22Rollup merge of #70172 - eddyb:retokenize-external-src, r=petrochenkovDylan DPC-7/+15
parse/lexer: support `StringReader::retokenize` called on external files. This ~~should theoretically~~ fixes #69933, ~~but I'm not sure what the best way to test it is~~. **EDIT**: see https://github.com/rust-lang/rust/issues/69933#issuecomment-602019598. r? @petrochenkov cc @Xanewok @staktrace
2020-03-22Rollup merge of #68099 - lukaslueg:into_raw_unsafe, r=LukasKalbertodtDylan DPC-10/+36
Amend Rc/Arc::from_raw() docs regarding unsafety [This](https://stackoverflow.com/questions/59671647/is-it-safe-to-clone-a-type-erased-arc-via-raw-pointer) question on SO boils down to "is it safe to `::from_raw()` a `Rc<T>`/`Arc<T>` using a dummy `T` even if `T` is never dereferenced via the new `Rc`/`Arc`?". It almost never is. This PR amends the docs of `from_raw()` regarding this point.
2020-03-22Clean up E0449 explanationGuillaume Gomez-2/+3
2020-03-22Auto merge of #68820 - WaffleLapkin:remove_finished_from_map_while, ↵bors-57/+32
r=LukasKalbertodt Remove `finished` flag from `MapWhile` This PR removes `finished` flag from `MapWhile` as been proposed in https://github.com/rust-lang/rust/pull/66577#discussion_r370958025. This also resolves open questions of the tracking issue (#68537): - `MapWhile` can't implement both + `DoubleEndedIterator` (discussed in https://github.com/rust-lang/rust/pull/66577#discussion_r370947990 and following comments) + `FusedIterator` (this pr removes `finished` flag, so `MapWhile` isn't fused anymore) - Debug output (this pr removes `finished` flag, so there is no question in including it in debug output) r? @Mark-Simulacrum