add debug_assert_ne + assert_ne #35074

ashleygwilliams · 2016-07-27T17:48:24Z

~~✨ work in progress, please do not merge ✨~~

rust-highfive · 2016-07-27T17:48:33Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (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.

ashleygwilliams · 2016-07-27T18:02:19Z

src/libcore/macros.rs

+/// assert_ne!(a, b);
+/// ```
+#[macro_export]
+///#[stable(feature = "????", since = "????")]


not sure what to put here

macros are a bit odd, since they become insta-stable. Right now, since should be 1.12.0. Unsure about feature, since it won't have one. @alexcrichton ?

I think the feature effectively doesn't matter -- assert_ne would be fine.

(what @aturon said)

ashleygwilliams · 2016-08-17T23:15:50Z

hi! does this need tests? i'm struggling to find where assert_eq is tested. it is not in the same file, and a search of this repo for assert_eq and test leads to a lot of results 😬

would love some direction on where/if to write tests. otherwise i think this should be good to go!

steveklabnik · 2016-08-17T23:17:58Z

https://github.com/rust-lang/rust/blob/master/src/test/run-pass/assert-eq-macro-success.rs

https://github.com/rust-lang/rust/blob/master/src/test/run-pass/assert-eq-macro-unsized.rs

ashleygwilliams · 2016-08-17T23:28:44Z

ok! tests added. thanks for the point in the right direction @steveklabnik 🐬

alexcrichton · 2016-08-18T02:40:19Z

src/test/run-pass/assert-ne-macro-success.rs

@@ -0,0 +1,12 @@
+#[derive(PartialEq, Debug)]


I think this may need our standard license header to pass make tidy

got it, @steveklabnik said it didn't, but i'll add it

alexcrichton · 2016-08-31T18:14:44Z

@bors: r+ 3f404f40d01f8a3f03d2ad219f81cb236d416f15

ashleygwilliams · 2016-08-31T18:23:51Z

lemme know if you'd like me to squash ;)

bors · 2016-08-31T19:49:36Z

⌛ Testing commit 3f404f4 with merge aa5ce78...

bors · 2016-08-31T19:56:14Z

💔 Test failed - auto-linux-64-nopt-t

alexcrichton · 2016-08-31T20:57:22Z

@ashleygwilliams sure! Looks like the stability attributes may also need to be uncommented?

alexcrichton · 2016-09-01T01:54:55Z

@bors: r+

bors · 2016-09-01T01:54:56Z

📌 Commit ec8a8ef has been approved by alexcrichton

bors · 2016-09-01T06:46:41Z

⌛ Testing commit ec8a8ef with merge 8e68479...

bors · 2016-09-01T07:56:59Z

💔 Test failed - auto-mac-64-opt-rustbuild

steveklabnik · 2016-09-01T13:44:00Z

Hmm, I don't see why this failed.

alexcrichton · 2016-09-01T17:05:12Z

Hm I guess maybe that could be a bug in rustbuild where it's using the wrong standard library, but I'd be surprised if that just came up!

@ashleygwilliams does make check-stage2-rpass pass locally for you?

alexcrichton · 2016-09-01T18:09:39Z

@ashleygwilliams of did you pass --enable-rustbuild to configure? In that case the command would be:

python src/bootstrap/bootstrap.py --step check-rpass

ashleygwilliams · 2016-09-01T19:07:18Z

am waiting on it now @alexcrichton

ashleygwilliams · 2016-09-01T23:56:02Z

fails the same on my local machine as it fails in travis.

alexcrichton · 2016-09-02T16:22:33Z

Oh right these macros are defined in libcore but need to be reexported from the standard library

ashleygwilliams · 2016-09-02T16:28:15Z

lol omg I KNEW IT. i had been bugging @steveklabnik about needing to "register" the macros somewhere. commit + squash coming up

alexcrichton · 2016-09-02T16:30:54Z

src/libstd/lib.rs

@@ -302,7 +302,7 @@ use prelude::v1::*;
 // We want to reexport a few macros from core but libcore has already been
 // imported by the compiler (via our #[no_std] attribute) In this case we just
 // add a new crate name so we can attach the reexports to it.
-#[macro_reexport(assert, assert_eq, debug_assert, debug_assert_eq,
+#[macro_reexport(assert, assert_eq, assert_ne, debug_assert, debug_assert_eq,


debug_assert_ne as well?

ashleygwilliams · 2016-09-02T18:21:36Z

test result: ok. 2445 passed; 0 failed; 60 ignored; 0 measured
The command "docker run -v `pwd`:/build rust sh -c " ./configure --llvm-root=/usr/lib/llvm-3.7 && make tidy && make check-notidy -j4 "" exited with 2.
Done. Your build exited with 1.

i am unclear what this means.

alexcrichton · 2016-09-02T20:12:05Z

@bors: r+

Ah yeah that's fine, travis is broken right now unfortunately :(

bors · 2016-09-02T20:12:06Z

📌 Commit 01d085b has been approved by alexcrichton

bors · 2016-09-02T22:18:40Z

⌛ Testing commit 01d085b with merge 848e652...

bors · 2016-09-03T00:44:37Z

💔 Test failed - auto-linux-32-nopt-t

steveklabnik · 2016-09-03T01:02:51Z

@bors: retry

bors · 2016-09-03T04:02:40Z

🔒 Merge conflict

steveklabnik · 2016-09-21T10:43:38Z

/cc @ashleygwilliams , let's get that merge conflict fixed

steveklabnik · 2016-09-21T12:48:51Z

@bors: r+

bors · 2016-09-21T12:48:52Z

📌 Commit 3d8d557 has been approved by steveklabnik

steveklabnik · 2016-09-21T12:56:48Z

Homu still seems to think this isn't mergeable @alexcrichton :/

steveklabnik · 2016-09-21T13:27:57Z

Actually, it appears it was just a bad cache, it's working now 👍

bors · 2016-09-21T15:12:38Z

⌛ Testing commit 3d8d557 with merge 53f9730...

add debug_assert_ne + assert_ne ~~✨ work in progress, please do not merge ✨~~ fixes #35073

bors · 2016-09-21T18:35:21Z

This improves navigation and code highlighting inside the following macros: assert!(a == b); debug_assert!(a == b); assert_eq!(a, b); debug_assert_eq!(a, b); assert_ne!(a, b); debug_assert_ne!(a, b); For assert! and debug_assert! format arguments are supported: assert!(a == b, "Some text"); assert!(a == b, "Text {} {} syntax", "with", "format"); Different parenthesis are supported: assert!(a == b); assert![a == b]; assert!{a == b}; Fixes intellij-rust#636 assert_ne! is stable since Rust 1.12. rust-lang/rust#35074

This improves navigation and code highlighting inside the following macros: assert!(a == b); debug_assert!(a == b); assert_eq!(a, b); debug_assert_eq!(a, b); assert_ne!(a, b); debug_assert_ne!(a, b); Format arguments are supported: assert!(a == b, "Text {} {} syntax", "with", "format"); assert!(a == b, "Some text"); assert_eq!(a, b, "Some text"); assert_ne!(a, b, "Some text"); Different parenthesis are supported: assert!(a == b); assert![a == b]; assert!{a == b}; Fixes intellij-rust#636 assert_ne! is stable since Rust 1.12. rust-lang/rust#35074

rust-highfive assigned aturon Jul 27, 2016

ashleygwilliams changed the title ~~[WIP] add debug_assert_ne~~ [WIP] add debug_assert_ne + assert_ne Jul 27, 2016

ashleygwilliams force-pushed the assert_ne branch from 9812ee7 to ee12bde Compare July 27, 2016 18:01

ashleygwilliams reviewed Jul 27, 2016
View reviewed changes

ashleygwilliams force-pushed the assert_ne branch from c469651 to 123a54a Compare August 17, 2016 23:24

ashleygwilliams changed the title ~~[WIP] add debug_assert_ne + assert_ne~~ add debug_assert_ne + assert_ne Aug 17, 2016

alexcrichton reviewed Aug 18, 2016
View reviewed changes

ashleygwilliams force-pushed the assert_ne branch from fa0eb14 to 3f404f4 Compare August 31, 2016 17:45

alexcrichton added the relnotes Marks issues that should be documented in the release notes of the next release. label Aug 31, 2016

ashleygwilliams force-pushed the assert_ne branch from 76ddf5d to ec8a8ef Compare August 31, 2016 21:35

ashleygwilliams force-pushed the assert_ne branch from 0bafa78 to 8960845 Compare September 2, 2016 16:30

alexcrichton reviewed Sep 2, 2016
View reviewed changes

ashleygwilliams force-pushed the assert_ne branch from 8960845 to 01d085b Compare September 2, 2016 16:33

alexcrichton mentioned this pull request Sep 3, 2016

Spurious incremental mkdir error #36238

Closed

add assert_ne and debug_assert_ne macros

3d8d557

ashleygwilliams force-pushed the assert_ne branch from 01d085b to 3d8d557 Compare September 21, 2016 12:39

bors added a commit that referenced this pull request Sep 21, 2016

Auto merge of #35074 - ashleygwilliams:assert_ne, r=steveklabnik

53f9730

add debug_assert_ne + assert_ne ~~✨ work in progress, please do not merge ✨~~ fixes #35073

bors merged commit 3d8d557 into rust-lang:master Sep 21, 2016

add debug_assert_ne + assert_ne #35074

add debug_assert_ne + assert_ne #35074

Conversation

ashleygwilliams commented Jul 27, 2016 • edited Loading

rust-highfive commented Jul 27, 2016

ashleygwilliams Jul 27, 2016

Choose a reason for hiding this comment

steveklabnik Jul 27, 2016

Choose a reason for hiding this comment

aturon Jul 27, 2016

Choose a reason for hiding this comment

alexcrichton Jul 28, 2016

Choose a reason for hiding this comment

ashleygwilliams commented Aug 17, 2016

steveklabnik commented Aug 17, 2016

ashleygwilliams commented Aug 17, 2016

alexcrichton Aug 18, 2016

Choose a reason for hiding this comment

ashleygwilliams Aug 31, 2016

Choose a reason for hiding this comment

alexcrichton commented Aug 31, 2016

ashleygwilliams commented Aug 31, 2016

bors commented Aug 31, 2016

bors commented Aug 31, 2016

alexcrichton commented Aug 31, 2016

alexcrichton commented Sep 1, 2016

bors commented Sep 1, 2016

bors commented Sep 1, 2016

bors commented Sep 1, 2016

steveklabnik commented Sep 1, 2016

alexcrichton commented Sep 1, 2016

alexcrichton commented Sep 1, 2016

ashleygwilliams commented Sep 1, 2016

ashleygwilliams commented Sep 1, 2016

alexcrichton commented Sep 2, 2016

ashleygwilliams commented Sep 2, 2016

alexcrichton Sep 2, 2016

Choose a reason for hiding this comment

ashleygwilliams commented Sep 2, 2016

alexcrichton commented Sep 2, 2016

bors commented Sep 2, 2016

bors commented Sep 2, 2016

bors commented Sep 3, 2016

steveklabnik commented Sep 3, 2016

bors commented Sep 3, 2016

steveklabnik commented Sep 21, 2016

steveklabnik commented Sep 21, 2016

bors commented Sep 21, 2016

steveklabnik commented Sep 21, 2016

steveklabnik commented Sep 21, 2016

bors commented Sep 21, 2016

bors commented Sep 21, 2016

ashleygwilliams commented Jul 27, 2016 •

edited

Loading