Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve InternedString usability #40606

Merged
merged 2 commits into from
Mar 29, 2017
Merged

Improve InternedString usability #40606

merged 2 commits into from
Mar 29, 2017

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 17, 2017

No description provided.

@rust-highfive
Copy link
Collaborator

r? @arielb1

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

@oli-obk oli-obk changed the title InternedString usability Improve InternedString usability Mar 17, 2017
@bors
Copy link
Contributor

bors commented Mar 19, 2017

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

@bors
Copy link
Contributor

bors commented Mar 20, 2017

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

@eddyb
Copy link
Member

eddyb commented Mar 21, 2017

r? @jseyfried

@rust-highfive rust-highfive assigned jseyfried and unassigned arielb1 Mar 21, 2017
jseyfried
jseyfried reviewed Mar 21, 2017
View reviewed changes
Copy link
Contributor

@jseyfried jseyfried left a comment

Choose a reason for hiding this comment

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

r=me modulo Travis failure

src/libcollections/linked_list.rs Outdated
@@ -1376,7 +1376,7 @@ mod tests {
thread::spawn(move || {
check_links(&n);
let a: &[_] = &[&1, &2, &3];
assert_eq!(a, &n.iter().collect::<Vec<_>>()[..]);
assert_eq!(a, &n.iter().collect::<Vec<_>>());
Copy link
Contributor

Choose a reason for hiding this comment

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

This is causing Travis to fail -- the second argument isn't getting autoderefed.

@oli-obk oli-obk force-pushed the interned_str_usability branch from 2c287ea to 0d92734 Compare March 21, 2017 08:44
@bors
Copy link
Contributor

bors commented Mar 23, 2017

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

@oli-obk oli-obk force-pushed the interned_str_usability branch from 0d92734 to f0c6182 Compare March 24, 2017 12:05
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 24, 2017

travis likes this now

@bors
Copy link
Contributor

bors commented Mar 26, 2017

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

@jseyfried
Copy link
Contributor

@oli-obk needs another rebase -- ping me when ready.

@oli-obk oli-obk force-pushed the interned_str_usability branch from f0c6182 to eb447f4 Compare March 27, 2017 06:58
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 27, 2017

ping @jseyfried just a conflict with the now removed liblog

@jseyfried
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 27, 2017

📌 Commit eb447f4 has been approved by jseyfried

@bors
Copy link
Contributor

bors commented Mar 27, 2017

⌛ Testing commit eb447f4 with merge 49de875...

@bors
Copy link
Contributor

bors commented Mar 27, 2017

💔 Test failed - status-travis

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 27, 2017 •
edited
Loading

The compiler panicked while running some libstd tests on musl.

[01:17:04] error: process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i686-unknown-linux-musl/release/deps/std-d02fbe97fc497570` (signal: 11, SIGSEGV: invalid memory reference)
[01:17:04] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-j" "4" "--target" "i686-unknown-linux-musl" "--release" "--locked" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std:0.0.0" "-p" "rustc_msan:0.0.0" "-p" "alloc_system:0.0.0" "-p" "core:0.0.0" "-p" "unwind:0.0.0" "-p" "rustc_asan:0.0.0" "-p" "rustc_lsan:0.0.0" "-p" "collections:0.0.0" "-p" "rustc_tsan:0.0.0" "-p" "alloc:0.0.0" "-p" "libc:0.0.0" "-p" "rand:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "panic_abort:0.0.0" "-p" "std_unicode:0.0.0" "--"

spurious? Or some pre-existing bug? I didn't touch any unsafe code.

@alexcrichton
Copy link
Member

Unfortunately a spurious error -- #38618

@bors: retry

@alexcrichton alexcrichton mentioned this pull request Mar 27, 2017
Merged
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 27, 2017
@alexcrichton
Rollup merge of rust-lang#40606 - oli-obk:interned_str_usability, r=j…
666bb19 
…seyfried

Improve `InternedString` usability
bors added a commit that referenced this pull request Mar 27, 2017
@bors
Auto merge of #40867 - alexcrichton:rollup, r=alexcrichton
32a2d73 
Rollup of 19 pull requests

- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
bors added a commit that referenced this pull request Mar 28, 2017
@bors
Auto merge of #40867 - alexcrichton:rollup, r=alexcrichton
07a3429 
Rollup of 19 pull requests

- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
@bors bors merged commit eb447f4 into rust-lang:master Mar 29, 2017
@oli-obk oli-obk deleted the interned_str_usability branch March 29, 2017 07:07
@oli-obk oli-obk mentioned this pull request Mar 29, 2017
Merged
@zackmdavis
Copy link
Member

❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jseyfried jseyfried jseyfried left review comments

Assignees

@jseyfried jseyfried

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@oli-obk @rust-highfive @bors @eddyb @jseyfried @alexcrichton @zackmdavis @arielb1