Skip to content

Rollup of 8 pull requests #94734

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.

Sign up for GitHub

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

Merged
bors merged 23 commits into from
Mar 8, 2022
Merged

Rollup of 8 pull requests #94734

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
19645ac
Add Result::{ok, err, and, or, unwrap_or} as const
clarfonthey Dec 29, 2021
24fe35a
Remove argument from closure in thread::Scope::spawn.
m-ou-se Mar 3, 2022
6b46a52
Fix doctests.
m-ou-se Mar 3, 2022
700ec66
Emit `unused_attributes` if a level attr only has a reason
xFrednet Mar 3, 2022
86b4658
Generalize `get_nullable_type` to allow types where null is all-ones.
sunfishcode Mar 3, 2022
9099353
Use '_ for irrelevant lifetimes in Debug impl.
m-ou-se Mar 4, 2022
fbd4cfa
diagnostics: only talk about `Cargo.toml` if running under Cargo
notriddle Mar 7, 2022
776be7e
promot debug_assert to assert
kckeiks Mar 7, 2022
a3d269e
Use `f` instead of `|| f()`.
m-ou-se Mar 7, 2022
02a3830
When encountering a match expr with no arms, suggest it
estebank Dec 16, 2021
2383858
When finding a match expr with a single arm that requires more, sugge…
estebank Dec 16, 2021
084ca79
When finding a match expr with multiple arms that requires more, sugg…
estebank Dec 16, 2021
ab4feea
Point at uncovered variants in enum definition in `note` instead of a…
estebank Dec 16, 2021
6f45f73
Change wording of suggestion to add missing `match` arm
estebank Dec 16, 2021
a3158c7
:arrow_up: rust-analyzer
lnicola Mar 8, 2022
e3ea69f
Rollup merge of #91993 - estebank:match-span-suggestion, r=oli-obk
matthiaskrgr Mar 8, 2022
e22331c
Rollup merge of #92385 - clarfonthey:const_option, r=fee1-dead
matthiaskrgr Mar 8, 2022
aec535f
Rollup merge of #94559 - m-ou-se:thread-scope-spawn-closure-without-a…
matthiaskrgr Mar 8, 2022
83ed227
Rollup merge of #94580 - xFrednet:55112-only-reason-in-lint-attr, r=lcnr
matthiaskrgr Mar 8, 2022
e4a3627
Rollup merge of #94586 - sunfishcode:sunfishcode/io-lifetimes-tests, …
matthiaskrgr Mar 8, 2022
98d027c
Rollup merge of #94708 - notriddle:notriddle/cargo-toml-warning, r=lcnr
matthiaskrgr Mar 8, 2022
a077e44
Rollup merge of #94712 - kckeiks:remove-rwlock-read-error-assumption,…
matthiaskrgr Mar 8, 2022
b879216
Rollup merge of #94726 - lnicola:rust-analyzer-2022-03-08, r=lnicola
matthiaskrgr Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use '_ for irrelevant lifetimes in Debug impl. 
Co-authored-by: Daniel Henry-Mantilla <[email protected]>
  • Loading branch information
@m-ou-se @danielhenrymantilla
m-ou-se and danielhenrymantilla authored Mar 4, 2022
commit 9099353ea88c72cb5a62fd7c2af187410295cf5b
2 changes: 1 addition & 1 deletion library/std/src/thread/scoped.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ impl<'scope, T> ScopedJoinHandle<'scope, T> {
}
}

impl<'scope, 'env> fmt::Debug for Scope<'scope, 'env> {
impl fmt::Debug for Scope<'_, '_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Scope")
.field("num_running_threads", &self.data.num_running_threads.load(Ordering::Relaxed))
Expand Down