Skip to content
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

Rollup of 10 pull requests #64883

Merged
merged 26 commits into from
Sep 29, 2019
Merged

Rollup of 10 pull requests #64883

merged 26 commits into from
Sep 29, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 28, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 26 commits September 25, 2019 13:23
New Exprs generated as part of the format macro expansion should get the macro
expansion span which has an expansion context, not the span of the format string
which does not.
Where possible, the error message includes the name of the crate
that brought in the crate with duplicate lang items (which
helps with debugging). This information is passed on from cstore
using the `extern_crate` query.
StableMap
A wrapper for FxHashMap that allows to insert, remove, get and get_mut
but no iteration support.

StableSet
A wrapper for FxHashSet that allows to insert, remove, get and create a
sorted vector from a hashset but no iteration support.
…=Mark-Simulacrum

data_structures: Add deterministic FxHashMap and FxHashSet wrappers

StableMap
A wrapper for FxHashMap that allows to `insert`, `remove`, `get`, `get_mut` and convert a hashmap into a sorted vector using the method `into_sorted_vector` but no iteration support.

StableSet
A wrapper for FxHashSet that allows to `insert`, `remove`, `get` and convert a hashset into a sorted vector using the method `into_sorted_vector` but no iteration support.

Addresses issue rust-lang#63713
…rkor

Fix redundant semicolon lint interaction with proc macro attributes

Fixes rust-lang#63967 and fixes rust-lang#63947, both of which were caused by the lint's changes to the parser interacting poorly with proc macro attributes and causing span information to be lost

r? @varkor
…asper

added more context for duplicate lang item errors (fixes rust-lang#60561)

Some more information about rust-lang#60561 -- these errors are pretty common when one works in restrictive environments with `no_std` or customized `std`, but they don't provide much context for debugging, as any transitive dependency could have brought in `std` crate. With that, currently, one needs to use something like `cargo tree` and investigate transitive dependencies one by one.

It'll be more helpful to know at least the crate that uses `std` (which `cargo tree` doesn't show) to pin down this investigation when debugging.

I'm not sure what the best way to get this context is inside rustc internals (I'm new to them). I found that `all_crate_nums` query returns the crates in some dependency order, so printing out the name of the preceding crate seems to do the trick. But I welcome suggestions if this can be done in a better way.
…-E0734, r=estebank

Add E0734 and its long explanation

Part of rust-lang#61137
Fix format macro expansions spans to be macro-generated

New Exprs generated as part of the format macro expansion should get the macro
expansion span with an expansion context, rather than the span of the format string
which does not.
Improve wording in documentation of MaybeUninit

Changes

> variables are properly initialized **at** their respective type

into

> variables are properly initialized **as** their respective type
Upgrade async/await to "used" keywords.

AFAIK, this only affects error messages, removing the word "reserved".

Closes rust-lang#64853
…sic-op-unsafety, r=varkor

Fix typo in intrinsics op safety

Title pretty much sums up.
Slice docs: fix typo

With rust-lang#64703, I introduced a typo. Here is the fix. Sorry for the inconvenience.
@Centril
Copy link
Contributor Author

Centril commented Sep 28, 2019

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Sep 28, 2019

📌 Commit 4652671 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 28, 2019
@bors
Copy link
Contributor

bors commented Sep 28, 2019

⌛ Testing commit 4652671 with merge b61e694...

bors added a commit that referenced this pull request Sep 28, 2019
Rollup of 10 pull requests

Successful merges:

 - #64131 (data_structures: Add deterministic FxHashMap and FxHashSet wrappers)
 - #64387 (Fix redundant semicolon lint interaction with proc macro attributes)
 - #64678 (added more context for duplicate lang item errors (fixes #60561))
 - #64763 (Add E0734 and its long explanation)
 - #64793 (Fix format macro expansions spans to be macro-generated)
 - #64837 (Improve wording in documentation of MaybeUninit)
 - #64852 (Print ParamTy span when accessing a field (#52082))
 - #64875 (Upgrade async/await to "used" keywords.)
 - #64876 (Fix typo in intrinsics op safety)
 - #64880 (Slice docs: fix typo)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 29, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing b61e694 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2019
@bors bors merged commit 4652671 into rust-lang:master Sep 29, 2019
@Centril Centril deleted the rollup-uehjt63 branch September 29, 2019 02:36
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustc could provide more help for debugging no_std duplicate_lang item errors