Skip to content

Rollup of 10 pull requests #44676

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.

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

Closed
wants to merge 33 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
778d5f2
Add Cow<str> -> Box<Error> impls.
Sep 9, 2017
7859c9e
std: Document thread builder panics for nul bytes in thread names
bluss Sep 17, 2017
7b932d2
stabilized vec_splice (fixes #32310)
budziq Sep 16, 2017
6b167f9
Updated tracking issue for String::splice and its unstable-book entry
budziq Sep 17, 2017
2633b85
Replace str's transmute() calls with pointer casts
Ixrec Sep 17, 2017
38fa340
missed a 'mut'
Ixrec Sep 17, 2017
2787a28
Add `<*const T>::align_offset` and use it in `memchr`
oli-obk Sep 13, 2017
e47279f
Add more links and put the link character to the left
GuillaumeGomez Sep 17, 2017
ebd0e4f
Add Example of `IntoIterator` as Trait Bound to Docs
iwillspeak Sep 18, 2017
3cf28f3
Use DefId instead of NodeId as identifier in resolve_lifetime::Region.
michaelwoerister Aug 15, 2017
e6c9a53
incr.comp.: Compute hashes of all query results.
michaelwoerister Aug 14, 2017
3cc3ae2
incr.comp.: Move result fingerprinting to DepGraph::with_task().
michaelwoerister Sep 7, 2017
e3f9131
Fix issues uncovered by rebasing:
michaelwoerister Sep 12, 2017
b9816c5
incr.comp.: Already hash HIR bodies during metadata export so they do…
michaelwoerister Sep 13, 2017
67c84e0
incr.comp.: Use StableHash impls instead of functions for hashing mos…
michaelwoerister Sep 13, 2017
dd50173
incr.comp.: Initialize the CachingCodemapView in StableHashingContext…
michaelwoerister Sep 14, 2017
e567afb
incr.comp.: Initialize IGNORED_ATTRS in StableHashingContext lazily.
michaelwoerister Sep 14, 2017
ba6f93c
incr.comp.: Make the StableHashingContext mostly independent of the tcx.
michaelwoerister Sep 14, 2017
d5b1fee
incr.comp.: Remove tcx from StableHashingContext.
michaelwoerister Sep 14, 2017
74d6b85
incr.comp.: Fix rebase fallout.
michaelwoerister Sep 18, 2017
4961a8e
incr.comp.: Fix ICE caused by trying to hash INVALID_CRATE_NUM.
michaelwoerister Sep 18, 2017
90ce24a
Fix run button
GuillaumeGomez Sep 18, 2017
1f9b02b
ci: Use multiple codegen units on non-dist bots
alexcrichton Sep 18, 2017
2ab4840
Rollup merge of #44364 - michaelwoerister:hash-all-the-things2, r=nik…
alexcrichton Sep 18, 2017
0a3de32
Rollup merge of #44466 - clarcharr:cow_error, r=alexcrichton
alexcrichton Sep 18, 2017
1907827
Rollup merge of #44537 - oli-obk:memchr, r=alexcrichton
alexcrichton Sep 18, 2017
054a46e
Rollup merge of #44640 - budziq:stabilize_splice, r=dtolnay
alexcrichton Sep 18, 2017
fba954b
Rollup merge of #44651 - bluss:document-thread-name-no-nuls, r=stevek…
alexcrichton Sep 18, 2017
97990cd
Rollup merge of #44657 - Ixrec:patch-1, r=eddyb
alexcrichton Sep 18, 2017
8f998d3
Rollup merge of #44661 - GuillaumeGomez:more-links, r=QuietMisdreavus
alexcrichton Sep 18, 2017
196e8ae
Rollup merge of #44668 - iwillspeak:into-iterator-docs, r=steveklabnik
alexcrichton Sep 18, 2017
cfa32bf
Rollup merge of #44671 - GuillaumeGomez:run-button, r=steveklabnik
alexcrichton Sep 18, 2017
91f3adf
Rollup merge of #44675 - alexcrichton:many-cgu, r=aidanhs
alexcrichton Sep 18, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Cow<str> -> Box<Error> impls.
  • Loading branch information
Clar Charr committed Sep 10, 2017
commit 778d5f2074b05c013e15fabc25daf4e37a174bf7
15 changes: 15 additions & 0 deletions src/libstd/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

use alloc::allocator;
use any::TypeId;
use borrow::Cow;
use cell;
use char;
use fmt::{self, Debug, Display};
Expand Down Expand Up @@ -217,6 +218,20 @@ impl<'a> From<&'a str> for Box<Error> {
}
}

#[stable(feature = "cow_box_error", since = "1.22.0")]
impl<'a, 'b> From<Cow<'b, str>> for Box<Error + Send + Sync + 'a> {
fn from(err: Cow<'b, str>) -> Box<Error + Send + Sync + 'a> {
From::from(String::from(err))
}
}

#[stable(feature = "cow_box_error", since = "1.22.0")]
impl<'a> From<Cow<'a, str>> for Box<Error> {
fn from(err: Cow<'a, str>) -> Box<Error> {
From::from(String::from(err))
}
}

#[unstable(feature = "never_type_impls", issue = "35121")]
impl Error for ! {
fn description(&self) -> &str { *self }
Expand Down