Update clippy and miri submodule #47881

oli-obk · 2018-01-30T15:50:02Z

cc @kennytm I needed to touch the miri submodule's Cargo.toml to make sure that clippy gets the newest compiletest_rs. This will not fix miri, but since I touched the miri submodule, will this PR fail?

miri is unfixable until #46882 is merged

kennytm · 2018-01-30T15:52:46Z

Oops. Yes this will fail 🤔

Perhaps temporarily apply this diff:

diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
index b9268fe62e..85f57f9648 100755
--- a/src/ci/docker/x86_64-gnu-tools/checktools.sh
+++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -32,7 +32,8 @@ cat "$TOOLSTATE_FILE"
 
 # If this PR is intended to update one of these tools, do not let the build pass
 # when they do not test-pass.
-for TOOL in rls rustfmt miri clippy; do
+# FIXME: Skipping miri check until #46882 is merged
+for TOOL in rls rustfmt clippy; do
     echo "Verifying status of $TOOL..."
     if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]src/tools/$TOOL$"; then
         echo "This PR updated 'src/tools/$TOOL', verifying if status is 'test-pass'..."

Manishearth · 2018-01-30T16:08:31Z

r=me when it's fixed

kennytm · 2018-01-30T19:38:57Z

src/bootstrap/tool.rs

@@ -469,7 +469,8 @@ tool_extended!((self, builder),
            target: builder.build.build,
        });
    };
-    Miri, miri, "src/tools/miri", "miri", {};
+    // FIXME(oli-obk) reenable after #46882
+    //Miri, miri, "src/tools/miri", "miri", {};


This line shouldn't need to be commented out.

oli-obk · 2018-01-31T09:39:58Z

travis likes it now

kennytm · 2018-01-31T09:45:55Z

@bors r=Manishearth p=3

bors · 2018-01-31T09:45:56Z

📌 Commit 0d2639c has been approved by Manishearth

bors · 2018-01-31T12:49:47Z

⌛ Testing commit 0d2639c891bd8a72961e90e5cdf8268ee7ebf2a6 with merge e8f71315df58978c985f4ee78158d7f8b3f7c441...

bors · 2018-01-31T14:48:28Z

💔 Test failed - status-appveyor

oli-obk · 2018-01-31T14:53:50Z

Hmmm... clippy's appveyor works, rustcs fails with

error: linking with `link.exe` failed: exit code: 1561
  |
  = note: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "/tmp/clippy_test_build_base\\enum-glob-import-crate.enum_glob_import_crate0.rcgu.o" "/tmp/clippy_test_build_base\\enum-glob-import-crate.enum_glob_import_crate1.rcgu.o" "/tmp/clippy_test_build_base\\enum-glob-import-crate.enum_glob_import_crate2.rcgu.o" "/OUT:/tmp/clippy_test_build_base\\enum-glob-import-crate.stage-id.exe" "/tmp/clippy_test_build_base\\enum-glob-import-crate.crate.allocator.rcgu.o" "/OPT:REF,NOICF" "/DEBUG" "/LIBPATH:/tmp/clippy_test_build_base" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\release" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\release/deps" "/LIBPATH:/tmp/clippy_test_build_base\\enum-glob-import-crate.stage-id.aux" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "/LIBPATH:C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "std-8c525ca5930ac7cd.dll.lib" "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\libcompiler_builtins-3d7fcf367f7cd6b3.rlib" "advapi32.lib" "ws2_32.lib" "userenv.lib" "shell32.lib" "msvcrt.lib"
  = note: LINK : warning LNK4044: unrecognized option '/tmp/clippy_test_build_base\enum-glob-import-crate.enum_glob_import_crate0.rcgu.o'; ignored
          LINK : warning LNK4044: unrecognized option '/tmp/clippy_test_build_base\enum-glob-import-crate.enum_glob_import_crate1.rcgu.o'; ignored
          LINK : warning LNK4044: unrecognized option '/tmp/clippy_test_build_base\enum-glob-import-crate.enum_glob_import_crate2.rcgu.o'; ignored
          LINK : warning LNK4044: unrecognized option '/tmp/clippy_test_build_base\enum-glob-import-crate.crate.allocator.rcgu.o'; ignored
          LINK : warning LNK4001: no object files specified; libraries used
          LINK : warning LNK4068: /MACHINE not specified; defaulting to X64
          LINK : fatal error LNK1561: entry point must be defined

I guess there's no /tmp directory on windows.

oli-obk · 2018-02-01T13:52:10Z

I am dumping the files in env!("OUT_DIR") now, so this should work on any platform

kennytm · 2018-02-01T14:05:18Z

@bors r=Manishearth

bors · 2018-02-01T14:05:18Z

📌 Commit 7d45eef has been approved by Manishearth

bors · 2018-02-01T14:58:21Z

⌛ Testing commit 7d45eef with merge 6297ce6...

@Manishearth

Update clippy and miri submodule r? @Manishearth cc @kennytm I needed to touch the miri submodule's Cargo.toml to make sure that clippy gets the newest compiletest_rs. This will not fix miri, but since I touched the miri submodule, will this PR fail? miri is unfixable until #46882 is merged

bors · 2018-02-01T16:22:12Z

💔 Test failed - status-travis

kennytm · 2018-02-01T18:13:54Z

Legit.

[01:18:51] error[E0063]: missing field `approximate` in initializer of `rustc_errors::CodeSuggestion`
[01:18:51]    --> tools/clippy/clippy_lints/src/utils/mod.rs:636:16
[01:18:51]     |
[01:18:51] 636 |     let sugg = rustc_errors::CodeSuggestion {
[01:18:51]     |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `approximate`
[01:18:51] 
[01:18:51] error[E0063]: missing field `approximate` in initializer of `rustc_errors::CodeSuggestion`
[01:18:51]    --> tools/clippy/clippy_lints/src/utils/mod.rs:636:16
[01:18:51]     |
[01:18:51] 636 |     let sugg = rustc_errors::CodeSuggestion {
[01:18:51]     |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `approximate`
[01:18:51] 
[01:18:55] error: aborting due to previous error
[01:18:55] 
[01:18:55] error: Could not compile `clippy_lints`.

pietroalbini · 2018-02-05T10:22:52Z

@oli-obk ping from triage!

kennytm · 2018-02-05T13:12:20Z

@bors r=Manishearth

bors · 2018-02-05T13:12:21Z

📌 Commit 70717f2 has been approved by Manishearth

bors · 2018-02-05T15:05:49Z

⌛ Testing commit 70717f2 with merge 6c04c41...

@Manishearth

Update clippy and miri submodule r? @Manishearth cc @kennytm I needed to touch the miri submodule's Cargo.toml to make sure that clippy gets the newest compiletest_rs. This will not fix miri, but since I touched the miri submodule, will this PR fail? miri is unfixable until #46882 is merged

bors · 2018-02-05T18:03:35Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Manishearth
Pushing 6c04c41 to master...

Tested on commit rust-lang/rust@6c04c41. 🎉 clippy-driver on windows: build-fail → test-pass. 🎉 clippy-driver on linux: build-fail → test-pass.

oli-obk · 2018-02-05T18:06:53Z

We are green 🎉 https://rust-lang-nursery.github.io/rust-toolstate/

rust-highfive assigned Manishearth Jan 30, 2018

kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 30, 2018

kennytm reviewed Jan 30, 2018

View reviewed changes

kennytm 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 31, 2018

kennytm mentioned this pull request Jan 31, 2018

Replace all const evaluation with miri #46882

Merged

kennytm 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 31, 2018

oli-obk force-pushed the miri_clippy branch from 0d2639c to 7d45eef Compare February 1, 2018 13:42

oli-obk force-pushed the miri_clippy branch from 7d45eef to 8d9d110 Compare February 5, 2018 10:29

Update clippy and miri submodule

70717f2

oli-obk force-pushed the miri_clippy branch from 8d9d110 to 70717f2 Compare February 5, 2018 10:37

kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 5, 2018

kennytm removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 5, 2018

bors merged commit 70717f2 into rust-lang:master Feb 5, 2018

oli-obk deleted the miri_clippy branch February 5, 2018 18:05

Update clippy and miri submodule #47881

Update clippy and miri submodule #47881

Uh oh!

Conversation

oli-obk commented Jan 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kennytm commented Jan 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Manishearth commented Jan 30, 2018

Uh oh!

kennytm Jan 30, 2018

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Jan 31, 2018

Uh oh!

kennytm commented Jan 31, 2018

Uh oh!

bors commented Jan 31, 2018

Uh oh!

bors commented Jan 31, 2018

Uh oh!

bors commented Jan 31, 2018

Uh oh!

oli-obk commented Jan 31, 2018

Uh oh!

oli-obk commented Feb 1, 2018

Uh oh!

kennytm commented Feb 1, 2018

Uh oh!

bors commented Feb 1, 2018

Uh oh!

bors commented Feb 1, 2018

Uh oh!

bors commented Feb 1, 2018

Uh oh!

kennytm commented Feb 1, 2018

Uh oh!

pietroalbini commented Feb 5, 2018

Uh oh!

kennytm commented Feb 5, 2018

Uh oh!

bors commented Feb 5, 2018

Uh oh!

bors commented Feb 5, 2018

Uh oh!

bors commented Feb 5, 2018

Uh oh!

oli-obk commented Feb 5, 2018

Uh oh!

Uh oh!

oli-obk commented Jan 30, 2018 •

edited

Loading

kennytm commented Jan 30, 2018 •

edited

Loading