Rollup of 6 pull requests#64368

Centril · 2019-09-10T22:27:21Z

Successful merges:

Improve hygiene of alloc::format! #64060 (Improve hygiene of alloc::format!)
Replace file_stem by file_name in rustdoc markdown #64072 (Replace file_stem by file_name in rustdoc markdown)
Tweak unsatisfied HRTB errors #64085 (Tweak unsatisfied HRTB errors)
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn)
rustc: Allow the cdylib crate type with wasm32-wasi #64188 (rustc: Allow the cdylib crate type with wasm32-wasi)
documentation for AtomicPtr CAS operations #64349 (documentation for AtomicPtr CAS operations)

Failed merges:

sync with rust-lang/rust

… initial stack size to rtpSpawn

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

The wasm32-wasi target respects configuration around `crt-static` in general, but is defaulted to being static. This interacted badly with code which validated the `cdylib` crate type for `wasm32-wasi`, erroneously saying that the `cdylib` crate type wasn't supported on `wasm32-wasi` by default. This commit sets the appropriate flag in `wasm32_wasi`'s target specification to indicate that the `cdylib` crate type is supported regardless of `crt-static` Closes rust-lang#64187

remove Copyright notic

Improve hygiene of `alloc::format!` `format` now uses `format_args` though a `__export` module, as described in rust-lang#63687 (comment). Fixes rust-lang#63687

Replace file_stem by file_name in rustdoc markdown Before this PR, a file name like `some.file.md` will be output to a file named `some.html` with is not correct because the expected output file must be `some.file.html`

@oli-obk

Tweak unsatisfied HRTB errors r? @oli-obk Close rust-lang#35180.

@alexcrichton

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn r? @alexcrichton cc @n-salim

rustc: Allow the cdylib crate type with wasm32-wasi The wasm32-wasi target respects configuration around `crt-static` in general, but is defaulted to being static. This interacted badly with code which validated the `cdylib` crate type for `wasm32-wasi`, erroneously saying that the `cdylib` crate type wasn't supported on `wasm32-wasi` by default. This commit sets the appropriate flag in `wasm32_wasi`'s target specification to indicate that the `cdylib` crate type is supported regardless of `crt-static` Closes rust-lang#64187

…r, r=cramertj documentation for AtomicPtr CAS operations The examples in the documentation for AtomicPtr CAS operations only show code that does *not* perform the CAS operation. I suggest to change them so that they actually do exchange the AtomicPtr's value.

Centril · 2019-09-10T22:27:36Z

@bors r+ p=6 rollup=never

bors · 2019-09-10T22:27:37Z

📌 Commit 115dede has been approved by Centril

bors · 2019-09-10T22:28:06Z

⌛ Testing commit 115dede with merge 98d6df5...

@ghost

Rollup of 6 pull requests Successful merges: - #64060 (Improve hygiene of `alloc::format!`) - #64072 (Replace file_stem by file_name in rustdoc markdown) - #64085 (Tweak unsatisfied HRTB errors) - #64129 (vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn) - #64188 (rustc: Allow the cdylib crate type with wasm32-wasi) - #64349 (documentation for AtomicPtr CAS operations) Failed merges: r? @ghost

rust-highfive · 2019-09-11T00:34:52Z

The job x86_64-gnu-nopt of your PR failed (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-09-11T00:10:24.9647161Z test [ui] ui/hr-subtype/hr-subtype.rs#bound_inv_a_vs_bound_inv_b ... ok
2019-09-11T00:10:24.9647442Z test [ui] ui/hr-subtype/hr-subtype.rs#bound_inv_a_b_vs_bound_inv_a ... ok
2019-09-11T00:10:24.9647813Z test [ui] ui/hr-subtype/hr-subtype.rs#free_inv_x_vs_free_inv_y ... ok
2019-09-11T00:10:24.9648073Z test [ui] ui/hr-subtype/hr-subtype.rs#free_x_vs_free_x ... ok
2019-09-11T00:10:24.9648335Z test [ui] ui/hrtb/due-to-where-clause.rs ... ok
2019-09-11T00:10:24.9887298Z test [ui] ui/hrtb/hrtb-cache-issue-54302.rs ... ok
2019-09-11T00:10:25.0250456Z test [ui] ui/hrtb/hrtb-conflate-regions.rs ... ok
2019-09-11T00:10:25.0807191Z test [ui] ui/hrtb/hrtb-debruijn-in-receiver.rs ... ok
2019-09-11T00:10:25.1355520Z test [ui] ui/hrtb/hrtb-exists-forall-trait-contravariant.rs ... ok
---
2019-09-11T00:23:35.1809742Z test [ui (nll)] ui/hr-subtype/hr-subtype.rs#free_inv_x_vs_free_inv_y ... ok
2019-09-11T00:23:35.1809999Z test [ui (nll)] ui/hr-subtype/hr-subtype.rs#free_x_vs_free_x ... ok
2019-09-11T00:23:35.1810278Z test [ui (nll)] ui/hr-subtype/hr-subtype.rs#free_x_vs_free_y ... ok
2019-09-11T00:23:35.1810528Z test [ui (nll)] ui/hrtb/hrtb-cache-issue-54302.rs ... ok
2019-09-11T00:23:35.1865611Z test [ui (nll)] ui/hrtb/due-to-where-clause.rs ... FAILED
2019-09-11T00:23:35.2654998Z test [ui (nll)] ui/hrtb/hrtb-debruijn-in-receiver.rs ... ok
2019-09-11T00:23:35.3189054Z test [ui (nll)] ui/hrtb/hrtb-exists-forall-trait-contravariant.rs ... ok
2019-09-11T00:23:35.3714622Z test [ui (nll)] ui/hrtb/hrtb-exists-forall-trait-covariant.rs ... ok
2019-09-11T00:23:35.3949453Z test [ui (nll)] ui/hrtb/hrtb-exists-forall-fn.rs ... ok
---
2019-09-11T00:32:05.4395557Z test [ui (nll)] ui/wrapping-int-combinations.rs ... ok
2019-09-11T00:32:05.4400815Z 
2019-09-11T00:32:05.4401589Z failures:
2019-09-11T00:32:05.4431103Z 
2019-09-11T00:32:05.4431874Z ---- [ui (nll)] ui/hrtb/due-to-where-clause.rs stdout ----
2019-09-11T00:32:05.4432376Z error: ui test compiled successfully!
2019-09-11T00:32:05.4432585Z status: exit code: 0
2019-09-11T00:32:05.4432585Z status: exit code: 0
2019-09-11T00:32:05.4433554Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/hrtb/due-to-where-clause.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hrtb/due-to-where-clause.nll" "-Zborrowck=mir" "-Crpath" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hrtb/due-to-where-clause.nll/auxiliary" "-A" "unused"
2019-09-11T00:32:05.4435471Z ------------------------------------------
2019-09-11T00:32:05.4435661Z 
2019-09-11T00:32:05.4436064Z ------------------------------------------
2019-09-11T00:32:05.4436262Z stderr:
2019-09-11T00:32:05.4436262Z stderr:
2019-09-11T00:32:05.4436662Z ------------------------------------------
2019-09-11T00:32:05.4436828Z 
2019-09-11T00:32:05.4437211Z ------------------------------------------
2019-09-11T00:32:05.4437379Z 
2019-09-11T00:32:05.4437510Z 
2019-09-11T00:32:05.4437668Z 
2019-09-11T00:32:05.4437978Z failures:
2019-09-11T00:32:05.4438293Z     [ui (nll)] ui/hrtb/due-to-where-clause.rs
2019-09-11T00:32:05.4438789Z test result: FAILED. 8938 passed; 1 failed; 70 ignored; 0 measured; 0 filtered out
2019-09-11T00:32:05.4439145Z 
2019-09-11T00:32:05.4466357Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-09-11T00:32:05.4466748Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-11T00:32:05.4466748Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-11T00:32:05.4481607Z 
2019-09-11T00:32:05.4481859Z 
2019-09-11T00:32:05.4483900Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.39.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" "--compare-mode" "nll"
2019-09-11T00:32:05.4485354Z 
2019-09-11T00:32:05.4485503Z 
2019-09-11T00:32:05.4493108Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-11T00:32:05.4493954Z Build completed unsuccessfully in 1:55:43
2019-09-11T00:32:05.4493954Z Build completed unsuccessfully in 1:55:43
2019-09-11T00:32:05.4555876Z == clock drift check ==
2019-09-11T00:32:05.4571017Z   local time: Wed Sep 11 00:32:05 UTC 2019
2019-09-11T00:32:05.6182877Z   network time: Wed, 11 Sep 2019 00:32:05 GMT
2019-09-11T00:32:05.6188041Z == end clock drift check ==
2019-09-11T00:32:06.5271040Z ##[error]Bash exited with code '1'.
2019-09-11T00:32:06.5307643Z ##[section]Starting: Upload CPU usage statistics
2019-09-11T00:32:06.5317037Z ==============================================================================
2019-09-11T00:32:06.5317158Z Task         : Bash
2019-09-11T00:32:06.5317246Z Description  : Run a Bash script on macOS, Linux, or Windows

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 · 2019-09-11T00:35:07Z

💔 Test failed - checks-azure

limira and others added 16 commits September 2, 2019 00:14

Replace file_stem by file_name in rustdoc markdown

7fdcbce

Merge pull request rust-lang#13 from rust-lang/master

d5ef9df

sync with rust-lang/rust

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass…

db576f8

… initial stack size to rtpSpawn

Tweak unsatisfied HRTB errors

32440cb

Merge pull request rust-lang#14 from Wind-River/min_stack_size

c6e899a

vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn

Improve hygiene of alloc::format!

d42e603

documentation for AtomicPtr CAS operations

7ad44c7

remove Copyright notic

5318f98

Merge pull request rust-lang#19 from Wind-River/min_stack_size

665291c

remove Copyright notic

Rollup merge of rust-lang#64060 - petrochenkov:unstdhyg, r=tmandry

659ef20

Improve hygiene of `alloc::format!` `format` now uses `format_args` though a `__export` module, as described in rust-lang#63687 (comment). Fixes rust-lang#63687

Rollup merge of rust-lang#64072 - limira:patch-1, r=ollie27

5553171

Replace file_stem by file_name in rustdoc markdown Before this PR, a file name like `some.file.md` will be output to a file named `some.html` with is not correct because the expected output file must be `some.file.html`

Rollup merge of rust-lang#64085 - estebank:hrtb-errors, r=oli-obk

8433952

Tweak unsatisfied HRTB errors r? @oli-obk Close rust-lang#35180.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 10, 2019

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 Sep 11, 2019

Centril mentioned this pull request Sep 11, 2019

Tweak unsatisfied HRTB errors #64085

Merged

Centril closed this Sep 11, 2019

Centril deleted the rollup-4s8ko6f branch September 11, 2019 00:37

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#64368