diff options
| author | bors <bors@rust-lang.org> | 2024-01-22 11:08:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-22 11:08:57 +0000 |
| commit | 366d112fa69164d79239ceeaa49e06497df5497f (patch) | |
| tree | 4e0e6825c22283ddcea623bffbe5e8cf7388f44a /src/tools | |
| parent | 6fff796eac247c072ddb84f8202bedecc8e94f0d (diff) | |
| parent | 610f13d685bf04fa595ea6c1a88aaee2e00016d8 (diff) | |
| download | rust-366d112fa69164d79239ceeaa49e06497df5497f.tar.gz rust-366d112fa69164d79239ceeaa49e06497df5497f.zip | |
Auto merge of #120226 - matthiaskrgr:rollup-9xwx0si, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #118714 ( Explanation that fields are being used when deriving `(Partial)Ord` on enums) - #119710 (Improve `let_underscore_lock`) - #119726 (Tweak Library Integer Division Docs) - #119746 (rustdoc: hide modals when resizing the sidebar) - #119986 (Fix error counting) - #120194 (Shorten `#[must_use]` Diagnostic Message for `Option::is_none`) - #120200 (Correct the anchor of an URL in an error message) - #120203 (Replace `#!/bin/bash` with `#!/usr/bin/env bash` in rust-installer tests) - #120212 (Give nnethercote more reviews) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/tests/ui/let_underscore_lock.rs | 1 | ||||
| -rwxr-xr-x | src/tools/rust-installer/test.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/clippy/tests/ui/let_underscore_lock.rs b/src/tools/clippy/tests/ui/let_underscore_lock.rs index ccac73be79e..28d8dd49831 100644 --- a/src/tools/clippy/tests/ui/let_underscore_lock.rs +++ b/src/tools/clippy/tests/ui/let_underscore_lock.rs @@ -26,6 +26,7 @@ fn main() { let _ = p_rw; } +#[allow(let_underscore_lock)] fn uplifted() { // shouldn't lint std locks as they were uplifted as rustc's `let_underscore_lock` diff --git a/src/tools/rust-installer/test.sh b/src/tools/rust-installer/test.sh index 4f69bfc63e9..16b05c66197 100755 --- a/src/tools/rust-installer/test.sh +++ b/src/tools/rust-installer/test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -u |