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 14 pull requests #44093

Closed
wants to merge 23 commits into from
Closed

Conversation

lukaramu and others added 9 commits August 24, 2017 18:42
This fixes headings reading "Unsafety" and "Example", they should be
"Safety" and "Examples" according to RFC 1574.
Discovered in rust-lang#43767 it turns out the default MSBuild generator in CMake for
whatever reason isn't supporting many of the configuration options we give to
LLVM. To improve the contributor experience automatically enable Ninja if we
find it to ensure that "flavorful" configurations of LLVM work by default in
more situations.

Closes rust-lang#43767
Fixes rust-lang#44078. Fixes rust-lang#44023.

The start_col member is given in chars,
while the code previously assumed it was given in bytes.

The more basic issue rust-lang#44080 doesn't get fixed.
* Makes rust bootstrap incorrectly search for xxx.s vs xxx.0.s
* Not needed or incorrect fix for another issue.
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@alexcrichton
Copy link
Member Author

@bors: r+ p=10

@bors
Copy link
Contributor

bors commented Aug 26, 2017

📌 Commit 8a76571 has been approved by alexcrichton

@ishitatsuyuki
Copy link
Contributor

ishitatsuyuki commented Aug 26, 2017

@alexcrichton unused-extern-crate is risky. Are you sure?

EDIT: what's more, it's going to conflict with the RLS update if it passed.

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 26, 2017

📌 Commit 3a63420 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 26, 2017

⌛ Testing commit 3a6342061f065207234242cd8931cfc926abe36d with merge 514e1d23054183c43ae77562284ad6074198a29a...

@bors
Copy link
Contributor

bors commented Aug 26, 2017

💔 Test failed - status-appveyor

This adds a function to `DiagnosticBuilder` to delay the entire diagnostic as a
bug to be emitted at a later time. This'll end up getting used in the compiler
in the subsequent commits...
This alters the return value of the `try_get` function so the error contains a
diagnostic rather than a `CycleError`. This way consumers are forced to take
*some* action (else they get a bug to an un-emitted diagnostic). This action
could be to emit the error itself, or in some cases delay the diagnostic as a
bug and continue.
The `sized_constraint` and `needs_drop_raw` queries both use `try_get` to detect
cycles, but in both of these cases the cycle indicates an error has happened
elsewhere in compilation. In these cases we can just delay the diagnostic to get
emitted as a bug later if we ended up forgetting to emit the error diagnostic.
It sounds like this is being handled elsewhere, so for now just preserve the
existing behavior of ignoring th error.
This seems like it may be likely to cause bugs with `RUST_LOG` and other
"interesting" scenarios, but it removes the usage of `try_get` for now!
…labnik

Fix inconsistent doc headings

This fixes headings reading "Unsafety" and "Example", they should be "Safety" and "Examples" according to RFC 1574.

r? @steveklabnik
include Cargo.{toml,lock} in rust-src tarball

The lock file is interesting because e.g. xargo could use it to build libstd against the same dependencies that were used for the main build. More generally speaking, just documenting in this form which exact dependencies should be used IMHO makes lots of sense.

I added the Cargo.toml mostly because having the lock without the toml feels odd. Of course, the toml contains references to paths that don't actually exist in the rust-src tarball. Not sure if that is considered a problem.
Fix a byte/char confusion issue in the error emitter

Fixes rust-lang#44078. Fixes rust-lang#44023.

The start_col member is given in chars, while the code previously assumed it was given in bytes.

The more basic issue rust-lang#44080 doesn't get fixed.
Fix destruction extent lookup during HIR -> HAIR translation

My method for finding the destruction extent, if any, from cbed41a (in rust-lang#39409), was buggy in that it sometimes failed to find an extent that was nonetheless present.

This fixes that, and is cleaner code to boot.

Fix rust-lang#43457
…ulacrum

rustbuild: Automatically enable Ninja on MSVC

Discovered in rust-lang#43767 it turns out the default MSBuild generator in CMake for
whatever reason isn't supporting many of the configuration options we give to
LLVM. To improve the contributor experience automatically enable Ninja if we
find it to ensure that "flavorful" configurations of LLVM work by default in
more situations.

Closes rust-lang#43767
…imulacrum

Allow `htmldocck.py` to run using Python 3
Add missing link in string doc

r? @rust-lang/docs
haiku/librustc_back: Remove incorrect no_integrated_as

* Makes rust bootstrap incorrectly search for xxx.s vs xxx.0.s
* Not needed or incorrect fix for another issue.
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 26, 2017

📌 Commit f0ba1b9 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 26, 2017

⌛ Testing commit f0ba1b9 with merge f5637b21f4af90062c3d02f4087aa86449e12036...

@bors
Copy link
Contributor

bors commented Aug 26, 2017

💔 Test failed - status-travis

@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.