Add PartialEq and Eq to Cursor #67233

Luro02 · 2019-12-11T17:01:34Z

rust-highfive · 2019-12-11T17:01:45Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

rust-highfive · 2019-12-11T17:08:23Z

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-11T17:02:21.3386446Z ========================== Starting Command Output ===========================
2019-12-11T17:02:21.3387563Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/260f8301-421f-4d8e-96ec-2ebd11c37aa9.sh
2019-12-11T17:02:21.3387594Z 
2019-12-11T17:02:21.3390024Z ##[section]Finishing: Disable git automatic line ending conversion
2019-12-11T17:02:21.3395221Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67233/merge to s
2019-12-11T17:02:21.3396555Z Task         : Get sources
2019-12-11T17:02:21.3396622Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2019-12-11T17:02:21.3396646Z Version      : 1.0.0
2019-12-11T17:02:21.3396670Z Author       : Microsoft
---
2019-12-11T17:02:23.0426855Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-11T17:02:23.0598291Z ##[command]git config gc.auto 0
2019-12-11T17:02:23.0670176Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-11T17:02:23.0711702Z ##[command]git config --get-all http.proxy
2019-12-11T17:02:23.0832708Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67233/merge:refs/remotes/pull/67233/merge
---
2019-12-11T17:06:45.7085495Z     Checking panic_unwind v0.0.0 (/checkout/src/libpanic_unwind)
2019-12-11T17:06:49.5511965Z error: impl has missing stability attribute
2019-12-11T17:06:49.5512933Z    --> src/libstd/io/cursor.rs:394:1
2019-12-11T17:06:49.5513430Z     |
2019-12-11T17:06:49.5513932Z 394 | / impl<T: PartialEq> PartialEq for Cursor<T> {
2019-12-11T17:06:49.5514442Z 395 | |     fn eq(&self, other: &Self) -> bool {
2019-12-11T17:06:49.5515010Z 396 | |         self.get_ref() == other.get_ref() && self.pos == other.pos
2019-12-11T17:06:49.5515945Z 398 | | }
2019-12-11T17:06:49.5516363Z     | |_^
2019-12-11T17:06:49.5516607Z 
2019-12-11T17:06:49.5517011Z error: impl has missing stability attribute
2019-12-11T17:06:49.5517011Z error: impl has missing stability attribute
2019-12-11T17:06:49.5517430Z    --> src/libstd/io/cursor.rs:400:1
2019-12-11T17:06:49.5517847Z     |
2019-12-11T17:06:49.5518281Z 400 | impl<T: Eq> Eq for Cursor<T> {}
2019-12-11T17:06:49.5518960Z 
2019-12-11T17:06:49.6596764Z error: aborting due to 2 previous errors
2019-12-11T17:06:50.2098810Z 
2019-12-11T17:06:50.2099830Z error: could not compile `std`.
---
2019-12-11T17:06:50.2101632Z   local time: Wed Dec 11 17:06:49 UTC 2019
2019-12-11T17:06:50.2101808Z   network time: Wed, 11 Dec 2019 17:06:49 GMT
2019-12-11T17:06:50.2102025Z == end clock drift check ==
2019-12-11T17:06:52.5516450Z 
2019-12-11T17:06:52.5592288Z ##[error]Bash exited with code '1'.
2019-12-11T17:06:52.5602079Z ##[section]Finishing: Run build
2019-12-11T17:06:52.5614744Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/67233/merge to s
2019-12-11T17:06:52.5616269Z Task         : Get sources
2019-12-11T17:06:52.5616304Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2019-12-11T17:06:52.5616341Z Version      : 1.0.0
2019-12-11T17:06:52.5616389Z Author       : Microsoft
2019-12-11T17:06:52.5616389Z Author       : Microsoft
2019-12-11T17:06:52.5616425Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2019-12-11T17:06:52.5616585Z ==============================================================================
2019-12-11T17:06:52.8680867Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2019-12-11T17:06:52.8711608Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/67233/merge to s
2019-12-11T17:06:52.8797443Z Start cleaning up orphan processes.
2019-12-11T17:06:52.8877797Z Terminate orphan process: pid (5159) (python)
2019-12-11T17:06:52.9018043Z ##[section]Finishing: Finalize Job
2019-12-11T17:06:52.9063377Z ##[section]Finishing: Linux mingw-check

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

src/libstd/io/cursor.rs

sfackler · 2019-12-12T00:15:44Z

@rfcbot fcp merge

rfcbot · 2019-12-12T00:15:45Z

Team member @sfackler has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

SimonSapin · 2019-12-12T07:48:17Z

Could you give an example of how you’d use this and why it’s useful? If T is a slice or Vec of bytes, isn’t it expensive to compare the entire thing?

Luro02 · 2019-12-12T12:40:22Z

I personally need it for testing. It is easier to read

assert_eq!(Cursor::new(vec![2, 3, 4]), Cursor::new(vec![2, 3, 4]));

than

assert_eq!(Cursor::new(vec![2, 3, 4]).get_ref(), Cursor::new(vec![2, 3, 4]).get_ref());

In my case I have a struct, that wraps around a reader, where it only implements PartialEq if the underlying reader implements it. So I can't assert my struct, because it has an underlying Cursor, which doesn't implement PartialEq.

This is the wrapper I am talking about:
https://github.com/Luro02/sub_cursor

PartialEq for Mutex is WIP...

alexcrichton · 2019-12-12T22:15:00Z

Could this also be defined with #[derive] since I think the implementation is the same?

rfcbot · 2019-12-12T23:31:56Z

🔔 This is now entering its final comment period, as per the review above. 🔔

Mark-Simulacrum · 2019-12-21T16:36:00Z

Please squash the commits into one. After that, I think this'll be ready for approval (modulo FCP concluding in ~1 day).

Luro02 · 2019-12-21T19:38:37Z

Could you tell me how to do this correctly please? (I never did this)

Mark-Simulacrum · 2019-12-21T20:59:24Z

I recommend git rebase -i origin/master (or whatever your "upstream" remote is instead of origin, the one that corresponds to rust-lang/rust). You'll get a listing of commits and all but the first one can be changed to have "fixup" as the first word (instead of "pick") and when you then save that it'll create a single commit with the contents of all 3 squashed into one.

Let me know if you need further help!

Luro02 · 2019-12-22T09:42:32Z

@Mark-Simulacrum Thank you for your friendly and helpful response :)

rfcbot · 2019-12-22T23:32:31Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

sfackler · 2019-12-22T23:56:36Z

@bors r+

bors · 2019-12-22T23:56:37Z

📌 Commit 89986a3 has been approved by sfackler

bors · 2019-12-22T23:56:38Z

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

Add PartialEq and Eq to Cursor closes rust-lang#67226

@ghost

Rollup of 8 pull requests Successful merges: - #67233 (Add PartialEq and Eq to Cursor) - #67466 (Require const stability attributes on intrinsics to be able to use them in constant contexts) - #67507 (Remove mem::uninitalized from tests) - #67527 (Results show too much) - #67536 (Move `{hir::lowering -> hir}::is_range_literal`) - #67538 (Improve diagnostics for invalid assignment) - #67546 (Fix ICE in mir interpretation) - #67559 (Document that calling Drop, even after it panics, is UB) Failed merges: r? @ghost

Version 1.42.0 (2020-03-12) ========================== Language -------- - [You can now use the slice pattern syntax with subslices.][67712] e.g. ```rust fn foo(words: &[&str]) { match words { ["Hello", "World", "!", ..] => println!("Hello World!"), ["Foo", "Bar", ..] => println!("Baz"), rest => println!("{:?}", rest), } } ``` - [You can now use `#[repr(transparent)]` on univariant `enum`s.][68122] Meaning that you can create an enum that has the exact layout and ABI of the type it contains. - [There are some *syntax-only* changes:][67131] - `default` is syntactically allowed before items in `trait` definitions. - Items in `impl`s (i.e. `const`s, `type`s, and `fn`s) may syntactically leave out their bodies in favor of `;`. - Bounds on associated types in `impl`s are now syntactically allowed (e.g. `type Foo: Ord;`). - `...` (the C-variadic type) may occur syntactically directly as the type of any function parameter. These are still rejected *semantically*, so you will likely receive an error but these changes can be seen and parsed by procedural macros and conditional compilation. Compiler -------- - [Added tier 2* support for `armv7a-none-eabi`.][68253] - [Added tier 2 support for `riscv64gc-unknown-linux-gnu`.][68339] - [`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` now produce panic messages pointing to the location where they were called, rather than `core`'s internals. ][67887] * Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries --------- - [`iter::Empty<T>` now implements `Send` and `Sync` for any `T`.][68348] - [`Pin::{map_unchecked, map_unchecked_mut}` no longer require the return type to implement `Sized`.][67935] - [`io::Cursor` now derives `PartialEq` and `Eq`.][67233] - [`Layout::new` is now `const`.][66254] - [Added Standard Library support for `riscv64gc-unknown-linux-gnu`.][66899] Stabilized APIs --------------- - [`CondVar::wait_while`] - [`CondVar::wait_timeout_while`] - [`DebugMap::key`] - [`DebugMap::value`] - [`ManuallyDrop::take`] - [`matches!`] - [`ptr::slice_from_raw_parts_mut`] - [`ptr::slice_from_raw_parts`] Cargo ----- - [You no longer need to include `extern crate proc_macro;` to be able to `use proc_macro;` in the `2018` edition.][cargo/7700] Compatibility Notes ------------------- - [`Error::description` has been deprecated, and its use will now produce a warning.][66919] It's recommended to use `Display`/`to_string` instead. - [`use $crate;` inside macros is now a hard error.][37390] The compiler emitted forward compatibility warnings since Rust 1.14.0. - [As previously announced, this release reduces the level of support for 32-bit Apple targets to tier 3.][apple-32bit-drop]. This means that the source code is still available to build, but the targets are no longer tested and no release binary is distributed by the Rust project. Please refer to the linked blog post for more information. [37390]: rust-lang/rust#37390 [68253]: rust-lang/rust#68253 [68348]: rust-lang/rust#68348 [67935]: rust-lang/rust#67935 [68339]: rust-lang/rust#68339 [68122]: rust-lang/rust#68122 [67712]: rust-lang/rust#67712 [67887]: rust-lang/rust#67887 [67131]: rust-lang/rust#67131 [67233]: rust-lang/rust#67233 [66899]: rust-lang/rust#66899 [66919]: rust-lang/rust#66919 [66254]: rust-lang/rust#66254 [cargo/7700]: rust-lang/cargo#7700 [`DebugMap::key`]: https://doc.rust-lang.org/stable/std/fmt/struct.DebugMap.html#method.key [`DebugMap::value`]: https://doc.rust-lang.org/stable/std/fmt/struct.DebugMap.html#method.value [`ManuallyDrop::take`]: https://doc.rust-lang.org/stable/std/mem/struct.ManuallyDrop.html#method.take [`matches!`]: https://doc.rust-lang.org/stable/std/macro.matches.html [`ptr::slice_from_raw_parts_mut`]: https://doc.rust-lang.org/stable/std/ptr/fn.slice_from_raw_parts_mut.html [`ptr::slice_from_raw_parts`]: https://doc.rust-lang.org/stable/std/ptr/fn.slice_from_raw_parts.html [`CondVar::wait_while`]: https://doc.rust-lang.org/stable/std/sync/struct.Condvar.html#method.wait_while [`CondVar::wait_timeout_while`]: https://doc.rust-lang.org/stable/std/sync/struct.Condvar.html#method.wait_timeout_while

rust-highfive assigned sfackler Dec 11, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 11, 2019

sfackler reviewed Dec 12, 2019

View reviewed changes

src/libstd/io/cursor.rs Outdated Show resolved Hide resolved

sfackler added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Dec 12, 2019

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Dec 12, 2019

Centril added the relnotes Marks issues that should be documented in the release notes of the next release. label Dec 12, 2019

Centril added this to the 1.42 milestone Dec 12, 2019

rfcbot added the final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. label Dec 12, 2019

rfcbot removed the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Dec 12, 2019

add partialeq and eq to cursor

89986a3

rfcbot added the finished-final-comment-period The final comment period is finished for this PR / Issue. label Dec 22, 2019

rfcbot removed the final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. label Dec 22, 2019

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 22, 2019

Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2019

Rollup merge of rust-lang#67233 - Luro02:cursor_traits, r=sfackler

58423a0

Add PartialEq and Eq to Cursor closes rust-lang#67226

Centril mentioned this pull request Dec 23, 2019

Rollup of 5 pull requests #67555

Closed

Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2019

Rollup merge of rust-lang#67233 - Luro02:cursor_traits, r=sfackler

3278fc8

Add PartialEq and Eq to Cursor closes rust-lang#67226

Centril mentioned this pull request Dec 23, 2019

Rollup of 4 pull requests #67556

Closed

Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2019

Rollup merge of rust-lang#67233 - Luro02:cursor_traits, r=sfackler

260514d

Add PartialEq and Eq to Cursor closes rust-lang#67226

Centril mentioned this pull request Dec 23, 2019

Rollup of 8 pull requests #67560

Merged

bors merged commit 89986a3 into rust-lang:master Dec 23, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PartialEq and Eq to Cursor #67233

Add PartialEq and Eq to Cursor #67233

Luro02 commented Dec 11, 2019

rust-highfive commented Dec 11, 2019

rust-highfive commented Dec 11, 2019

sfackler commented Dec 12, 2019

rfcbot commented Dec 12, 2019 •

edited by SimonSapin

SimonSapin commented Dec 12, 2019

Luro02 commented Dec 12, 2019 •

edited

alexcrichton commented Dec 12, 2019

rfcbot commented Dec 12, 2019

Mark-Simulacrum commented Dec 21, 2019

Luro02 commented Dec 21, 2019

Mark-Simulacrum commented Dec 21, 2019

Luro02 commented Dec 22, 2019

rfcbot commented Dec 22, 2019

sfackler commented Dec 22, 2019

bors commented Dec 22, 2019

bors commented Dec 22, 2019

Add PartialEq and Eq to Cursor #67233

Add PartialEq and Eq to Cursor #67233

Conversation

Luro02 commented Dec 11, 2019

rust-highfive commented Dec 11, 2019

rust-highfive commented Dec 11, 2019

sfackler commented Dec 12, 2019

rfcbot commented Dec 12, 2019 • edited by SimonSapin

SimonSapin commented Dec 12, 2019

Luro02 commented Dec 12, 2019 • edited

alexcrichton commented Dec 12, 2019

rfcbot commented Dec 12, 2019

Mark-Simulacrum commented Dec 21, 2019

Luro02 commented Dec 21, 2019

Mark-Simulacrum commented Dec 21, 2019

Luro02 commented Dec 22, 2019

rfcbot commented Dec 22, 2019

sfackler commented Dec 22, 2019

bors commented Dec 22, 2019

bors commented Dec 22, 2019

rfcbot commented Dec 12, 2019 •

edited by SimonSapin

Luro02 commented Dec 12, 2019 •

edited