Add lint for copyright headers to 'tidy' tool #57520

alexreg · 2019-01-11T17:25:45Z

alexreg · 2019-01-11T18:30:32Z

Looks to be working. I’ll fix those files shortly.

Mark-Simulacrum · 2019-01-11T20:31:57Z

Looks like Travis failed but this looks good to me in general - it might be worth including a check for "Rust" in the copyright line?

alexreg · 2019-01-11T20:47:29Z

Looks like Travis failed but this looks good to me in general - it might be worth including a check for "Rust" in the copyright line?

Yep, I actually went further than this and made a regex for the copyright line, but let me know if that's overkill...

Mark-Simulacrum · 2019-01-12T01:28:08Z

I think the regex is a bit overkill - especially because as far as I can tell it can be replaced with ~3 contains nearly equivalently. But if that's not actually the case, then let's put it in a lazy_static and call it good.

alexreg · 2019-01-12T02:11:15Z

Yeah, I thought originally I would need a more complicated regex to distinguish between Rust Developers and other sorts of copyright notices, but probably not. Let's see if this works...

alexreg · 2019-01-12T04:35:25Z

@Mark-Simulacrum Looking good now. (Tidy checks would have failed this far into the tests.) r+ if you're happy with things?

Mark-Simulacrum · 2019-01-12T04:42:45Z

r=me with notes fixed.

Thanks for taking this on!

Let's also @bors p=1 to hopefully help avoid some rebase pain.

alexreg · 2019-01-12T18:59:45Z

@Mark-Simulacrum LGTM?

bors · 2019-01-12T19:33:50Z

@alexreg: 🔑 Insufficient privileges: Not in reviewers

alexreg · 2019-01-12T19:34:13Z

@Mark-Simulacrum Did your above r=me have any meaning to Bors or just a reminder?

Also, @nikomatsakis, was I added to the reviewers list yet? I tried to do @bors r=@Mark-Simulacrum p=1...

bors · 2019-01-12T19:34:13Z

@alexreg: 🔑 Insufficient privileges: not in try users

alexreg · 2019-01-12T19:34:34Z

(Ugh, @bors should really ignore commands within backticks.)

Mark-Simulacrum · 2019-01-12T23:05:36Z

Okay one last nit that I noticed, r=me now

I think we haven't re-deployed bors yet so the configuration hasn't been reloaded. For now, @bors delegate+

bors · 2019-01-12T23:05:37Z

✌️ @alexreg can now approve this pull request

alexreg · 2019-01-12T23:48:29Z

@Mark-Simulacrum Ah, that makes sense. Thanks for delegating.

@bors r+ p=1

bors · 2019-01-12T23:48:30Z

📌 Commit e46028aca974c8d7a9ca4e0336268d4023fa212c has been approved by alexreg

alexreg · 2019-01-12T23:49:10Z

Oops, I meant @bors r=@Mark-Simulacrum p=1

bors · 2019-01-12T23:49:11Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Make more passes incremental #51487

bors · 2019-01-12T23:49:12Z

📌 Commit e46028aca974c8d7a9ca4e0336268d4023fa212c has been approved by @Mark-Simulacrum

Centril · 2019-01-13T01:28:44Z

@bors retry

bors · 2019-01-13T01:29:20Z

📌 Commit 60c8837fde3a9c219c4434eec1e45b120382451f has been approved by Mark-Simulacrum

rust-highfive · 2019-01-13T01:51:56Z

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:01a24622:start=1547342162023436215,finish=1547342243260738161,duration=81237301946
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---

[00:03:21] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/convert-quotes.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/nostarch.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/convert_quotes.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/remove_links.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/link2print.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/concat_chapters.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/remove_markup.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/tools/src/bin/lfp.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/second-edition/doc-to-md.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/convert-quotes.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/nostarch.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/ci/build.sh:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/ci/stable-check/src/main.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/ci/spellcheck.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/convert-quotes.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/nostarch.sh:2: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/convert_quotes.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/remove_links.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/link2print.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/concat_chapters.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/remove_markup.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/2018-edition/tools/src/bin/lfp.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/convert_quotes.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/remove_links.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/link2print.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/concat_chapters.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/remove_markup.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/book/tools/src/bin/lfp.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] tidy error: /checkout/src/doc/reference/stable-check/src/main.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:22] tidy error: /checkout/src/test/ui/feature-gates/feature-gate-type_alias_enum_variants.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:22] tidy error: /checkout/src/test/rustdoc/no-crate-filter.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:22] tidy error: /checkout/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:22] tidy error: /checkout/src/test/rustdoc-ui/deny-missing-docs-crate.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:22] tidy error: /checkout/src/test/rustdoc-ui/deny-missing-docs-macro.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:23] 
[00:03:23] 
[00:03:23] 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:23] 
[00:03:23] 
[00:03:23] some tidy checks failed
[00:03:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:23] Build completed unsuccessfully in 0:00:48
[00:03:23] Makefile:69: recipe for target 'tidy' failed
[00:03:23] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0f142463
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Jan 13 01:20:55 UTC 2019
---
travis_time:end:091bf60a:start=1547342456021201712,finish=1547342456026292739,duration=5091027
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01a689b0
$ 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:2ea5549c
travis_time:start:2ea5549c
$ 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:0e0f4ecc
$ 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)

Mark-Simulacrum · 2019-01-13T02:32:54Z

@bors r- (since Travis failed)

alexreg · 2019-01-13T02:40:14Z

@Mark-Simulacrum Fair enough. Do you have merge rights on the Book? It turns out there are some copyright notices in the code there blocking it. rust-lang/book#1765 fixes it, so maybe you could approve that if possible (once CI passes)...

Mark-Simulacrum · 2019-01-13T04:03:29Z

Merged book PR.

alexreg · 2019-01-13T04:22:41Z

@Mark-Simulacrum Okay, everything should be good now. Just r+ when Travis goes green please. :-)

bors · 2019-01-13T14:51:47Z

☔ The latest upstream changes (presumably #57568) made this pull request unmergeable. Please resolve the merge conflicts.

alexreg · 2019-01-13T17:33:21Z

@Mark-Simulacrum @Centril I don't get the above errors when running locally... what's going on?

alexreg · 2019-01-13T22:38:10Z

@Mark-Simulacrum @rust-lang/docs Could one of you kindly fix the links in the book, per above, so we can get this merged? Thanks.

carols10cents · 2019-01-16T01:32:06Z

@alexreg The broken links in the book should be fixed now: rust-lang/book@0e9061c

alexreg · 2019-01-16T02:00:13Z

@carols10cents Thanks a lot. I'll go ahead and update the submodule in this PR then. Appreciate you working with us despite that surprising merge to your repo over the weekend!

alexreg · 2019-01-16T03:59:24Z

@Mark-Simulacrum @Centril Okay, this should be ready to merge now... when CI passes, at least.

Centril · 2019-01-17T02:30:31Z

@bors r=Mark-Simulacrum p=10

bors · 2019-01-17T02:30:32Z

📌 Commit 4d18023 has been approved by Mark-Simulacrum

bors · 2019-01-17T07:36:43Z

⌛ Testing commit 4d18023 with merge 6599946...

@Mark-Simulacrum

Add lint for copyright headers to 'tidy' tool r? @Mark-Simulacrum CC @Centril

bors · 2019-01-17T10:15:52Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing 6599946 to master...

rust-highfive assigned Mark-Simulacrum Jan 11, 2019

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

This comment has been minimized.

Sign in to view

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 Jan 12, 2019

This comment has been minimized.

Sign in to view

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 13, 2019

This comment has been minimized.

Sign in to view

Alexander Regueiro added 3 commits January 13, 2019 19:47

Cosmetic improvements

88336ea

Added check for copyright notices.

49143e0

Removed more copyright notices.

2e30a3c

This comment has been minimized.

Sign in to view

Updated Book and Reference submodules.

4d18023

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 17, 2019

bors added a commit that referenced this pull request Jan 17, 2019

Auto merge of #57520 - alexreg:tidy-copyright-lint, r=Mark-Simulacrum

6599946

Add lint for copyright headers to 'tidy' tool r? @Mark-Simulacrum CC @Centril

bors mentioned this pull request Jan 17, 2019

Prepare beta 1.33.0 #57670

Closed

bors merged commit 4d18023 into rust-lang:master Jan 17, 2019

Add lint for copyright headers to 'tidy' tool #57520

Add lint for copyright headers to 'tidy' tool #57520

Uh oh!

Conversation

alexreg commented Jan 11, 2019

Uh oh!

This comment has been minimized.

alexreg commented Jan 11, 2019

Uh oh!

This comment has been minimized.

Mark-Simulacrum commented Jan 11, 2019

Uh oh!

alexreg commented Jan 11, 2019

Uh oh!

This comment has been minimized.

Mark-Simulacrum commented Jan 12, 2019

Uh oh!

alexreg commented Jan 12, 2019

Uh oh!

This comment has been minimized.

alexreg commented Jan 12, 2019

Uh oh!

Mark-Simulacrum commented Jan 12, 2019

Uh oh!

alexreg commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

alexreg commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

This comment has been minimized.

alexreg commented Jan 12, 2019

Uh oh!

Mark-Simulacrum commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

alexreg commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

alexreg commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

bors commented Jan 12, 2019

Uh oh!

This comment has been minimized.

Centril commented Jan 13, 2019

Uh oh!

bors commented Jan 13, 2019

Uh oh!

rust-highfive commented Jan 13, 2019

Uh oh!

Mark-Simulacrum commented Jan 13, 2019

Uh oh!

alexreg commented Jan 13, 2019

Uh oh!

Mark-Simulacrum commented Jan 13, 2019

Uh oh!

alexreg commented Jan 13, 2019

Uh oh!

This comment has been minimized.

bors commented Jan 13, 2019

Uh oh!

This comment has been minimized.

alexreg commented Jan 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

alexreg commented Jan 13, 2019

Uh oh!

carols10cents commented Jan 16, 2019

Uh oh!

alexreg commented Jan 16, 2019

Uh oh!

alexreg commented Jan 16, 2019

Uh oh!

alexreg commented Jan 13, 2019 •

edited

Loading