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 11 pull requests #46399

Closed
wants to merge 24 commits into from
Closed

Rollup of 11 pull requests #46399

wants to merge 24 commits into from

Conversation

scottmcm and others added 13 commits November 28, 2017 01:16
When the only difference between the two types in a type error is that
one is a reference to the other type (`T` vs `&T`) or both are
references differing only in their mutability (`&T` vs `&mut T`), don't
highlight the type (`T`).
The documentation states: "The name output should be the name of the
library." and this is already done in more recently-added callers.
* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
The usage of `Path::new` prevented out-of-tree builds (like the bots do) from
working by accident!

Closes rust-lang#46195
We want librustdoc to pickup the env_logger dependency from
the sysroot. This ensures that the same copy of env_logger is used
for both internal crates (e.g. librustc_driver, libsyntax) and
librustdoc

Closes rust-lang#46383
This was added to cover up a lazy extra semicolon in rust-lang#35849, but does
not actually make sense. This is removed as a part of the stabilization
of `never_type`.
@arielb1
Copy link
Contributor Author

arielb1 commented Nov 30, 2017

@bors r+ p=11

@rust-highfive
Copy link
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented Nov 30, 2017

📌 Commit db4339f has been approved by arielb1

@bors
Copy link
Collaborator

bors commented Nov 30, 2017

⌛ Testing commit db4339f0f0835462f1a4aeee15a807a3dec3f517 with merge 8223d4bbc41bbd43f8d8bd282eff4455769068bb...

@bors
Copy link
Collaborator

bors commented Nov 30, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 30, 2017

Well the error is legit, I guess one of estebank's suggestion PR is conflicting with some other changes in this rollup (or maybe those PRs are not up-to-date with the latest master, causing false Travis ✅.)

Ariel Ben-Yehuda added 5 commits November 30, 2017 18:02
make coercions to `!` in unreachable code a hard error

This was added to cover up a lazy extra semicolon in rust-lang#35849, but does
not actually make sense. This is removed as a part of the stabilization
of `never_type`.
rustc_llvm: remove stale references

...that were removed in 77c3bfa.

r? @alexcrichton
…s, r=nagisa

Update compiler-builtins and use it in the 128-bit lowering MIR test

This picks up the lang item implementations from rust-lang/compiler-builtins#210

cc rust-lang#45676 @est31 @nagisa
On type mismatch error highlight `&` when type matches

When the only difference between the two types in a type error is that
one is a reference to the other type (`T` vs `&T`) or both are
references differing only in their mutability (`&T` vs `&mut T`), don't
highlight the type (`T`).
Ariel Ben-Yehuda added 2 commits November 30, 2017 18:02
…uginfo-spans, r=eddyb

incr.comp.: Remove an unnecessary HIR access which enables hashing spans for type definitions.

r? @nikomatsakis
…etMisdreavus

rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
Ariel Ben-Yehuda added 3 commits November 30, 2017 18:02
…-Simulacrum

rustbuild: Fix a typo with the Cargo book

The usage of `Path::new` prevented out-of-tree builds (like the bots do) from
working by accident!

Closes rust-lang#46195
…imulacrum

Remove librustdoc dependency on env_logger

We want librustdoc to pickup the env_logger dependency from
the sysroot. This ensures that the same copy of env_logger is used
for both internal crates (e.g. librustc_driver, libsyntax) and
librustdoc

Closes rust-lang#46383
…r=eddyb

incr.comp.: Make traits::VTable encodable and decodable.

Make vtables encodable so we can cache the `trans_fulfill_obligation` query at some point.

r? @eddyb
@arielb1
Copy link
Contributor Author

arielb1 commented Nov 30, 2017

@kennytm

The str-array-assignment test was introduced in a PR and conflicted with this

@arielb1 arielb1 closed this Nov 30, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.