Rollup of 38 pull requests #40432
Merged
Rollup of 38 pull requests #40432
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows limiting the number of linker jobs to avoid swapping when linking LLVM with debug info.
I can't find anything that'd cause unexpected EOF in the source, so let's try taking a look at the error logs on failures.
When declaring nested unsafe blocks (`unsafe {unsafe {}}`) that trigger
the "unnecessary `unsafe` block" error, point out the enclosing `unsafe
block` or `unsafe fn` that makes it unnecessary.
Some annotations like the "test" annotations might be of interest for other projects, especially rls. Export all attributes in a new attributes item.
Remove the AST structure
In recent months there have been a few different people investigating how to make a plugin that registers a MIR-pass – one that isn’t intended to be eventually merged into rustc proper. The interface to register MIR passes was added primarily for miri (& later was found to make prototyping of rustc-proper MIR passes a tiny bit faster). Since miri does not use this interface anymore it seems like a good time to remove this "feature". For prototyping purposes a similar interface can be added by developers themselves in their custom rustc build.
They report their `uname -m` as armv8l rather than aarch64. Patch originally by Matthias Klose <doko@debian.org>
This commit alters the compiler to exit quickly if the only output being emitted is `dep-info`, which doesn't need a lot of other information to generate. Closes rust-lang#40328
This change introduces a Dockerfile and script which builds a complete Fuchsia toolchain which can be used to build Rust distribution for Fuchsia. We only support cross-compiling at the moment, hence only setting the target.
I don't believe that we need this any more now that `cargo-vendor` isn't installed to create a source tarball (that only happens on Linux)
This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to the top directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.
…turner
Point to enclosing block/fn on nested unsafe
When declaring nested unsafe blocks (`unsafe {unsafe {}}`) that trigger
the "unnecessary `unsafe` block" error, point out the enclosing `unsafe
block` or `unsafe fn` that makes it unnecessary.
<img width="621" alt="" src="https://cloud.githubusercontent.com/assets/1606434/22139922/26ad468a-de9e-11e6-8884-2945be882ea8.png">
Fixes rust-lang#39144.
Export attributes in save-analysis data Since this is my first pull-request to rust, I would like to get some feedback about obvious errors in this implementation. I would like to change the save-analysis data to include arbitrary attribute data. A use-case I have in mind for this is identifying functions with `#[test]` annotations such that tools like rls can offer a test-runner feature. I described my idea here [rls#173](rust-lang/rls#173). My changes contain: 1. track a vector of attributes in the various `*Data` types in `data.rs` and `external_data.rs` 2. implement lowering for `Attribute` and `MetaItem` 3. adjust `JsonDumper` to print the attributes In the lowering of `Attribute` I remove the distinction between `MetaItem` and `NestedMetaItem`. I did this because this distinction is somewhat confusing. For example, `NestedMetaItemKind::Literal` has two identical spans, because both `NestedMetaItem` and `Lit` are defined as `Spanned<_>`. My model is strictly more general, as it allows an `LitKind` instead of a `Symbol` for `MetaItem` and `Symbol`s are converted into a cooked string. As a consumer of the save-analysis data this shouldn't affect you much. Example json output of `#[test]` annotation: ``` "attributes": [ { "value": { "name": { "variant": "Str", "fields": [ "test", "Cooked" ] }, "kind": "Literal", "span": { "file_name": "test.rs", "byte_start": 2, "byte_end": 6, "line_start": 1, "line_end": 1, "column_start": 3, "column_end": 7 } }, "span": { "file_name": "test.rs", "byte_start": 0, "byte_end": 7, "line_start": 1, "line_end": 1, "column_start": 1, "column_end": 8 } } ] ```
travis: Fuchsia builder This change introduces a Dockerfile and script which builds a complete Fuchsia toolchain which can be used to build Rust distribution for Fuchsia. We only support cross-compiling at the moment, hence only setting the target.
|
Some changes occurred in HTML/CSS. |
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: retry
…On Mar 10, 2017 6:54 PM, "bors" ***@***.***> wrote:
💔 Test failed - status-travis
<https://travis-ci.org/rust-lang/rust/builds/209948758>
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#40432 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAD95GjGQI4-no6NWMA_DqHM2Ov_-kwKks5rkfCwgaJpZM4MZ9Rb>
.
|
|
⌛ Testing commit c4889ec with merge dd5e3cd... |
|
💔 Test failed - status-travis |
Box docs: no allocation is done for ZSTs. Updated to add a small bit saying that ZSTs don't actually allocate on `Box::new`.
…or, r=alexcrichton Distinguish the ways `CStr::from_bytes_with_nul` can fail
Implement placement-in protocol for `VecDeque` CC rust-lang#30172 r? @nagisa
…r=alexcrichton OsString::shrink_to_fit. Considering how the other capacity-related methods are there, I found it odd that this one wasn't included. Will create a tracking issue once I get an OK on this.
Clarify docs in `VecDeque::resize`
…rson travis: Remove compiling OpenSSL through homebrew I don't believe that we need this any more now that `cargo-vendor` isn't installed to create a source tarball (that only happens on Linux)
|
@bors: r+ |
|
📌 Commit 3493d91 has been approved by |
|
⌛ Testing commit 3493d91 with merge 6466f85... |
|
💔 Test failed - status-travis |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Mar 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
proc_macro#40199, Restore creating the channel-rust-$channel-date.txt files #40225, Remove ability for plugins to register a MIR pass #40239, LLVM: Update submodule to include SRet support patch for MSP430. #40257, Fix emscripten test detection #40259, Support armhf abi on 64-bit ARM cpus #40261, rustbuild: expose LLVM_PARALLEL_LINK_JOBS #40277, Clean up rustdoc css #40278, Fix incorrect span label formatting #40287, Don't put Cargo into the rustc workspace #40297, Expect macro defs in save-analysis and add expn info to spans for att… #40311, Allow lints to check Bodys directly #40315, Disallow subtyping between T and U in T: Unsize<U>. #40319, travis: Attempt to debug sccache failures #40324, rustc: Exit quickly on only--emit dep-info#40336, Update syntax forpub(restricted)#40340, save-analysis: cope with lack of method data after a type error #40344, Fix missing backtick typo #40345, Improve the LLVM IR we generate for trivial functions, especially #[naked] ones. #40367, Give spans to individual path segments in AST #40369, Do not bother creating StorageLive for TyNever #40372, Fix UB in repr(packed) tests #40373, Box docs: no allocation is done for ZSTs. #40379, emit !align attributes on stores of operand pairs #40385, Distinguish the waysCStr::from_bytes_with_nulcan fail #40386, Implement placement-in protocol forVecDeque#40389, Update gdbr tests #40400, fix #40294 obligation cause.body_id is not always a NodeExpr #40404, OsString::shrink_to_fit. #40410, rustc: Support auto-retry linking on a segfault #40422, Clarify docs inVecDeque::resize#40423, travis: Remove compiling OpenSSL through homebrew #40424ast::ItemKind::MacroDef, simplify hygiene info #40220, rustbuild: Add option for enabling partial LLVM rebuilds #40329, Update mdbook to new version #40426