`is_some_and` taking `self` demo#99087

camsteffen · 2022-07-09T15:49:24Z

This is just to demo the difference between &self and self as requested. The last commit "Fix is_some_and usages taking by value" is the interesting one.

r? @joshtriplett

rustbot · 2022-07-09T15:49:28Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

flip1995

There are some formatting-only changes in the Clippy files. Please don't commit those. I think I left a comment for each of those changes.

flip1995 · 2022-07-11T07:34:53Z

src/tools/clippy/clippy_lints/src/duplicate_mod.rs


    fn check_crate_post(&mut self, cx: &EarlyContext<'_>, _: &Crate) {
-        for Modules { local_path, spans, lint_levels } in self.modules.values() {
+        for Modules {


AFAICT all changes in this file are formatting changes. Please don't commit formatting changes to Clippy.

flip1995 · 2022-07-11T07:37:05Z

src/tools/clippy/clippy_lints/src/methods/manual_str_repeat.rs

        if is_type_diagnostic_item(cx, ty, sym::String)
-            || (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).map_or(false, Ty::is_str))
-            || (match_type(cx, ty, &paths::COW) && get_ty_param(ty).map_or(false, Ty::is_str))
+            || (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).is_some_and(|ty| ty.is_str()))


Wait, shouldn't

Suggested change

|| (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).is_some_and(|ty| ty.is_str()))

|| (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).is_some_and(Ty::is_str)

still work?

flip1995 · 2022-07-11T07:42:33Z

src/tools/clippy/clippy_lints/src/unit_types/let_unit_value.rs

 use rustc_lint::{LateContext, LintContext};
 use rustc_middle::lint::in_external_macro;
-use rustc_middle::ty::{self, Ty, TypeVisitable, TypeSuperVisitable, TypeVisitor};
+use rustc_middle::ty::{self, Ty, TypeSuperVisitable, TypeVisitable, TypeVisitor};


Formatting change.

flip1995 · 2022-07-11T07:44:50Z

src/tools/clippy/clippy_utils/src/diagnostics.rs

-    sp: Span,
-    msg: &str,
-) {
+pub fn span_lint_hir(cx: &LateContext<'_>, lint: &'static Lint, hir_id: HirId, sp: Span, msg: &str) {


Formatting change.

flip1995 · 2022-07-11T07:46:10Z

src/tools/clippy/clippy_utils/src/lib.rs

    PtrSimplifiedType, SliceSimplifiedType, StrSimplifiedType, UintSimplifiedType,
 };
-use rustc_middle::ty::{layout::IntegerExt, BorrowKind, DefIdTree, Ty, TyCtxt, TypeAndMut, TypeVisitable, UpvarCapture};
+use rustc_middle::ty::{


Formatting change.

camsteffen · 2022-07-11T12:30:43Z

@flip1995 sorry this PR is not intended to be merged. But fwiw the formatting changes are made with cargo fmt -p clippy_lints -p clippy_utils.

flip1995 · 2022-07-11T12:50:19Z

But fwiw the formatting changes are made with cargo fmt -p clippy_lints -p clippy_utils.

This then probably uses the rust-lang/rust rustfmt.toml file and not the Clippy one? Is this ran automatically by some x.py command?

camsteffen · 2022-07-11T13:19:50Z

But fwiw the formatting changes are made with cargo fmt -p clippy_lints -p clippy_utils.

This then probably uses the rust-lang/rust rustfmt.toml file and not the Clippy one? Is this ran automatically by some x.py command?

No I run it manually when I make Clippy changes to avoid making changes that will be re-formatted. Any unrelated formatting changes that occur I assume are from rustc PR's that occurred since that last clippy sync. I usually don't push the unrelated formatting changes, but keep them in a commit in my local branch while working so that I don't see those changes every time I run cargo fmt.

bors · 2022-07-13T14:02:41Z

☔ The latest upstream changes (presumably #99203) made this pull request unmergeable. Please resolve the merge conflicts.

joshtriplett · 2022-07-28T06:14:16Z

@camsteffen I'd be happy to r+ a non-draft version of this; I think we've settled the question of taking self.

camsteffen · 2022-07-30T21:16:15Z

@joshtriplett I reopened #98354.

camsteffen added 6 commits July 9, 2022 10:27

Use is_some_and in compiler

f4d80e6

Use is_some_and in clippy

d4e66fa

Format clippy

b620133

Use is_some_and in librustdoc

00d9ade

Change is_some_and to take by value

64a2c17

Fix is_some_and usages taking by value

8d661ea

rust-highfive assigned joshtriplett Jul 9, 2022

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 9, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2022

camsteffen removed the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jul 9, 2022

camsteffen mentioned this pull request Jul 9, 2022

Tracking Issue for Option::is_some_and and Result::is_{ok,err}_and #93050

Closed

8 tasks

flip1995 reviewed Jul 11, 2022

View reviewed changes

camsteffen mentioned this pull request Jul 28, 2022

Change is_some_and to take by value #98354

Merged

camsteffen closed this Jul 30, 2022

	\|\| (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).is_some_and(\|ty\| ty.is_str()))
	\|\| (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).is_some_and(Ty::is_str)

Uh oh!

Conversation

camsteffen commented Jul 9, 2022

Uh oh!

rustbot commented Jul 9, 2022

Uh oh!

flip1995 left a comment

Choose a reason for hiding this comment

Uh oh!

flip1995 Jul 11, 2022

Choose a reason for hiding this comment

Uh oh!

flip1995 Jul 11, 2022

Choose a reason for hiding this comment

Uh oh!

flip1995 Jul 11, 2022

Choose a reason for hiding this comment

Uh oh!

flip1995 Jul 11, 2022

Choose a reason for hiding this comment

Uh oh!

flip1995 Jul 11, 2022

Choose a reason for hiding this comment

Uh oh!

camsteffen commented Jul 11, 2022

Uh oh!

flip1995 commented Jul 11, 2022

Uh oh!

camsteffen commented Jul 11, 2022

Uh oh!

bors commented Jul 13, 2022

Uh oh!

joshtriplett commented Jul 28, 2022

Uh oh!

camsteffen commented Jul 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants