diff options
| author | bors <bors@rust-lang.org> | 2023-10-19 03:52:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-19 03:52:32 +0000 |
| commit | 36b61e5aa593cc60cc92fc548b0d351e414aee2a (patch) | |
| tree | 3259a73be00f55a2c75aa291fcbfb65b81c18280 /src | |
| parent | 020d00867a0129fe77d02fb7f07d6bc96a7033ff (diff) | |
| parent | 8aa1d7124ab34aeb767d06d0ed24c51d29aaf062 (diff) | |
| download | rust-36b61e5aa593cc60cc92fc548b0d351e414aee2a.tar.gz rust-36b61e5aa593cc60cc92fc548b0d351e414aee2a.zip | |
Auto merge of #116923 - fmease:rollup-ev7q387, r=fmease
Rollup of 7 pull requests Successful merges: - #116663 (Don't ICE when encountering unresolved regions in `fully_resolve`) - #116761 (Fix podman detection in CI scripts) - #116795 (Add `#[track_caller]` to `Option::unwrap_or_else`) - #116829 (Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd`) - #116883 (Change my name in mailmap) - #116908 (Tweak wording of type errors involving type params) - #116912 (Some renaming nits for `rustc_type_ir`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/run.sh | 2 | ||||
| -rw-r--r-- | src/tools/clippy/tests/ui/builtin_type_shadow.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 22aabda2bb3..99e3ce199f4 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -235,7 +235,7 @@ else args="$args --volume /tmp/toolstate:/tmp/toolstate" id=$(id -u) - if [[ "$id" != 0 && "$(docker -v)" =~ ^podman ]]; then + if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then # Rootless podman creates a separate user namespace, where an inner # LOCAL_USER_ID will map to a different subuid range on the host. # The "keep-id" mode maps the current UID directly into the container. diff --git a/src/tools/clippy/tests/ui/builtin_type_shadow.stderr b/src/tools/clippy/tests/ui/builtin_type_shadow.stderr index cb8462182b8..e051c00eb8d 100644 --- a/src/tools/clippy/tests/ui/builtin_type_shadow.stderr +++ b/src/tools/clippy/tests/ui/builtin_type_shadow.stderr @@ -13,7 +13,7 @@ error[E0308]: mismatched types LL | fn foo<u32>(a: u32) -> u32 { | --- --- expected `u32` because of return type | | - | this type parameter + | expected this type parameter LL | 42 | ^^ expected type parameter `u32`, found integer | |