removed comment and make error message shorter

Kivooeo · Kivooeo · commit bc620e43b0f7 · 2025-04-21T22:09:50.000+05:00
diff --git a/compiler/rustc_hir_typeck/src/op.rs b/compiler/rustc_hir_typeck/src/op.rs
@@ -697,8 +697,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     }
                 }
 
-                // If there any better way to get lhs name variable please tell me :)
-                // I really wanna know
                 let lhs_name_str = match lhs_expr.kind {
                     hir::ExprKind::Path(hir::QPath::Resolved(_, path)) => {
                         path.segments.last().map_or("_".to_string(), |s| s.ident.to_string())
@@ -717,7 +715,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                             if lhs_ty.is_raw_ptr() && rhs_ty.is_integral() =>
                         {
                             err.multipart_suggestion(
-                                "consider replacing `ptr += offset` with `ptr = ptr.wrapping_add(offset)` or `ptr.add(offset)`",
+                                "consider using `add` or `wrapping_add` to do pointer arithmetic",
                                 vec![
                                     (lhs_expr.span.shrink_to_lo(), format!("{} = ", lhs_name_str)),
                                     (
@@ -732,7 +730,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         Op::AssignOp(Spanned { node: hir::AssignOpKind::SubAssign, .. }) => {
                             if lhs_ty.is_raw_ptr() && rhs_ty.is_integral() {
                                 err.multipart_suggestion(
-                                    "consider replacing `ptr -= offset` with `ptr = ptr.wrapping_sub(offset)` or `ptr.sub(offset)`",
+                                    "consider using `sub` or `wrapping_sub` to do pointer arithmetic",
                                     vec![
                                         (lhs_expr.span.shrink_to_lo(), format!("{} = ", lhs_name_str)),
                                         (
diff --git a/src/doc/book b/src/doc/book
@@ -1 +1 @@
-Subproject commit 45f05367360f033f89235eacbbb54e8d73ce6b70
+Subproject commit d33916341d480caede1d0ae57cbeae23aab23e88
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
@@ -1 +1 @@
-Subproject commit 1e27e5e6d5133ae4612f5cc195c15fc8d51b1c9c
+Subproject commit 467f45637b73ec6aa70fb36bc3054bb50b8967ea
diff --git a/src/doc/nomicon b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit b4448fa406a6dccde62d1e2f34f70fc51814cdcc
+Subproject commit 0c10c30cc54736c5c194ce98c50e2de84eeb6e79
diff --git a/src/doc/reference b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 46435cd4eba11b66acaa42c01da5c80ad88aee4b
+Subproject commit 3340922df189bddcbaad17dc3927d51a76bcd5ed
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 864f74d4eadcaea3eeda37a2e7f4d34de233d51e
+Subproject commit d811228b14ae2707323f37346aee3f4147e247e6
diff --git a/tests/ui/typeck/pointer-arith-assign.stderr b/tests/ui/typeck/pointer-arith-assign.stderr
@@ -6,7 +6,7 @@ LL |     _ptr += 2;
    |     |
    |     cannot use `+=` on type `*mut u8`
    |
-help: consider replacing `ptr += offset` with `ptr = ptr.wrapping_add(offset)` or `ptr.add(offset)`
+help: consider using `add` or `wrapping_add` to do pointer arithmetic
    |
 LL -     _ptr += 2;
 LL +     _ptr = _ptr.wrapping_add(2);
@@ -20,7 +20,7 @@ LL |     _ptr -= 2;
    |     |
    |     cannot use `-=` on type `*mut u8`
    |
-help: consider replacing `ptr -= offset` with `ptr = ptr.wrapping_sub(offset)` or `ptr.sub(offset)`
+help: consider using `sub` or `wrapping_sub` to do pointer arithmetic
    |
 LL -     _ptr -= 2;
 LL +     _ptr = _ptr.wrapping_sub(2);

Original file line number	Diff line number	Diff line change
`@@ -697,8 +697,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`697`	`697`	`}`
`698`	`698`	`}`
`699`	`699`
`700`		`- // If there any better way to get lhs name variable please tell me :)`
`701`		`- // I really wanna know`
`702`	`700`	`let lhs_name_str = match lhs_expr.kind {`
`703`	`701`	`hir::ExprKind::Path(hir::QPath::Resolved(_, path)) => {`
`704`	`702`	`path.segments.last().map_or("_".to_string(), \|s\| s.ident.to_string())`
`@@ -717,7 +715,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`717`	`715`	`if lhs_ty.is_raw_ptr() && rhs_ty.is_integral() =>`
`718`	`716`	`{`
`719`	`717`	`err.multipart_suggestion(`
`720`		- "consider replacing `ptr += offset` with `ptr = ptr.wrapping_add(offset)` or `ptr.add(offset)`",
	`718`	+ "consider using `add` or `wrapping_add` to do pointer arithmetic",
`721`	`719`	`vec![`
`722`	`720`	`(lhs_expr.span.shrink_to_lo(), format!("{} = ", lhs_name_str)),`
`723`	`721`	`(`
`@@ -732,7 +730,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`732`	`730`	`Op::AssignOp(Spanned { node: hir::AssignOpKind::SubAssign, .. }) => {`
`733`	`731`	`if lhs_ty.is_raw_ptr() && rhs_ty.is_integral() {`
`734`	`732`	`err.multipart_suggestion(`
`735`		- "consider replacing `ptr -= offset` with `ptr = ptr.wrapping_sub(offset)` or `ptr.sub(offset)`",
	`733`	+ "consider using `sub` or `wrapping_sub` to do pointer arithmetic",
`736`	`734`	`vec![`
`737`	`735`	`(lhs_expr.span.shrink_to_lo(), format!("{} = ", lhs_name_str)),`
`738`	`736`	`(`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| _ptr += 2;`
`6`	`6`	`\| \|`
`7`	`7`	\| cannot use `+=` on type `*mut u8`
`8`	`8`	`\|`
`9`		-help: consider replacing `ptr += offset` with `ptr = ptr.wrapping_add(offset)` or `ptr.add(offset)`
	`9`	+help: consider using `add` or `wrapping_add` to do pointer arithmetic
`10`	`10`	`\|`
`11`	`11`	`LL - _ptr += 2;`
`12`	`12`	`LL + _ptr = _ptr.wrapping_add(2);`
`@@ -20,7 +20,7 @@ LL \| _ptr -= 2;`
`20`	`20`	`\| \|`
`21`	`21`	\| cannot use `-=` on type `*mut u8`
`22`	`22`	`\|`
`23`		-help: consider replacing `ptr -= offset` with `ptr = ptr.wrapping_sub(offset)` or `ptr.sub(offset)`
	`23`	+help: consider using `sub` or `wrapping_sub` to do pointer arithmetic
`24`	`24`	`\|`
`25`	`25`	`LL - _ptr -= 2;`
`26`	`26`	`LL + _ptr = _ptr.wrapping_sub(2);`