fixes rust-lang#56766 #59041

saleemjaffer · 2019-03-09T08:03:51Z

fixes #56766

rust-highfive · 2019-03-09T08:03:54Z

r? @eddyb

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

saleemjaffer · 2019-03-09T08:04:26Z

r? @estebank

estebank

Can you add a test to src/test/ui/parser/doc-inside-trait-item.rs:

trait User{
    fn test();
    /// empty doc
    //~^ ERROR found a documentation comment that doesn't document anything
}
fn main() {}

and run ./x.py test src/test/ui --bless and add the new test and its corresponding generated .stderr file?

estebank · 2019-03-09T21:33:06Z

src/libsyntax/parse/parser.rs

+                        err.help("doc comments must come before what they document, maybe a \
+                            comment was intended with `//`?",
+                        );
+                        err.emit();


For everything between 6636 and 6644 you can replace it with self.span_fatal_err(self.prev_span, Error::UselessDocComment).emit();, like in

rust/src/libsyntax/parse/parser.rs

Line 5290 in fcfc796

s.span_fatal_err(s.prev_span, Error::UselessDocComment).emit();

#57333 (comment)

@estebank This is the reason I used struct_span_err_with_code. Do we not need that now?

(indeed, this does not seem like it needs to be a fatal error; I concur with @saleemjaffer's choice to use a non-fatal error here.)

rust-highfive · 2019-03-13T04:46:02Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:0f0ddda7:start=1552451371479680683,finish=1552451448956299056,duration=77476618373
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---

[00:03:21] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:21] tidy error: /checkout/src/test/ui/parser/doc-inside-trait-item.rs: missing trailing newline
[00:03:22] some tidy checks failed
[00:03:22] 
[00:03:22] 
[00:03:22] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:22] 
[00:03:22] 
[00:03:22] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:22] Build completed unsuccessfully in 0:00:47
[00:03:22] Build completed unsuccessfully in 0:00:47
[00:03:22] Makefile:68: recipe for target 'tidy' failed
[00:03:22] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:003e61d1
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Mar 13 04:34:20 UTC 2019
---
travis_time:end:064afad9:start=1552451661684368928,finish=1552451661689762848,duration=5393920
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:11965edf
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1dcf7220
travis_time:start:1dcf7220
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:171e1360
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Dylan-DPC-zz · 2019-03-25T10:36:25Z

ping from triage @saleemjaffer you need to address the failing test

saleemjaffer · 2019-03-25T10:49:29Z

This was fixed. All tests seem to be passing.

Dylan-DPC-zz · 2019-03-25T10:53:29Z

@estebank this is ready for a review

Centril · 2019-03-30T13:10:00Z

Ping from triage, @estebank, we eagerly await your review!

pnkfelix · 2019-04-01T11:29:20Z

@bors r? pnkfelix

pnkfelix · 2019-04-01T11:29:31Z

@bors r+

bors · 2019-04-01T11:29:32Z

📌 Commit d258481 has been approved by pnkfelix

Centril · 2019-04-01T11:37:51Z

r? @pnkfelix

…er_error_msg, r=pnkfelix fixes rust-lang#56766 fixes rust-lang#56766

estebank · 2019-04-01T12:25:32Z

Apologies for the unresponsiveness over the past week. I've been sporadically online.

…er_error_msg, r=pnkfelix fixes rust-lang#56766 fixes rust-lang#56766

@ghost

Rollup of 7 pull requests Successful merges: - #58507 (Add a -Z time option which prints only passes which runs once) - #58919 (Suggest using anonymous lifetime in `impl Trait` return) - #59041 (fixes #56766) - #59586 (Fixed URL in cargotest::TEST_REPOS) - #59595 (Update rustc-guide submodule) - #59601 (Fix small typo) - #59603 (stabilize ptr::hash) Failed merges: r? @ghost

fixes rust-lang#56766

fcfc796

rust-highfive assigned eddyb Mar 9, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2019

rust-highfive assigned estebank and unassigned eddyb Mar 9, 2019

estebank reviewed Mar 9, 2019

View reviewed changes

estebank added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2019

adding test

eaff0fe

tidy test

d258481

Dylan-DPC-zz added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 25, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2019

rust-highfive assigned pnkfelix and unassigned estebank Apr 1, 2019

Centril added a commit to Centril/rust that referenced this pull request Apr 1, 2019

Rollup merge of rust-lang#59041 - saleemjaffer:trait_doc_comment_bett…

8abb24c

…er_error_msg, r=pnkfelix fixes rust-lang#56766 fixes rust-lang#56766

Centril mentioned this pull request Apr 1, 2019

Rollup of 5 pull requests #59602

Closed

Centril added a commit to Centril/rust that referenced this pull request Apr 1, 2019

Rollup merge of rust-lang#59041 - saleemjaffer:trait_doc_comment_bett…

d2fd3fe

…er_error_msg, r=pnkfelix fixes rust-lang#56766 fixes rust-lang#56766

Centril mentioned this pull request Apr 1, 2019

Rollup of 7 pull requests #59606

Merged

bors merged commit d258481 into rust-lang:master Apr 1, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fixes rust-lang#56766 #59041

fixes rust-lang#56766 #59041

saleemjaffer commented Mar 9, 2019 •

edited

Loading

rust-highfive commented Mar 9, 2019

saleemjaffer commented Mar 9, 2019

estebank left a comment •

edited

Loading

estebank Mar 9, 2019

saleemjaffer Mar 10, 2019 •

edited

Loading

pnkfelix Apr 1, 2019

rust-highfive commented Mar 13, 2019

Dylan-DPC-zz commented Mar 25, 2019

saleemjaffer commented Mar 25, 2019

Dylan-DPC-zz commented Mar 25, 2019

Centril commented Mar 30, 2019

pnkfelix commented Apr 1, 2019

pnkfelix commented Apr 1, 2019

bors commented Apr 1, 2019

Centril commented Apr 1, 2019

estebank commented Apr 1, 2019

fixes rust-lang#56766 #59041

fixes rust-lang#56766 #59041

Conversation

saleemjaffer commented Mar 9, 2019 • edited Loading

rust-highfive commented Mar 9, 2019

saleemjaffer commented Mar 9, 2019

estebank left a comment • edited Loading

Choose a reason for hiding this comment

estebank Mar 9, 2019

Choose a reason for hiding this comment

saleemjaffer Mar 10, 2019 • edited Loading

Choose a reason for hiding this comment

pnkfelix Apr 1, 2019

Choose a reason for hiding this comment

rust-highfive commented Mar 13, 2019

Dylan-DPC-zz commented Mar 25, 2019

saleemjaffer commented Mar 25, 2019

Dylan-DPC-zz commented Mar 25, 2019

Centril commented Mar 30, 2019

pnkfelix commented Apr 1, 2019

pnkfelix commented Apr 1, 2019

bors commented Apr 1, 2019

Centril commented Apr 1, 2019

estebank commented Apr 1, 2019

saleemjaffer commented Mar 9, 2019 •

edited

Loading

estebank left a comment •

edited

Loading

saleemjaffer Mar 10, 2019 •

edited

Loading