Skip to content

Conversation

nrc
Copy link
Member

@nrc nrc commented May 8, 2017

No description provided.

@rust-highfive
Copy link
Contributor

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

@@ -1200,8 +1200,12 @@ fn num_overlap(a_start: usize, a_end: usize, b_start: usize, b_end:usize, inclus
} else {
0
};
(b_start..b_end + extra).contains(a_start) ||
(a_start..a_end + extra).contains(b_start)
return range_contains(b_start..b_end + extra, a_start) ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it not be simpler just to have the following? Maybe with a comment for clarity.

(b_start <= a_start && a_start < b_end + extra) ||
(a_start <= b_start && b_start < a_end + extra);

@arielb1
Copy link
Contributor

arielb1 commented May 9, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented May 9, 2017

📌 Commit 7120279 has been approved by arielb1

@arielb1
Copy link
Contributor

arielb1 commented May 9, 2017

Oh well. The multiple libcs cause the docs tests that use libc to fail:

[00:44:28] ---- /checkout/src/doc/unstable-book/src/language-features/allocator.md - allocator (line 15) stdout ----
[00:44:28] 	error[E0464]: multiple matching crates for `libc`
[00:44:28]   --> <anon>:23:1
[00:44:28]    |
[00:44:28] 23 | extern crate libc;
[00:44:28]    | ^^^^^^^^^^^^^^^^^^
[00:44:28]    |
[00:44:28]    = note: candidates:
[00:44:28]    = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-6ecacccb5bdc4911.rlib
[00:44:28]    = note: crate name: libc
[00:44:28]    = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-008601069b74251c.rlib
[00:44:28]    = note: crate name: libc
[00:44:28] 
[00:44:28] error[E0463]: can't find crate for `libc`
[00:44:28]   --> <anon>:23:1
[00:44:28]    |
[00:44:28] 23 | extern crate libc;
[00:44:28]    | ^^^^^^^^^^^^^^^^^^ can't find crate
[00:44:28] 
[00:44:28] error: aborting due to 2 previous errors
[00:44:28] 
[00:44:28] thread 'rustc' panicked at 'Box<Any>', /checkout/src/librustc_errors/lib.rs:454
[00:44:28] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:44:28] thread 'rustc' panicked at 'couldn't compile the test', /checkout/src/librustdoc/test.rs:275
[00:44:28] 
[00:44:28] ---- /checkout/src/doc/unstable-book/src/language-features/allocator.md - _code_allocator__code_ (line 15) stdout ----
[00:44:28] 	error[E0464]: multiple matching crates for `libc`
[00:44:28]   --> <anon>:23:1
[00:44:28]    |
[00:44:28] 23 | extern crate libc;
[00:44:28]    | ^^^^^^^^^^^^^^^^^^
[00:44:28]    |
[00:44:28]    = note: candidates:
[00:44:28]    = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-6ecacccb5bdc4911.rlib
[00:44:28]    = note: crate name: libc
[00:44:28]    = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-008601069b74251c.rlib
[00:44:28]    = note: crate name: libc
[00:44:28] 
[00:44:28] error[E0463]: can't find crate for `libc`
[00:44:28]   --> <anon>:23:1
[00:44:28]    |
[00:44:28] 23 | extern crate libc;
[00:44:28]    | ^^^^^^^^^^^^^^^^^^ can't find crate
[00:44:28] 
[00:44:28] error: aborting due to 2 previous errors
[00:44:28] 
[00:44:28] thread 'rustc' panicked at 'Box<Any>', /checkout/src/librustc_errors/lib.rs:454
[00:44:28] thread 'rustc' panicked at 'couldn't compile the test', /checkout/src/librustdoc/test.rs:275
[00:44:28] 
[00:44:28] 
[00:44:28] failures:
[00:44:28]     /checkout/src/doc/unstable-book/src/language-features/allocator.md - _code_allocator__code_ (line 15)
[00:44:28]     /checkout/src/doc/unstable-book/src/language-features/allocator.md - allocator (line 15)
[00:44:28] 
[00:44:28] test result: FAILED. 0 passed; 2 failed; 2 ignored; 0 measured

@bors r-

@arielb1 arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 9, 2017
@bors
Copy link
Collaborator

bors commented May 13, 2017

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

@nrc nrc closed this May 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants