Bump version to 1.47

[Mark-Simulacrum]

This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this.

r? @pietroalbini

[pietroalbini]

@bors r+

[bors]

📌 Commit aba1242 has been approved by pietroalbini

[Manishearth]

The build isn't able to find libz, could it be this PR? #74407 (comment)

[Mark-Simulacrum]

/home/mark/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/rustc:
        linux-vdso.so.1 (0x00007ffeec130000)
        librustc_driver-a07dcbb4ed0bdde8.so => /home/mark/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/../lib/librustc_driver-a07dcbb4ed0bdde8.so (0x00007f858d5f7000)
        libstd-c147cd9c030850ef.so => /home/mark/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/../lib/libstd-c147cd9c030850ef.so (0x00007f858d2f6000)
        libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f858d2ca000)
        libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f858d2c4000)
        librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f858d2b9000)
        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f858d0c7000)
        /lib64/ld-linux-x86-64.so.2 (0x00007f8591b6a000)
        libLLVM-10-rust-1.45.0-stable.so => /home/mark/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/../lib/../lib/libLLVM-10-rust-1.45.0-stable.so (0x00007f8588aca000)
        libgcc_s.so.1 => /lib/x86_64-linux-gnu/libgcc_s.so.1 (0x00007f8588aaf000)
        libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007f8588960000)
/home/mark/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/rustc:
        linux-vdso.so.1 (0x00007ffd5ddb6000)
        librustc_driver-e231ac240cfaf689.so => /home/mark/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/../lib/librustc_driver-e231ac240cfaf689.so (0x00007f4a387a4000)
        libstd-d66e0ceb8eaec9b8.so => /home/mark/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/../lib/libstd-d66e0ceb8eaec9b8.so (0x00007f4a384a1000)
        libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f4a38475000)
        libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f4a3846f000)
        librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f4a38464000)
        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f4a38272000)
        /lib64/ld-linux-x86-64.so.2 (0x00007f4a3cdd2000)
        libLLVM-10-rust-1.46.0-beta.so => /home/mark/.rustup/toolchains/beta-x86_64-unknown-linux-gnu/bin/../lib/../lib/libLLVM-10-rust-1.46.0-beta.so (0x00007f4a33c07000)
        libgcc_s.so.1 => /lib/x86_64-linux-gnu/libgcc_s.so.1 (0x00007f4a33bec000)
        libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007f4a33a9d000)
        libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f4a33a81000)

Indeed it looks like we picked up a libz dependency somewhere along the line since last beta. Going to try and bisect it

[Mark-Simulacrum]

searched nightlies: from nightly-2020-06-19 to nightly-2020-07-11
regressed nightly: nightly-2020-06-22
searched commits: from f455e46 to a8cf399
regressed commit: 349f6bf - #72696

That is an unexpected consequence of that PR, I would've expected zlib to be statically linked to LLVM. cc @jethrogb

[Mark-Simulacrum]

cc @cuviper @rust-lang/release -- do we know if it's a problem if rustc starts requiring zlib as a dynamically linked dependency? It looks like that's what is in current nightly/beta. If it's not a problem then we can likely just add it to our i686-gnu builders (and whatever others need it)

[Mark-Simulacrum]

@bors try

[bors]

⌛ Trying commit c448d4f0022140039097ef153372b500a29e4222 with merge c9ccb049c6cd5b2b0e8ee96b7396a1a88a688a4c...

[jonas-schievink]

The new zlib dependency also broke Rust on NixOS, so it looks like it had bigger fallout than anticipated. Might have been a good idea to put it in the release notes.

[bors]

💔 Test failed - checks-actions

[Mark-Simulacrum]

The new zlib dependency also broke Rust on NixOS, so it looks like it had bigger fallout than anticipated. Might have been a good idea to put it in the release notes.

To be clear we still can, this is about 1.46 beta -- 1.45 stable released today does not have this problem.

It's also not the case that we knew that we were adding a new dependency (as mentioned, I expected it to be statically linked or so). I guess we should maybe add some rudimentary checking in CI for that.

[cuviper]

I think you need lib32z1-dev for the i686 bits.

[Mark-Simulacrum]

I'd personally be down for reverting the PR adding zlib and pushing that into beta as well, though I imagine that's a problem for anyone trying to use lld as a linker with C compilers (which apparently need zlib?).

@bors try

[bors]

⌛ Trying commit 40cfd1aaad171389f6327bf93b240d5d91a0f1cf with merge 50ad6344056ba0bbd782b68d1a173adf115161f0...

[bors]

☀️ Try build successful - checks-actions, checks-azure
Build commit: 50ad6344056ba0bbd782b68d1a173adf115161f0 (50ad6344056ba0bbd782b68d1a173adf115161f0)

[Mark-Simulacrum]

I would like to get this landed sooner rather than later, so I've filed #74420 to discuss the zlib change further. @bors r=pietroalbini

[bors]

📌 Commit 8321b3f has been approved by pietroalbini

[bors]

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

[Mark-Simulacrum]

@bors rollup=never

[Manishearth]

@bors p=1

are you okay with rollup=iffying this? That might be better

[Mark-Simulacrum]

It would work, but I'm not confident I caught all of the builders that need the CI changes here. Up to you.

[Manishearth]

@bors rollup=iffy

I'm probably just going to let this go directly through, but we'll see.

[Manishearth]

@bors p=2 treeclosed-

[bors]

⌛ Testing commit 8321b3f with merge 86c0b85...

[bors]

☀️ Test successful - checks-actions, checks-azure
Approved by: pietroalbini
Pushing 86c0b85 to master...

[eddyb]

I wonder if we should have a NixOS builder or something. This PR is missing a change to the Python side of src/bootstrap for the zlib dependency, I'll try to maybe get in a fix for it later today. cc @nagisa @davidtwco (not sure who else will hit this)

EDIT: presumably we should try to statically link zlib on beta, as suggested upthread? Is that tracked in an issue?
EDIT2: ah, I missed #74420 (which is indeed linked above).
EDIT3: opened #74441 for the NixOS fix.