Skip to content
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

Use CoverageKind::as_operand_id instead of manually reimplementing it #113079

Merged
merged 1 commit into from
Jun 27, 2023

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Jun 27, 2023

These two pieces of code are functionally equivalent to the CoverageKind::as_operand_id method that already exists, and is already used elsewhere in this file.

This slightly reduces the amount of code that manually pattern-matches on CoverageKind.

@rustbot
Copy link
Collaborator

rustbot commented Jun 27, 2023

r? @wesleywiser

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 27, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 27, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@Zalathar
Copy link
Contributor Author

The implementation of as_operand_id, for reference:

impl CoverageKind {
pub fn as_operand_id(&self) -> ExpressionOperandId {
use CoverageKind::*;
match *self {
Counter { id, .. } => ExpressionOperandId::from(id),
Expression { id, .. } => ExpressionOperandId::from(id),
Unreachable => bug!("Unreachable coverage cannot be part of an expression"),
}
}

@Zalathar
Copy link
Contributor Author

@rustbot label +A-code-coverage

@rustbot rustbot added the A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) label Jun 27, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jun 27, 2023

r? @oli-obk

@bors r+ rollup

Thanks! good find

@bors
Copy link
Contributor

bors commented Jun 27, 2023

📌 Commit fbb2079 has been approved by oli-obk

It is now in the queue for this repository.

@rustbot rustbot assigned oli-obk and unassigned wesleywiser Jun 27, 2023
@bors 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 Jun 27, 2023
@bors
Copy link
Contributor

bors commented Jun 27, 2023

⌛ Testing commit fbb2079 with merge a97012596425a6ee45213ba88b194149ff2f002a...

@rust-log-analyzer
Copy link
Collaborator

The job dist-mips64el-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling git2-curl v0.18.0
[RUSTC-TIMING] git2_curl test:false 1.102
[RUSTC-TIMING] gix test:false 15.967
[RUSTC-TIMING] git2 test:false 11.220
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xd35903)[0x7f29dbd1e903]
/lib/x86_64-linux-gnu/libc.so.6(+0x42520)[0x7f29dac74520]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d22f42)[0x7f29dcd0bf42]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d40d25)[0x7f29dcd29d25]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d563f9)[0x7f29dcd3f3f9]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1c6437a)[0x7f29dcc4d37a]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1c70555)[0x7f29dcc59555]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1c719ef)[0x7f29dcc5a9ef]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d68b22)[0x7f29dcd51b22]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d6ba6a)[0x7f29dcd54a6a]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1d6dea6)[0x7f29dcd56ea6]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x388ff3f)[0x7f29de878f3f]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x1fb0744)[0x7f29dcf99744]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x2f93f10)[0x7f29ddf7cf10]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x2f94084)[0x7f29ddf7d084]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0x2f94a84)[0x7f29ddf7da84]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xfe8a38)[0x7f29dbfd1a38]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xf94041)[0x7f29dbf7d041]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xf97f37)[0x7f29dbf80f37]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xec82d6)[0x7f29dbeb12d6]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xf8aade)[0x7f29dbf73ade]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/librustc_driver-0b6e3bc4164c08e0.so(+0xf51732)[0x7f29dbf3a732]
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/libstd-025e001bd1fa95df.so(rust_metadata_std_ae54db559e22a89e+0xb3225)[0x7f29daf10225]
/lib/x86_64-linux-gnu/libc.so.6(+0x94b43)[0x7f29dacc6b43]
/lib/x86_64-linux-gnu/libc.so.6(+0x126a00)[0x7f29dad58a00]
[RUSTC-TIMING] cargo test:false 52.152
rustc exited with signal: 11 (SIGSEGV) (core dumped)

Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name cargo --edition=2021 src/cargo/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no -C debuginfo=0 --cfg 'feature="all-static"' --cfg 'feature="openssl"' --cfg 'feature="vendored-openssl"' -Zunstable-options --check-cfg 'values(feature, "all-static", "openssl", "pretty-env-logger", "pretty_env_logger", "vendored-libgit2", "vendored-openssl")' --check-cfg 'names()' --check-cfg 'values()' -C metadata=01ac5483921a6941 -C extra-filename=-01ac5483921a6941 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps --target mips64el-unknown-linux-gnuabi64 -C linker=mips64el-unknown-linux-gnu-gcc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/release/deps --extern anyhow=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libanyhow-4451dc31f6485844.rmeta --extern base64=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libbase64-791dbed03c47b9f2.rmeta --extern bytesize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libbytesize-e571371348097aa3.rmeta --extern cargo_platform=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libcargo_platform-44c95bf774d3996f.rmeta --extern cargo_util=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libcargo_util-c267b5b1d32487ae.rmeta --extern clap=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libclap-f415a32c622a21d1.rmeta --extern crates_io=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libcrates_io-4f42c5e786edef3d.rmeta --extern curl=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libcurl-718f4dbbaf90dee9.rmeta --extern curl_sys=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libcurl_sys-40b1e8a900eabe43.rmeta --extern env_logger=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libenv_logger-b9701cd269b945e5.rmeta --extern filetime=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libfiletime-eb91a35d19847e9f.rmeta --extern flate2=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libflate2-0bdf3497be81c89a.rmeta --extern git2=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libgit2-a61dcfbd4f1f80a1.rmeta --extern git2_curl=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libgit2_curl-bd2a2e551f3d7c4b.rmeta --extern gix=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libgix-3386421a39d2769d.rmeta --extern gix_features_for_configuration_only=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libgix_features-b89c061755ccd5f6.rmeta --extern glob=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libglob-40cb8722a6633475.rmeta --extern hex=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libhex-4113776afd8e4612.rmeta --extern hmac=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libhmac-7c29617bf8d03644.rmeta --extern home=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libhome-697d0e9eff05bc22.rmeta --extern http_auth=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libhttp_auth-54598e3bd1434291.rmeta --extern humantime=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libhumantime-bb147116dc3ebe9d.rmeta --extern ignore=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libignore-7854016d0d25bb0e.rmeta --extern im_rc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libim_rc-5cf7359bb7e3ef3c.rmeta --extern indexmap=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libindexmap-3a744ae04e69cb31.rmeta --extern itertools=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libitertools-9950d45436598bcf.rmeta --extern jobserver=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libjobserver-939222c86cd9c089.rmeta --extern lazycell=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/liblazycell-edac7f5382996efd.rmeta --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/liblibc-2b4c21237b5bde07.rmeta --extern libgit2_sys=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/liblibgit2_sys-ab4bec45ec2d4a95.rmeta --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/liblog-20b018d08e660786.rmeta --extern memchr=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libmemchr-7eea21b4fbc296c3.rmeta --extern opener=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libopener-ad7f6f05db960a19.rmeta --extern openssl=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libopenssl-1cae62c6cf66c795.rmeta --extern os_info=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libos_info-fd856cb12cb29909.rmeta --extern pasetors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libpasetors-263ceb2d83930aab.rmeta --extern pathdiff=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libpathdiff-bc34f579d5a841e0.rmeta --extern pulldown_cmark=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libpulldown_cmark-f7f07837f3e05664.rmeta --extern rand=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/librand-e8713aa6660336dd.rmeta --extern rustfix=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/librustfix-5cd31c40530f44e9.rmeta --extern semver=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libsemver-0dca9be88e95a132.rmeta --extern serde=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libserde-03fe1222b39543ea.rmeta --extern serde_value=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libserde_value-d2abc82a81aee45d.rmeta --extern serde_ignored=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libserde_ignored-021c7b467dc83ecd.rmeta --extern serde_json=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libserde_json-18f2e3b3ffee6fd2.rmeta --extern sha1=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libsha1-cbf2e1e3d1c7d482.rmeta --extern shell_escape=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libshell_escape-a482273518c2bebe.rmeta --extern strip_ansi_escapes=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libstrip_ansi_escapes-49d97d3baee67c42.rmeta --extern syn=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libsyn-358a90ac83701973.rmeta --extern tar=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtar-693b2a9547aec12a.rmeta --extern tempfile=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtempfile-fa2122831f09e2f3.rmeta --extern termcolor=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtermcolor-d16094320598e655.rmeta --extern time=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtime-0ab047133fbb6425.rmeta --extern toml=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtoml-c034d9e0b75f1c64.rmeta --extern toml_edit=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libtoml_edit-1d917689fbb983b2.rmeta --extern unicode_width=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libunicode_width-c2bc4c0b829a98bc.rmeta --extern unicode_xid=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libunicode_xid-0d7fe18a4aff782d.rmeta --extern url=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/liburl-c2c29746a3191f43.rmeta --extern walkdir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/deps/libwalkdir-897f2fa653b9da5f.rmeta --cfg=windows_raw_dylib -Csymbol-mangling-version=v0 -Zunstable-options '--check-cfg=values(bootstrap)' '--check-cfg=values(parallel_compiler)' '--check-cfg=values(no_btreemap_remove_entry)' '--check-cfg=values(crossbeam_loom)' '--check-cfg=values(span_locations)' '--check-cfg=values(rustix_use_libc)' '--check-cfg=values(emulate_second_only_system)' '--check-cfg=values(windows_raw_dylib)' -Zdual-proc-macros -Zmacro-backtrace -Clink-args=-Wl,-z,origin '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Csplit-debuginfo=off -Z binary-dep-depinfo -L src/backend/linux_raw/arch/outline/release -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/curl-sys-e4e5af83bcb13656/out/build -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/libnghttp2-sys-c7ae1d552a559c98/out/i/lib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/libz-sys-2d487f748c80b565/out/lib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/libz-sys-2d487f748c80b565/out/lib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/openssl-sys-73c48d660551ff45/out/openssl-build/install/lib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/libgit2-sys-0926a518d52a5f5b/out/build -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/mips64el-unknown-linux-gnuabi64/release/build/libssh2-sys-513b6c5458030784/out/build` (exit status: 254)

@bors
Copy link
Contributor

bors commented Jun 27, 2023

💔 Test failed - checks-actions

@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 Jun 27, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jun 27, 2023

@bors retry mips segfault

@bors 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 Jun 27, 2023
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Jun 27, 2023
Use `CoverageKind::as_operand_id` instead of manually reimplementing it

These two pieces of code are functionally equivalent to the `CoverageKind::as_operand_id` method that already exists, and is already used elsewhere in this file.

This slightly reduces the amount of code that manually pattern-matches on `CoverageKind`.
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Jun 27, 2023
Use `CoverageKind::as_operand_id` instead of manually reimplementing it

These two pieces of code are functionally equivalent to the `CoverageKind::as_operand_id` method that already exists, and is already used elsewhere in this file.

This slightly reduces the amount of code that manually pattern-matches on `CoverageKind`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112518 (Detect actual span for getting unexpected token from parsing macros)
 - rust-lang#112978 (Add suggestion for bad block fragment error)
 - rust-lang#113068 (bootstrap: rename 'user' profile to 'dist')
 - rust-lang#113079 (Use `CoverageKind::as_operand_id` instead of manually reimplementing it)
 - rust-lang#113089 (Export AnalysisResults trait in rustc_mir_dataflow)
 - rust-lang#113093 (`thir`: Add `Become` expression kind)
 - rust-lang#113096 (Remove unused struct and tweak format macro uses)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 526326e into rust-lang:master Jun 27, 2023
11 of 12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
@Zalathar Zalathar deleted the as-operand-id branch June 27, 2023 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants