Add `format_args_capture` feature by davidhewitt · Pull Request #73670 · rust-lang/rust

davidhewitt · 2020-06-23T21:47:55Z

This is the initial implementation PR for RFC 2795.

Note that, as dicussed in the tracking issue (#67984), the feature gate has been called format_args_capture.

Next up I guess I need to add documentation for this feature. I've not written any docs before for rustc / std so I would appreciate suggestions on where I should add docs.

rust-highfive · 2020-06-23T21:47:58Z

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2020-06-23T23:21:09Z

The job mingw-check 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.

##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Hosted Agent'
Agent machine name: 'fv-az578'
Current agent version: '2.170.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200614.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200614.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.171.1)
Checking job knob settings.
Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/d6b8ea67-0985-48f8-89ec-af99304eb8db.sh
##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73670/merge:refs/remotes/pull/73670/merge
---
---> a9ec21d337b3
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
---> Using cache
---> 5ff2c13d8dba
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors && python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && python3 ../x.py build --stage 0 src/tools/build-manifest && python3 ../x.py test --stage 0 src/tools/compiletest && python3 ../x.py test src/tools/tidy && python3 ../x.py doc --stage 0 src/libstd && /scripts/validate-toolstate.sh
---> 6b931e755c7e
Successfully built 6b931e755c7e
Successfully tagged rust-ci:latest
Built container sha256:6b931e755c7ea1f69816640eb9df74fafd40a545d0e5aa8341d35009dabb0f3c
---
Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
Checking rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Checking chalk-engine v0.11.0
Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
configure: rust.verify-llvm-ir := True
configure: dist.missing-tools := True
configure: rust.channel := nightly
configure: rust.debug-assertions := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: configure: run `python /checkout/x.py --help`
configure: ---
Hugepagesize: 2048 kB
DirectMap4k: 151488 kB
DirectMap2M: 5091328 kB
DirectMap1G: 4194304 kB
+ python3 ../x.py test src/tools/expand-yaml-anchors
Ensuring the YAML anchors in the GitHub Actions config were expanded
Ensuring the YAML anchors in the GitHub Actions config were expanded
Building stage0 tool expand-yaml-anchors (x86_64-unknown-linux-gnu)
---
Compiling linked-hash-map v0.5.2
Compiling lazy_static v1.4.0
Compiling yaml-rust v0.4.3
Compiling quote v1.0.2
Compiling thiserror-impl v1.0.5
Compiling thiserror v1.0.5
Compiling yaml-merge-keys v0.4.0
Compiling expand-yaml-anchors v0.1.0 (/checkout/src/tools/expand-yaml-anchors)
Build completed successfully in 0:00:29
+ python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
Finished dev [unoptimized] target(s) in 0.18s
Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> i686-pc-windows-gnu)
---
Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
Checking rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Checking chalk-engine v0.11.0
Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
skip untracked path cpu-usage.csv during rustfmt invocations
skip untracked path src/doc/book/ during rustfmt invocations
skip untracked path src/doc/rust-by-example/ during rustfmt invocations
skip untracked path src/llvm-project/ during rustfmt invocations
Diff in /checkout/src/librustc_builtin_macros/format.rs at line 1003:
invalid_refs: Vec::new(),
arg_spans,
arg_with_formatting: Vec::new(),
- is_literal: parser.is_literal
+ is_literal: parser.is_literal,
// This needs to happen *after* the Parser has consumed all pieces to create all the spans
Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/src/librustc_builtin_macros/format.rs"` failed.
If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
Build completed unsuccessfully in 0:00:38
== clock drift check ==
local time: Tue Jun 23 22:09:02 UTC 2020
network time: Tue, 23 Jun 2020 22:09:03 GMT
network time: Tue, 23 Jun 2020 22:09:03 GMT
== end clock drift check ==
##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
Author : Microsoft
Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73670/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3681) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

davidhewitt · 2020-06-24T07:56:17Z

Looks like was a formatting failure, have force-pushed with tidied formatting.

poliorcetics · 2020-06-25T11:33:51Z

You can use https://rustc-dev-guide.rust-lang.org/implementing_new_features.html and the two pages following it to read more about fully implementing a feature.

EDIT: I see you already did it, sorry for the useless comment !

davidhewitt · 2020-06-27T17:14:33Z

Thanks for the feedback; I've adjusted messaging based on it 👍

davidhewitt · 2020-06-27T20:21:22Z

I've added a commit which (I think) will add a page documenting this feature to the unstable book.

Please let me know any other locations where it would be good to document this feature.

(Maybe in std::fmt documentation? Or should that wait until stabilization PR?)

varkor · 2020-06-29T12:37:54Z

Sorry, will try to get to this soon (it's been a busy week)!

varkor

This looks good to me. I just have one comment.

rust-highfive · 2020-06-30T23:47:45Z

The job x86_64-gnu-llvm-8 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.

##[section]Starting: Linux x86_64-gnu-llvm-8
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 11'
Agent machine name: 'fv-az578'
Current agent version: '2.171.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200621.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200621.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.171.1)
Checking job knob settings.
Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/804619fe-155b-46ac-9b86-ebad323de06b.sh
##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73670/merge:refs/remotes/pull/73670/merge
---
---> 31fea614d2f3
Step 5/8 : ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --llvm-root=/usr/lib/llvm-8 --enable-llvm-link-shared --set rust.thin-lto-import-instr-limit=10
---> Using cache
---> 4195cadf126d
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/test/mir-opt --pass=build --target=armv5te-unknown-linux-gnueabi && python2.7 ../x.py test src/tools/tidy
---> 4e90f6b48f05
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
---> Using cache
---> dfa0a356d899
---
Set({"src/librustc_parse_format"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_passes"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_plugin_impl"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_privacy"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_query_system"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_save_analysis"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_serialize"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_session"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_span"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
---
Set({"src/librustc_parse_format"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_passes"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_plugin_impl"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_privacy"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_query_system"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_save_analysis"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_serialize"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_session"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_span"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
---
Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Compiling tracing v0.1.15
Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Compiling chalk-engine v0.14.0
Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Compiling tracing v0.1.15
Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Compiling chalk-engine v0.14.0
Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
..............................i..................................................................... 1900/10410
.................................................................................................... 2000/10410
...............................................i..i................................................. 2100/10410
.................................................................................................... 2200/10410
.....................................iiiii.......................................................... 2300/10410
.................................................................................................... 2500/10410
.................................................................................................... 2600/10410
.................................................................................................... 2700/10410
.................................................................................................... 2800/10410
---
i................................................................................................... 5300/10410
.................................................................................................... 5400/10410
.................................i.................................................................. 5500/10410
...........................i........................................................................ 5600/10410
...............................................ii.ii........i...i................................... 5700/10410
................i................................................................................... 5900/10410
.............i...................................................................................... 6000/10410
.......................................................................ii........................... 6100/10410
..........i......................................................................................... 6200/10410
..........i......................................................................................... 6200/10410
.................................................................................................... 6300/10410
.................................................................................................... 6400/10410
...................................ii...i..ii...........i........................................... 6500/10410
.................................................................................................... 6700/10410
.................................................................................................... 6800/10410
.................................................................................................... 6800/10410
.......................................................................i..ii........................ 6900/10410
.................................................................................................... 7100/10410
.................................................................................................... 7200/10410
...........................i........................................................................ 7300/10410
.................................................................................................... 7400/10410
---
.................................................................................................... 8300/10410
.................................................................................................... 8400/10410
..............................................................................i..................... 8500/10410
.................................................................................................... 8600/10410
................................iiiiii..iiiiii.i.................................................... 8700/10410
.................................................................................................... 8900/10410
.................................................................................................... 9000/10410
.................................................................................................... 9100/10410
.................................................................................................... 9200/10410
---
22 The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fmt/format-args-capture-macro-hygiene/format-args-capture-macro-hygiene.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args fmt/format-args-capture-macro-hygiene.rs`
error: 1 errors occurred comparing output.
status: exit code: 1
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fmt/format-args-capture-macro-hygiene" "-A" "unused" "-Crpath" "-O" "-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/fmt/format-args-capture-macro-hygiene/auxiliary"
------------------------------------------
------------------------------------------
stderr:
stderr:
------------------------------------------
error: there is no argument named `foo`
--> /checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs:4:13
|
LL | format!(concat!("{foo}")); //~ ERROR: there is no argument named `foo`
|
|
= note: did you intend to capture a variable `foo` from the surrounding scope?
= note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro
error: there is no argument named `bar`
--> /checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs:5:13
|
|
LL | format!(concat!("{ba", "r} {}"), 1); //~ ERROR: there is no argument named `bar`
|
|
= note: did you intend to capture a variable `bar` from the surrounding scope?
= note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro
error: aborting due to 2 previous errors
---
thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:344:22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
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" "/usr/lib/llvm-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy
Build completed unsuccessfully in 1:09:01
Build completed unsuccessfully in 1:09:01
== clock drift check ==
local time: Tue Jun 30 23:47:27 UTC 2020
network time: Tue, 30 Jun 2020 23:47:27 GMT
== end clock drift check ==
##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
Author : Microsoft
Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73670/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3896) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

rust-highfive · 2020-07-01T11:43:25Z

The job x86_64-gnu-llvm-8 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.

##[section]Starting: Linux x86_64-gnu-llvm-8
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 62'
Agent machine name: 'fv-az578'
Current agent version: '2.171.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200625.0
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200625.0/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.171.1)
Checking job knob settings.
Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/717ef694-4ba0-460c-835a-d21c8a1ed247.sh
##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73670/merge:refs/remotes/pull/73670/merge
---
---> 31fea614d2f3
Step 5/8 : ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --llvm-root=/usr/lib/llvm-8 --enable-llvm-link-shared --set rust.thin-lto-import-instr-limit=10
---> Using cache
---> 4195cadf126d
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy && python2.7 ../x.py test src/test/mir-opt --pass=build --target=armv5te-unknown-linux-gnueabi && python2.7 ../x.py test src/tools/tidy
---> 4e90f6b48f05
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
---> Using cache
---> dfa0a356d899
---
Set({"src/librustc_parse_format"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_passes"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_plugin_impl"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_privacy"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_query_system"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_save_analysis"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_serialize"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_session"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_span"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
---
Set({"src/librustc_parse_format"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_passes"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_plugin_impl"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_privacy"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_query_system"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_save_analysis"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_serialize"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_session"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"src/librustc_span"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
---
Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Compiling tracing v0.1.15
Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Compiling chalk-engine v0.14.0
Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
Compiling tracing v0.1.15
Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
Compiling chalk-engine v0.14.0
Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
..............................i..................................................................... 1900/10412
.................................................................................................... 2000/10412
...............................................i..i................................................. 2100/10412
.................................................................................................... 2200/10412
.....................................iiiii.......................................................... 2300/10412
.................................................................................................... 2500/10412
.................................................................................................... 2600/10412
.................................................................................................... 2700/10412
.................................................................................................... 2800/10412
---
i................................................................................................... 5300/10412
.................................................................................................... 5400/10412
.................................i.................................................................. 5500/10412
...........................i........................................................................ 5600/10412
...............................................ii.ii........i...i................................... 5700/10412
................i................................................................................... 5900/10412
.............i...................................................................................... 6000/10412
.......................................................................ii........................... 6100/10412
..........i......................................................................................... 6200/10412
..........i......................................................................................... 6200/10412
.................................................................................................... 6300/10412
.................................................................................................... 6400/10412
...................................ii....i.ii...........i........................................... 6500/10412
.................................................................................................... 6700/10412
.................................................................................................... 6800/10412
.................................................................................................... 6800/10412
.......................................................................i..ii........................ 6900/10412
.................................................................................................... 7100/10412
.................................................................................................... 7200/10412
...........................i........................................................................ 7300/10412
.................................................................................................... 7400/10412
---
.................................................................................................... 8300/10412
.................................................................................................... 8400/10412
................................................................................i................... 8500/10412
.................................................................................................... 8600/10412
..................................iiiiii..iiiiii..i................................................. 8700/10412
.................................................................................................... 8900/10412
.................................................................................................... 9000/10412
.................................................................................................... 9100/10412
.................................................................................................... 9200/10412
---
diff of stderr:
5 | ^^^^^^^^^^^^^^^^
6 |
7 = note: did you intend to capture a variable `foo` from the surrounding scope?
- = note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro
+ = note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro
10 11 error: there is no argument named `bar`
15 | ^^^^^^^^^^^^^^^^^^^^^^^
15 | ^^^^^^^^^^^^^^^^^^^^^^^
16 |
17 = note: did you intend to capture a variable `bar` from the surrounding scope?
- = note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro
+ = note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro
20 21 error: aborting due to 2 previous errors
The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fmt/format-args-capture-macro-hygiene/format-args-capture-macro-hygiene.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args fmt/format-args-capture-macro-hygiene.rs`
error: 1 errors occurred comparing output.
status: exit code: 1
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/fmt/format-args-capture-macro-hygiene" "-A" "unused" "-Crpath" "-O" "-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/fmt/format-args-capture-macro-hygiene/auxiliary"
------------------------------------------
------------------------------------------
stderr:
stderr:
------------------------------------------
error: there is no argument named `foo`
--> /checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs:4:13
|
LL | format!(concat!("{foo}")); //~ ERROR: there is no argument named `foo`
|
|
= note: did you intend to capture a variable `foo` from the surrounding scope?
= note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro
error: there is no argument named `bar`
--> /checkout/src/test/ui/fmt/format-args-capture-macro-hygiene.rs:5:13
|
|
LL | format!(concat!("{ba", "r} {}"), 1); //~ ERROR: there is no argument named `bar`
|
|
= note: did you intend to capture a variable `bar` from the surrounding scope?
= note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro
error: aborting due to 2 previous errors
---
thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:344:22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
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" "/usr/lib/llvm-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy
Build completed unsuccessfully in 1:03:00
Build completed unsuccessfully in 1:03:00
== clock drift check ==
local time: Wed Jul 1 11:43:19 UTC 2020
network time: Wed, 01 Jul 2020 11:43:19 GMT
== end clock drift check ==
##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73670/merge to s
Task : Get sources
Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version : 1.0.0
Author : Microsoft
Author : Microsoft
Help : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73670/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3673) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

davidhewitt · 2020-07-01T13:33:41Z

I'll fix this evening the test failure caused by our change to the diagnostic wording

Apply suggestion from varkor Co-authored-by: varkor <github@varkor.com>

varkor · 2020-07-01T18:37:52Z

This looks good to me; thanks for the pull request!

@bors r+

bors · 2020-07-01T18:37:53Z

📌 Commit 10ebb2c has been approved by varkor

…varkor Add `format_args_capture` feature This is the initial implementation PR for [RFC 2795](rust-lang/rfcs#2795). Note that, as dicussed in the tracking issue (rust-lang#67984), the feature gate has been called `format_args_capture`. Next up I guess I need to add documentation for this feature. I've not written any docs before for rustc / std so I would appreciate suggestions on where I should add docs.

Manishearth · 2020-07-02T01:42:05Z

@bors r-

#73944 (comment)

davidhewitt · 2020-07-02T07:14:35Z

Looks like the tests for panic! formatting failed on wasm because there is no unwind there (it just triggers unreachable).

Is it fine to just add #[cfg(not(target_arch = "wasm32"))] to those tests?

varkor · 2020-07-02T10:49:19Z

You can add a comment to the relevant tests like this:

rust/src/test/codegen/global_asm_include.rs

Lines 37 to 39 in f8b796b

// ignore-wasm32
// ignore-wasm64
// ignore-emscripten

davidhewitt · 2020-07-03T17:21:48Z

Thanks, I've pushed a tweak which adds ignore-wasm32 and ignore-wasm64, I think that should be enough.

Really a more elegant solution would be to add a #[cfg(panic = "unwind")] flag to skip just the offending tests on targets where panic is an abort.

I couldn't find such a cfg flag - do you think it would be worth me opening a PR to implement it?

varkor · 2020-07-03T19:27:41Z

Thanks. @bors r+

I couldn't find such a cfg flag - do you think it would be worth me opening a PR to implement it?

I'm not sure what use cases this would have other than for tests. Maybe you could open up an issue if you can think of others, though?

bors · 2020-07-03T19:27:42Z

📌 Commit 93d662f has been approved by varkor

bors · 2020-07-03T19:27:54Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Add Docker image to run AArch64 Linux tests #73650

bors · 2020-07-03T19:27:55Z

📌 Commit 93d662f has been approved by varkor

davidhewitt · 2020-07-03T19:53:16Z

I'm not sure what use cases this would have other than for tests. Maybe you could open up an issue if you can think of others, though?

So far I've only seen it useful for tests as you say. I've seen this same issue of tests aborting on panic crop up in pyO3.

I'll leave it for now.

@ghost

…arth Rollup of 12 pull requests Successful merges: - rust-lang#73140 (Fallback to xml.etree.ElementTree) - rust-lang#73670 (Add `format_args_capture` feature) - rust-lang#73693 (Use exhaustive match in const_prop.rs) - rust-lang#73845 (Use &raw in A|Rc::as_ptr) - rust-lang#73861 (Create E0768) - rust-lang#73881 (Standardize bibliographic citations in rustc API docs) - rust-lang#73925 (Improve comments from rust-lang#72617, as suggested by RalfJung) - rust-lang#73949 ([mir-opt] Fix mis-optimization and other issues with the SimplifyArmIdentity pass) - rust-lang#73984 (Edit docs for rustc_data_structures::graph::scc) - rust-lang#73985 (Fix "getting started" link) - rust-lang#73997 (fix typo) - rust-lang#73999 (Bump mingw-check CI image from Ubuntu 16.04 to 18.04.) Failed merges: - rust-lang#74000 (add `lazy_normalization_consts` feature gate) r? @ghost

…orse Add `#[cfg(panic = '...')]` This PR adds conditional compilation according to the panic strategy. I've come across a need for a flag like this a couple of times while writing tests: rust-lang#74301 , rust-lang#73670 (comment) I'm not sure if I need to add a feature gate for this flag?

rust-highfive assigned varkor Jun 23, 2020

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

Add format_args_capture feature
6b95f31

davidhewitt force-pushed the format-args-capture branch from eb14865 to 6b95f31Compare June 24, 2020 07:30

izik1 reviewed Jun 25, 2020
View reviewed changes

Comment threadsrc/librustc_builtin_macros/format.rs Outdated

estebank reviewed Jun 26, 2020
View reviewed changes

Comment threadsrc/librustc_builtin_macros/format.rs

estebank reviewed Jun 26, 2020
View reviewed changes

Comment threadsrc/librustc_builtin_macros/format.rs Outdated

Improve messaging from PR feedback
8caf604

Add format_args_capture to the unstable book
a1217cb

davidhewitt force-pushed the format-args-capture branch from d042761 to a1217cbCompare June 27, 2020 21:02

varkor reviewed Jun 30, 2020
View reviewed changes

Comment threadsrc/librustc_builtin_macros/format.rs Outdated

Amend wording of note
1a03432

davidhewitt force-pushed the format-args-capture branch from a2dc293 to 1a03432Compare July 1, 2020 06:40

varkor reviewed Jul 1, 2020
View reviewed changes

Comment threadsrc/librustc_builtin_macros/format.rs Outdated

Update src/librustc_builtin_macros/format.rs
10ebb2c
Apply suggestion from varkor Co-authored-by: varkor <github@varkor.com>

davidhewitt force-pushed the format-args-capture branch from 860db00 to 10ebb2cCompare July 1, 2020 17:00

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 1, 2020

Manishearth mentioned this pull request Jul 2, 2020
Rollup of 16 pull requests #73944
Closed

bors 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 Jul 2, 2020

Ignore test with panic on wasm targets
93d662f

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 3, 2020

Manishearth mentioned this pull request Jul 4, 2020
Rollup of 12 pull requests #74019
Merged

bors merged commit 4a8d9ea into rust-lang:masterJul 4, 2020

davidhewitt mentioned this pull request Jul 25, 2020
Add #[cfg(panic = '...')]#74754
Merged

cuviper added this to the 1.46 milestone May 2, 2024

Uh oh!

Uh oh!

Conversation

davidhewitt commented Jun 23, 2020

Uh oh!

rust-highfive commented Jun 23, 2020

Uh oh!

rust-highfive commented Jun 23, 2020

Uh oh!

davidhewitt commented Jun 24, 2020

Uh oh!

poliorcetics commented Jun 25, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidhewitt commented Jun 27, 2020

Uh oh!

davidhewitt commented Jun 27, 2020

Uh oh!

varkor commented Jun 29, 2020

Uh oh!

varkor left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rust-highfive commented Jun 30, 2020

Uh oh!

Uh oh!

rust-highfive commented Jul 1, 2020

Uh oh!

davidhewitt commented Jul 1, 2020

Uh oh!

varkor commented Jul 1, 2020

Uh oh!

bors commented Jul 1, 2020

Uh oh!

Manishearth commented Jul 2, 2020

Uh oh!

davidhewitt commented Jul 2, 2020

Uh oh!

varkor commented Jul 2, 2020

Uh oh!

davidhewitt commented Jul 3, 2020

Uh oh!

varkor commented Jul 3, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 3, 2020

Uh oh!

bors commented Jul 3, 2020

Uh oh!

bors commented Jul 3, 2020

Uh oh!

davidhewitt commented Jul 3, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

poliorcetics commented Jun 25, 2020•
edited
Loading

varkor commented Jul 3, 2020•
edited
Loading

davidhewitt commented Jul 3, 2020•
edited
Loading