Skip to content

Improve InternedString usability - #40606

Merged
bors merged 2 commits into
rust-lang:masterfrom
oli-obk:interned_str_usability
Mar 29, 2017
Merged

Improve InternedString usability#40606
bors merged 2 commits into
rust-lang:masterfrom
oli-obk:interned_str_usability

Conversation

@oli-obk

@oli-obkoli-obk commented Mar 17, 2017

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Mar 17, 2017

Copy link
Copy Markdown
Contributor

r? @arielb1

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

@oli-obkoli-obk changed the title InternedString usabilityImprove InternedString usabilityMar 17, 2017
@bors

bors commented Mar 19, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

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

@eddyb

eddyb commented Mar 21, 2017

Copy link
Copy Markdown
Contributor

r? @jseyfried

jseyfried
jseyfried reviewed Mar 21, 2017
View reviewed changes

@jseyfriedjseyfried left a comment

Copy link
Copy Markdown
Contributor

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

Comment threadsrc/libcollections/linked_list.rs Outdated

@jseyfriedjseyfriedMar 21, 2017

Copy link
Copy Markdown
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-obkforce-pushed the interned_str_usability branch from 2c287ea to 0d92734CompareMarch 21, 2017 08:44
@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

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

@oli-obk
oli-obkforce-pushed the interned_str_usability branch from 0d92734 to f0c6182CompareMarch 24, 2017 12:05
@oli-obk

oli-obk commented Mar 24, 2017

Copy link
Copy Markdown
ContributorAuthor

travis likes this now

@bors

bors commented Mar 26, 2017

Copy link
Copy Markdown
Collaborator

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

@jseyfried

jseyfried commented Mar 27, 2017

Copy link
Copy Markdown
Contributor

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

@oli-obk
oli-obkforce-pushed the interned_str_usability branch from f0c6182 to eb447f4CompareMarch 27, 2017 06:58
@oli-obk

oli-obk commented Mar 27, 2017

Copy link
Copy Markdown
ContributorAuthor

ping @jseyfried just a conflict with the now removed liblog

@jseyfried

jseyfried commented Mar 27, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit eb447f4 has been approved by jseyfried

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit eb447f4 with merge 49de875...

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@oli-obk

oli-obk commented Mar 27, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Mar 27, 2017

Copy link
Copy Markdown
Member

Unfortunately a spurious error -- #38618

@bors: retry

@alexcrichtonalexcrichton 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 ofrust-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:masterMar 29, 2017
@oli-obk
oli-obk deleted the interned_str_usability branch March 29, 2017 07:07
@oli-obkoli-obk mentioned this pull request Mar 29, 2017
Merged
@zackmdavis

zackmdavis commented Jun 24, 2017

Copy link
Copy Markdown
Contributor

❤️

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

Reviewers

1 more reviewer
@jseyfriedjseyfriedjseyfried left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@jseyfriedjseyfried

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