Bump version to 1.47 #74395

Mark-Simulacrum · 2020-07-16T13:18:06Z

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 · 2020-07-16T13:23:45Z

@bors r+

bors · 2020-07-16T13:23:47Z

📌 Commit aba1242 has been approved by pietroalbini

@pietroalbini

…roalbini Bump version to 1.47 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

…roalbini Bump version to 1.47 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

Manishearth · 2020-07-16T18:18:46Z

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

Mark-Simulacrum · 2020-07-16T18:42:17Z

/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 · 2020-07-16T18:49:28Z

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 · 2020-07-16T18:53:24Z

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 · 2020-07-16T18:56:21Z

@bors try

bors · 2020-07-16T18:56:32Z

⌛ Trying commit c448d4f0022140039097ef153372b500a29e4222 with merge c9ccb049c6cd5b2b0e8ee96b7396a1a88a688a4c...

jonas-schievink · 2020-07-16T18:59:05Z

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 · 2020-07-16T19:00:56Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2020-07-16T19:02:21Z

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 · 2020-07-16T19:58:34Z

src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  cmake \
  sudo \
  gdb \
+  zlib1g-dev \


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

Mark-Simulacrum · 2020-07-16T20:00:19Z

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 · 2020-07-16T20:00:34Z

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

bors · 2020-07-16T22:21:06Z

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

Mark-Simulacrum · 2020-07-16T23:40:58Z

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 · 2020-07-16T23:40:59Z

📌 Commit 8321b3f has been approved by pietroalbini

bors · 2020-07-16T23:41:00Z

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

Mark-Simulacrum · 2020-07-16T23:41:25Z

@bors rollup=never

Manishearth · 2020-07-17T00:00:02Z

@bors p=1

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

Mark-Simulacrum · 2020-07-17T00:08:14Z

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

Manishearth · 2020-07-17T00:15:22Z

@bors rollup=iffy

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

Manishearth · 2020-07-17T03:51:28Z

@bors p=2 treeclosed-

bors · 2020-07-17T03:51:40Z

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

bors · 2020-07-17T07:15:17Z

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

eddyb · 2020-07-17T08:26:59Z

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.

rust-highfive assigned pietroalbini Jul 16, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 16, 2020

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 Jul 16, 2020

Mark-Simulacrum mentioned this pull request Jul 16, 2020

Enforce even more the code blocks attributes check through rustdoc #71670

Merged

Manishearth mentioned this pull request Jul 16, 2020

Rollup of 18 pull requests #74401

Closed

Manishearth mentioned this pull request Jul 16, 2020

Rollup of 17 pull requests #74407

Closed

Mark-Simulacrum force-pushed the stage0-next branch from 5756885 to aba1242 Compare July 16, 2020 18:42

This comment has been minimized.

Sign in to view

Mark-Simulacrum force-pushed the stage0-next branch from 3752cfd to c448d4f Compare July 16, 2020 18:56

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 16, 2020

Mark-Simulacrum force-pushed the stage0-next branch from c448d4f to 7f7deb1 Compare July 16, 2020 19:57

cuviper reviewed Jul 16, 2020

View reviewed changes

Mark-Simulacrum force-pushed the stage0-next branch from 7f7deb1 to 40cfd1a Compare July 16, 2020 19:59

Mark-Simulacrum added 3 commits July 16, 2020 19:36

Bump to 1.47

6c50ae8

apply bootstrap cfgs

647d9b5

Add zlib1g to builder deps

8321b3f

Mark-Simulacrum force-pushed the stage0-next branch from 40cfd1a to 8321b3f Compare July 16, 2020 23:37

Mark-Simulacrum mentioned this pull request Jul 16, 2020

rustc is now dynamically linked to zlib #74420

Open

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 16, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 17, 2020

bors merged commit 86c0b85 into rust-lang:master Jul 17, 2020

This was referenced Jul 17, 2020

Compare tagged/niche-filling layout and pick the best one #74069

Merged

Generating the coverage map #74091

Merged

tmiasko mentioned this pull request Jul 22, 2020

error: unknown lint: clashing_extern_declarations and others #74628

Closed

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump version to 1.47 #74395

Bump version to 1.47 #74395

Mark-Simulacrum commented Jul 16, 2020

pietroalbini commented Jul 16, 2020

bors commented Jul 16, 2020

Manishearth commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

jonas-schievink commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

cuviper Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Manishearth commented Jul 17, 2020

Mark-Simulacrum commented Jul 17, 2020

Manishearth commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 17, 2020

bors commented Jul 17, 2020

eddyb commented Jul 17, 2020 •

edited

Loading

Bump version to 1.47 #74395

Bump version to 1.47 #74395

Conversation

Mark-Simulacrum commented Jul 16, 2020

pietroalbini commented Jul 16, 2020

bors commented Jul 16, 2020

Manishearth commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

jonas-schievink commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

cuviper Jul 16, 2020

Choose a reason for hiding this comment

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

bors commented Jul 16, 2020

bors commented Jul 16, 2020

Mark-Simulacrum commented Jul 16, 2020

Manishearth commented Jul 17, 2020

Mark-Simulacrum commented Jul 17, 2020

Manishearth commented Jul 17, 2020

Manishearth commented Jul 17, 2020

bors commented Jul 17, 2020

bors commented Jul 17, 2020

eddyb commented Jul 17, 2020 • edited Loading

eddyb commented Jul 17, 2020 •

edited

Loading