Skip to content

Rollup of 6 pull requests #67388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Dec 18, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 13 commits December 11, 2019 17:42
The actual fields in `config.toml.example` have dashes, not underscores.
Toolstate publication only runs if the channel is "nightly" and
previously the toolstate builders did not know that the channel was
nightly (since they are not dist builders).

A look through bootstrap seems to indicate that nothing should directly
depend on the channel being set to `-dev` on the test builders, though
this may cause some problems with UI tests (if for some reason they're
dumping the channel into stderr), but we cannot find evidence of such so
hopefully this is fine.
…, r=alexcrichton"

This reverts commit 3ed3b8b, reversing
changes made to 99b8953.

We will reland a similar patch at a future date but for now we should get a nightly
released in a few hours with the parallel patch, so this should be
reverted to make sure that the next nightly is not parallel-enabled.
…=dtolnay

Implement `DebugStruct::non_exhaustive`.

This patch adds a function (finish_non_exhaustive) to add ellipsis before the closing brace when formatting using `DebugStruct`.

 ## Example

 ```rust
 #![feature(debug_non_exhaustive)]
 use std::fmt;

 struct Bar {
     bar: i32,
     hidden: f32,
 }

 impl fmt::Debug for Bar {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Bar")
            .field("bar", &self.bar)
            .non_exhaustive(true) // Show that some other field(s) exist.
            .finish()
     }
 }

 assert_eq!(
     format!("{:?}", Bar { bar: 10, hidden: 1.0 }),
     "Bar { bar: 10, .. }",
 );
 ```
…=varkor

Use structured suggestion for disambiguating method calls

Fix rust-lang#65635.
Fix the configure.py TOML field for a couple LLVM options

The actual fields in `config.toml.example` have dashes, not underscores.
make htons const fn

This may partially help rust-lang#67315.
…ietroalbini

Set release channel on non-dist builders

Toolstate publication only runs if the channel is "nightly" and
previously the toolstate builders did not know that the channel was
nightly (since they are not dist builders).

A look through bootstrap seems to indicate that nothing should directly
depend on the channel being set to `-dev` on the test builders, though
this may cause some problems with UI tests (if for some reason they're
dumping the channel into stderr), but we cannot find evidence of such so
hopefully this is fine.

r? @pietroalbini
…t, r=Mark-Simulacrum

Revert enabling parallelism by default

We will re-land a similar patch at a future date but for now we should get a nightly
released in a few hours with the parallel patch, so this should be
reverted to make sure that the next nightly is not parallel-enabled.

r? @ghost
@tmandry
Copy link
Member Author

tmandry commented Dec 18, 2019

@bors r+ p=105 rollup=never

@bors
Copy link
Collaborator

bors commented Dec 18, 2019

📌 Commit d03311e has been approved by tmandry

@bors
Copy link
Collaborator

bors commented Dec 18, 2019

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

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 18, 2019
@tmandry tmandry added the rollup A PR which is a rollup label Dec 18, 2019
@bors
Copy link
Collaborator

bors commented Dec 18, 2019

⌛ Testing commit d03311e with merge 45b20183e7e24abafaa539c6afef83acf32d700e...

@rust-highfive
Copy link
Contributor

The job x86_64-gnu-tools of your PR failed (pretty log, 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.
2019-12-18T05:09:18.9433287Z +For more information about this error, try `rustc --explain E0658`.
2019-12-18T05:09:18.9433869Z +
2019-12-18T05:09:18.9434009Z 
2019-12-18T05:09:18.9434179Z The actual stderr differed from the expected stderr.
2019-12-18T05:09:18.9434561Z Actual stderr saved to /tmp/compiletestc3MWtO/async-fn.stderr
2019-12-18T05:09:18.9436632Z To update references, run this command from build directory:
2019-12-18T05:09:18.9437208Z tests/run-pass/update-references.sh '/tmp/compiletestc3MWtO' 'async-fn.rs'
2019-12-18T05:09:18.9437830Z error: 1 errors occurred comparing output.
2019-12-18T05:09:18.9438005Z status: exit code: 1
2019-12-18T05:09:18.9438005Z status: exit code: 1
2019-12-18T05:09:18.9439411Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletestc3MWtO" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestc3MWtO/async-fn.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestc3MWtO/async-fn.stage-id.aux" "-A" "unused"
2019-12-18T05:09:18.9440557Z ------------------------------------------
2019-12-18T05:09:18.9440721Z 
2019-12-18T05:09:18.9441016Z ------------------------------------------
2019-12-18T05:09:18.9441195Z stderr:
---
2019-12-18T05:09:24.5950014Z +For more information about this error, try `rustc --explain E0658`.
2019-12-18T05:09:24.5950097Z +
2019-12-18T05:09:24.5950126Z 
2019-12-18T05:09:24.5950206Z The actual stderr differed from the expected stderr.
2019-12-18T05:09:24.5950278Z Actual stderr saved to /tmp/compiletestc3MWtO/generator.stderr
2019-12-18T05:09:24.5950365Z To update references, run this command from build directory:
2019-12-18T05:09:24.5950793Z tests/run-pass/update-references.sh '/tmp/compiletestc3MWtO' 'generator.rs'
2019-12-18T05:09:24.5950891Z error: 1 errors occurred comparing output.
2019-12-18T05:09:24.5950964Z status: exit code: 1
2019-12-18T05:09:24.5950964Z status: exit code: 1
2019-12-18T05:09:24.5951822Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/generator.rs" "-L" "/tmp/compiletestc3MWtO" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestc3MWtO/generator.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestc3MWtO/generator.stage-id.aux" "-A" "unused"
2019-12-18T05:09:24.5952385Z ------------------------------------------
2019-12-18T05:09:24.5952425Z 
2019-12-18T05:09:24.5952634Z ------------------------------------------
2019-12-18T05:09:24.5952691Z stderr:
---
2019-12-18T05:09:29.7907562Z +For more information about this error, try `rustc --explain E0658`.
2019-12-18T05:09:29.7907678Z +
2019-12-18T05:09:29.7910993Z 
2019-12-18T05:09:29.7911086Z The actual stderr differed from the expected stderr.
2019-12-18T05:09:29.7912105Z Actual stderr saved to /tmp/compiletestc3MWtO/loop-break-value.stderr
2019-12-18T05:09:29.7914693Z To update references, run this command from build directory:
2019-12-18T05:09:29.7915891Z tests/run-pass/update-references.sh '/tmp/compiletestc3MWtO' 'loop-break-value.rs'
2019-12-18T05:09:29.7918629Z error: 1 errors occurred comparing output.
2019-12-18T05:09:29.7918696Z status: exit code: 1
2019-12-18T05:09:29.7918696Z status: exit code: 1
2019-12-18T05:09:29.7920698Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/loop-break-value.rs" "-L" "/tmp/compiletestc3MWtO" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestc3MWtO/loop-break-value.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestc3MWtO/loop-break-value.stage-id.aux" "-A" "unused"
2019-12-18T05:09:29.7921148Z ------------------------------------------
2019-12-18T05:09:29.7924299Z 
2019-12-18T05:09:29.7924723Z ------------------------------------------
2019-12-18T05:09:29.7924952Z stderr:
---
2019-12-18T05:09:31.5240972Z +For more information about this error, try `rustc --explain E0658`.
2019-12-18T05:09:31.5241048Z  
2019-12-18T05:09:31.5279891Z 
2019-12-18T05:09:31.5280039Z The actual stderr differed from the expected stderr.
2019-12-18T05:09:31.5280291Z Actual stderr saved to /tmp/compiletestc3MWtO/panic/catch_panic.stderr
2019-12-18T05:09:31.5280369Z To update references, run this command from build directory:
2019-12-18T05:09:31.5280849Z tests/run-pass/update-references.sh '/tmp/compiletestc3MWtO' 'panic/catch_panic.rs'
2019-12-18T05:09:31.5280986Z error: 1 errors occurred comparing output.
2019-12-18T05:09:31.5281045Z status: exit code: 1
2019-12-18T05:09:31.5281045Z status: exit code: 1
2019-12-18T05:09:31.5281932Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/panic/catch_panic.rs" "-L" "/tmp/compiletestc3MWtO" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestc3MWtO/panic/catch_panic.stage-id" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestc3MWtO/panic/catch_panic.stage-id.aux" "-A" "unused"
2019-12-18T05:09:31.5282673Z ------------------------------------------
2019-12-18T05:09:31.5282732Z 
2019-12-18T05:09:31.5282920Z ------------------------------------------
2019-12-18T05:09:31.5283163Z stderr:
---
2019-12-18T05:09:40.5608381Z Verifying status of miri...
2019-12-18T05:09:40.5608589Z Verifying status of embedded-book...
2019-12-18T05:09:40.5608780Z Verifying status of rustc-guide...
2019-12-18T05:09:40.5701884Z Cloning into 'rust-toolstate'...
2019-12-18T05:09:41.2015539Z thread 'main' panicked at 'linux/windows only', src/libcore/option.rs:1185:5
2019-12-18T05:09:41.2109078Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test check-tools
2019-12-18T05:09:41.2109237Z Build completed unsuccessfully in 0:00:02
2019-12-18T05:09:41.2153675Z == clock drift check ==
2019-12-18T05:09:41.2172265Z   local time: Wed Dec 18 05:09:41 UTC 2019
2019-12-18T05:09:41.2172265Z   local time: Wed Dec 18 05:09:41 UTC 2019
2019-12-18T05:09:41.3608592Z   network time: Wed, 18 Dec 2019 05:09:41 GMT
2019-12-18T05:09:41.3611367Z == end clock drift check ==
2019-12-18T05:09:42.2976886Z 
2019-12-18T05:09:42.3068536Z ##[error]Bash exited with code '1'.
2019-12-18T05:09:42.3114800Z ##[section]Starting: Checkout
2019-12-18T05:09:42.3117160Z ==============================================================================
2019-12-18T05:09:42.3117255Z Task         : Get sources
2019-12-18T05:09:42.3117323Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@bors
Copy link
Collaborator

bors commented Dec 18, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 18, 2019
@tmandry tmandry closed this Dec 20, 2019
@tmandry tmandry deleted the rollup-c04uk5h branch December 20, 2019 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants