aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-01Merge tag v0.5.9 am: 380e26f982 am: 8bddf39794 am: 33ef859425HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseSasha Smundak
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2320808 Change-Id: I14b6ad6891b5023adcbb19c4f53bab9b8dd9eea3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge tag v0.5.9 am: 380e26f982 am: 8bddf39794android-u-beta-1-gplSasha Smundak
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2320808 Change-Id: I6ba5921fc86e3fcb4fb47823cdd9f8332f16d496 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge tag v0.5.9 am: 380e26f982main-16k-with-phonesSasha Smundak
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2320808 Change-Id: I5e8775461c1fa83cc32d058728751e9c13dde03f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge tag v0.5.9Sasha Smundak
Test: N/A Change-Id: I750271ef55e923645a03a114c35ba385a77e7e6f
2022-09-02Adjust heuristic for line-based versus byte-based diffing (#299)Joe Tsai
If the string has many characters that require escape sequences to print, then we need to take that into consideration and avoid byte-by-byte diffing. Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2022-08-30Run tests on Go 1.19 (#309)Aoang
* Run tests on Go 1.19 * Format comment Finish the rest of the work for https://github.com/google/go-cmp/pull/304 Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2022-08-30Use value.TypeString in PathStep.String (#306)Joe Tsai
The value.TypeString function is what the rest of the package uses and is slightly cleaner than using reflect.Type.String. Updates #305 Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2022-08-30Pre-declare global type variables (#302)Joe Tsai
Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2022-08-30Fix typo in Result documentation (#300)Joe Tsai
2022-07-13Format with Go 1.19 formatter (#304)Joe Tsai
This allows the GoDoc to take advantage of new markup syntax introduced in Go 1.19. This does not require that our minimum supported version be bumped to Go 1.19 since the pkgsite renders our godoc regardless of supported Go version.
2022-06-06Use reflect.Value.IsZero (#297)Joe Tsai
Now that Go 1.13 is the minimum version, we can use the reflect.Value.IsZero method instead of our own internal/value.IsZero function. Interestingly, our IsZero function pre-dates the IsZero method, but fortunately has the exact same semantics, since both are targetting semantics defined by the Go language specification.
2022-04-26Additional cleanup with Go 1.13 as minimal version (#295)Joe Tsai
2022-04-26remove xerrors (#292)Tatsuya Kaneko
Versions older than Go 1.13 are no longer in use. Remove unnecessary dependencies.
2022-04-25Use string formatting for slice of bytes (#294)Joe Tsai
If a slice of bytes is mostly text, format them as text instead of as []byte literal with hexadecimal digits. Avoid always printing the type. This is technically invalid Go code, but is unnecessary in many cases since the type is inferred from the parent concrete type. Fixes #272
2022-04-25Fix printing of types in reporter output (#293)Joe Tsai
When printing a pointer, only elide the type for unnamed pointers. Otherwise, we can run into situations where named and unnamed pointers format the same way in indistinguishable ways. When printing an interview, never skip the interface type. Whether we skip printing the type should be determined by the parent containers, and not locally determined. For examples, interface values within a struct, slice, or map will always be elided since they can be inferred.
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵Xin Li
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am: 1d7f911f63 -s ours am: 963280ff1c -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: I13baf7eaf32b68a539d4a4f1387858431ceb9a80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseXin Li
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am: 1d7f911f63 -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: Ie5df2a575ae4339db8837a041c76f92c87145565 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵Xin Li
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am: a9459a46c6 -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: I5881c12c7144fcedbbe0aac677037666e23bc9c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵Xin Li
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: I3472bf00e696d70cbe06809dcd29ef029dc85f0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵aml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150aml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010aml_sch_331113000aml_sch_331111000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030aml_neu_331310000aml_neu_331113000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020aml_ext_331814220aml_ext_331412000aml_ext_331312000aml_ext_331112010aml_ext_331012020aml_doc_331120000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010aml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000aml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-wifi-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-tethering-releaseandroid13-mainline-sdkext-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-resolv-releaseandroid13-mainline-permission-releaseandroid13-mainline-os-statsd-releaseandroid13-mainline-networking-releaseandroid13-mainline-mediaprovider-releaseandroid13-mainline-media-swcodec-releaseandroid13-mainline-media-releaseandroid13-mainline-ipsec-releaseandroid13-mainline-extservices-releaseandroid13-mainline-conscrypt-releaseandroid13-mainline-cellbroadcast-releaseandroid13-mainline-adbd-releaseaml_tz4_332714010Xin Li
am: a3f99847d9 -s ours am: 8dab502b73 -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: I2ec081c77cc1f5d3ae2e33ae93d42bd14739f9a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: a3f99847d9 -s ours am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: I93ea5e61fbda01e65992334d4ceeef31c8ab9d5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ce43355857 -s oursXin Li
am skip reason: Merged-In Id15da777ea64e396fbc908abc8565b9639f44f1d with SHA-1 71258e7197 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/go-cmp/+/17544764 Change-Id: Ic62e88a0e2557e560b00e24d7faf221f55dd3a11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Id15da777ea64e396fbc908abc8565b9639f44f1d Change-Id: Id029ff234c682036ea2be41c11ed81037efe2b8e
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197 am: ↵Dan Willemsen
b0e3dfe0c1 am: 5aa249cfd5 Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: I50ac1b4c46fcaca280fe87ed523aa236d8086ef2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197 am: b0e3dfe0c1Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: I9b4ee2c5989aa7899679b693dc4c9f9b998b5e63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197 am: b0e3dfe0c1Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: Ic09ad3fc35baab44c11d57564cca2e6316942f80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896 am: 71258e7197Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: Iab1e06b1a1a985b3a12cf5e626250678bf1fb825 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70be am: dc0bb5f896Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: Id15da777ea64e396fbc908abc8565b9639f44f1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge tag 'v0.5.7' am: 54a4cc70beDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2047006 Change-Id: I2bbabb46fbdcb32817f7842f50c574404f40dffe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Merge tag 'v0.5.7'Dan Willemsen
Change-Id: Ia844c88b15306dc4a38fd6649b8734841ad1c666
2022-03-22Run tests on Go 1.18 (#290)Aoang
2022-01-04Add //go:build lines (#285)Tobias Klauser
Starting with Go 1.17, //go:build lines are preferred over // +build lines, see https://golang.org/doc/go1.17#build-lines and https://golang.org/design/draft-gobuild for details. This change was generated by running Go 1.17 go fmt ./... which automatically adds //go:build lines based on the existing // +build lines. Also update the corresponding GitHub action to use Go 1.17 gofmt.
2021-12-07Drop hacks to work around Go reflection bugs in Go1.9 (#282)Joe Tsai
Now that Go 1.11 is the minimally supported version, we can drop some local hacks to work around bugs in reflect that were present in Go1.9.
2021-12-07Update minimum supported version to go1.11 (#281)Damien Neil
2021-10-12Reduce minimum length for specialize string diffing (#275)Joe Tsai
The original threshold of 64 was chosen without much thought. Lower it to 32 now that we have some concrete examples that it is aesthetically better. Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2021-10-12Use any alias instead of interface{} (#276)Joe Tsai
See golang/go#33232.
2021-09-16Change build status badge (#269)Jake Son
Co-authored-by: Damien Neil <neild@users.noreply.github.com>
2021-09-16Fix spelling mistakes (#271)Joe Tsai
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85 am: ↵Dan Willemsen
435f492b8e am: 69c354c47f Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I1ff484b18cf9c641bcfff96c2574cb2264fe0509
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85 am: 435f492b8eDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I81226f94b4f34d8e5318e03acabe15a1b99c5c03
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565d am: 229e964f85Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: Ia7196559f975f934aada4553c6826f793e35a5ba
2021-08-30Merge tag 'v0.5.6' am: eabad1f147 am: fa2070565dDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: Ieff2f6beb01a0454bfbc06de6906d4bde89a87c3
2021-08-30Merge tag 'v0.5.6' am: eabad1f147Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1812316 Change-Id: I1001c3fd4a8d99cb96cf22a3a929c5a5d3c9ab4c
2021-08-27Merge tag 'v0.5.6'Dan Willemsen
Change-Id: I4f0817d7efa4a1d223643d89b511571c0ad144db
2021-07-22Use sha256 in test (#268)Joe Tsai
Some aggressive dependency checks flag the use of md5. Switch to sha256 as it accomplishes the same purpose.
2021-07-19Merge pull request #266 from dsnet/fix-formatDamien Neil
Fix textual printing of byte slices
2021-07-18Fix textual printing of byte slicesJoe Tsai
There are two bugs being fixed: 1. The hueristic for whether a slice of byte looks like text should check whether a rune IsPrint OR IsSpace, and not both. Only a single rune (i.e., U+0020) ever satisfies both conditions. Previously, it would print as: MyBytes{0x68, 0x65, 0x6c, 0x6c, 0x6f} and now it would now print as: MyBytes(MyBytes("hello")) 2. If we're printing as string, then we should set skipType=true since we already explicitly format the value with the type. Previously, it would print as: MyBytes(MyBytes("hello")) and now it would now print as: MyBytes("hello")
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848 am: ce3925a9ae am: ↵Dan Willemsen
6c0eef7755 Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I0550d20292ab0614383bfc691937456bfd988aec
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848 am: ce3925a9aeDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I8a07908cb3f9b4035f3c4d2a8b42942f2cf708db
2021-06-29Regen Android.bp with go2bp am: 3debcec779 am: 7265bb7848Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/1716978 Change-Id: I23984211bc122436aa1827b9df812f50bc63a0b2