Rollup of 24 pull requests #35578
Closed
Rollup of 24 pull requests #35578
Conversation
This file contains hidden or 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
- Fix note message, fix tests.
added 21 commits
August 10, 2016 13:15
…dturner Update error format for E0326 Fixes rust-lang#35335 as part of rust-lang#35233 r? @jonathandturner
…rielb1 Update e0017 to new format Updated `span_err!` to use `struct_span_err!` and provide a `span_label` that describes the error in context. Updated the test to look for the `span_label`s that are provided now.
…omatsakis run rustfmt on compiletest folder in src/tools/ folder
Remove unnecessary `main` functions in doc examples.
…rner Shrink span to variant discriminant expression for E0081 Part of rust-lang#35233. Extension of rust-lang#35353. Fixes rust-lang#35224. r? @jonathandturner
Add test for issue rust-lang#29053 This PR adds a test for rust-lang#29053 (currently fails on stage 0, but works with stage 1, as it should). Fixes rust-lang#29053
Update E0033 to the new error format Part of rust-lang#35233 Addresses rust-lang#35498 "r? @jonathandturner
Update Error Format for E0091 and E0092 Addresses [rust-lang#35228](rust-lang#35228) and [rust-lang#35229](rust-lang#35229) as part of [rust-lang#35233](rust-lang#35233). Please let me know if there are any issues; first time contributor. r? @jonathandturner
Update E0008 and E0007 to new format Part of rust-lang#35233 A fix for rust-lang#35496 r? @jonathandturner
…ndturner Do not span across nodes for E0004 Part of rust-lang#35233. Fixes rust-lang#35529. r? @arielb1
…athandturner Updated E0433 to new error message. (no bonus) Part of rust-lang#35345 r? @jonathandturner
Update E0038 to the new error format Part of rust-lang#35233 Addresses rust-lang#35500 "r? @jonathandturner This doesn't compile yet, and I need help. In my naive solution, adding the span label makes our error message a mutable `errors::DiagnosticBuilder` pointer. ```bash python src/bootstrap/bootstrap.py --step check-cfail E0038 --stage 1 ``` ``` Building stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Building stage0 test artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Building stage0 compiler artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Compiling rustc v0.0.0 (file:///home/nash/code/rust/src/librustc) src/librustc/traits/error_reporting.rs:735:9: 735:12 error: mismatched types [E0308] src/librustc/traits/error_reporting.rs:735 err ^~~ src/librustc/traits/error_reporting.rs:735:9: 735:12 help: run `rustc --explain E0308` to see a detailed explanation src/librustc/traits/error_reporting.rs:735:9: 735:12 note: expected type `core::option::Option<errors::DiagnosticBuilder<'tcx>>` src/librustc/traits/error_reporting.rs:735:9: 735:12 note: found type `core::option::Option<&mut errors::DiagnosticBuilder<'_>>` error: aborting due to previous error error: Could not compile `rustc`. To learn more, run the command again with --verbose. command did not execute successfully: "/home/nash/code/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "4" "--target" "x86_64-unknown-linux-gnu" "--release" "--features" " jemalloc" "--manifest-path" "/home/nash/code/rust/src/rustc/Cargo.toml" expected success, got: exit code: 101 ```
…athandturner Updated E0045 to new error format (no bonus) Part of rust-lang#35501 r? @jonathandturner
Update error message E0384 to new format Part of rust-lang#35233 Fixes rust-lang#35184 r? @jonathandturner
Add tracking issue for `String::insert_str`
…t, r=jonathandturner E0128 update error format Fixes rust-lang#35508 Part of rust-lang#35233 r? @jonathandturner
E0263 updated to new format. Fixes rust-lang#35518. Part of rust-lang#35233. r? @jonathandturner
Remove redundant `&mut ref mut` in doc for Result::as_mut() While a good example of how `&mut ref mut` is a no-op, I don't think we should show that here :) See https://users.rust-lang.org/t/mnemonic-for-reading-qualifiers/6853 r? @steveklabnik
Update E0133 to new format Part of rust-lang#35233 Fix rust-lang#35509 r? @jonathandturner
Fix docs typo in std::os::unix::net::SocketAddr::is_unnamed
Update E0138 to new format Part of rust-lang#35233 Fix rust-lang#35510 r? @jonathandturner  Question: How can I only underline the function name ? I have observed the debug output and the struct of item, but I can't find the `Span` for function name. Should I modify the struct I get to save function name's position or there is another way to get it ? (I can only find `Span`s for function attributes, inputs, outputs, blocks)
|
@bors r+ p=1 |
|
📌 Commit f2cc66c has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit f2cc66c with merge 15d8796... |
|
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
mainfunctions in doc examples. #35482, Shrink span to variant discriminant expression for E0081 #35486, Add test for issue #29053 #35505, Update E0033 to the new error format #35526, Update Error Format for E0091 and E0092 #35528, Update E0008 and E0007 to new format #35530, Do not span across nodes for E0004 #35532, Updated E0433 to new error message. (no bonus) #35536, Update E0038 to the new error format #35537, Updated E0045 to new error format (no bonus) #35541, Update error message E0384 to new format #35552, Add tracking issue forString::insert_str#35554, E0128 update error format #35555, E0263 updated to new format. #35557, Remove redundant&mut ref mutin doc for Result::as_mut() #35562, Update E0133 to new format #35565, Fix docs typo in std::os::unix::net::SocketAddr::is_unnamed #35569, Update E0138 to new format #35573