Skip to content

Rollup of 7 pull requests #43047

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 30 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5a97036
Convert Intos to Froms.
May 20, 2017
0d885ef
Update version numbers for From impls
ollie27 Jun 12, 2017
34ddc51
Don't allocate args in order to run find.
Mark-Simulacrum Jun 21, 2017
e1ce766
Clean up and restructure sanity checking.
Mark-Simulacrum Jun 21, 2017
f9957be
Remove 'static lifetimes from channels.
Mark-Simulacrum Jun 24, 2017
8b2e7d2
Cleanups to check code.
Mark-Simulacrum Jun 26, 2017
8394408
Cleanup compile.rs.
Mark-Simulacrum Jun 27, 2017
a40af83
Cleanup utils
Mark-Simulacrum Jun 27, 2017
24ea7ba
Cleanup dist
Mark-Simulacrum Jun 27, 2017
5751fea
Clippy lints
Mark-Simulacrum Jun 27, 2017
01d22a1
Update a few comments.
Mark-Simulacrum Jun 27, 2017
785e5c7
Clarify meaning of Build.cargo, Build.rustc.
Mark-Simulacrum Jun 27, 2017
2df56a6
Remove src_is_git, instead call method on rust_info directly.
Mark-Simulacrum Jun 27, 2017
1561b0c
Store positive instead of negative fail_fast.
Mark-Simulacrum Jun 27, 2017
5cfe2a8
Store verbosity on Build
Mark-Simulacrum Jun 27, 2017
ff796e7
Move targets, hosts, and build triple into Build.
Mark-Simulacrum Jun 27, 2017
e04754b
Use build.build instead of build.config.build
Mark-Simulacrum Jun 27, 2017
8ee6bdd
redox: symlink and readlink
ids1024 Jun 30, 2017
affe6e1
Ignore *.iml files
stepancheg Jun 30, 2017
3456608
Fix long line
ids1024 Jun 30, 2017
d68c3ab
Document unintuitive argument order for Vec::dedup_by relation
andersk Jul 3, 2017
dcd7c5f
Add a stability marker for core::cmp::Reverse.0
sfackler Jul 3, 2017
857d9db
README: note how to enable debugging for rustc
PlasmaPower Jul 4, 2017
0f8998d
Rollup merge of #42227 - ollie27:into_to_from, r=aturon
Mark-Simulacrum Jul 4, 2017
411188b
Rollup merge of #42975 - ids1024:symlink2, r=aturon
Mark-Simulacrum Jul 4, 2017
c868b24
Rollup merge of #42994 - stepancheg:ignore-iml, r=aturon
Mark-Simulacrum Jul 4, 2017
2b7cd5a
Rollup merge of #43041 - andersk:dedup_by, r=alexcrichton
Mark-Simulacrum Jul 4, 2017
1d0c2e9
Rollup merge of #43042 - Mark-Simulacrum:rustbuild-cleanup, r=alexcri…
Mark-Simulacrum Jul 4, 2017
5b86b35
Rollup merge of #43043 - sfackler:reverse-stability, r=Mark-Simulacrum
Mark-Simulacrum Jul 4, 2017
396d36c
Rollup merge of #43045 - PlasmaPower:patch-1, r=Mark-Simulacrum
Mark-Simulacrum Jul 4, 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
Convert Intos to Froms.
  • Loading branch information
Clar Charr authored and ollie27 committed Jun 21, 2017
commit 5a97036b6900ee208f90c52ceadcce606d497e93
6 changes: 3 additions & 3 deletions src/liballoc/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2009,9 +2009,9 @@ impl From<Box<str>> for String {
}

#[stable(feature = "box_from_str", since = "1.18.0")]
impl Into<Box<str>> for String {
fn into(self) -> Box<str> {
self.into_boxed_str()
impl From<String> for Box<str> {
fn from(s: String) -> Box<str> {
s.into_boxed_str()
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libstd/ffi/c_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,10 @@ impl From<Box<CStr>> for CString {
}

#[stable(feature = "box_from_c_string", since = "1.18.0")]
impl Into<Box<CStr>> for CString {
impl From<CString> for Box<CStr> {
#[inline]
fn into(self) -> Box<CStr> {
self.into_boxed_c_str()
fn from(s: CString) -> Box<CStr> {
s.into_boxed_c_str()
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libstd/ffi/os_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,9 @@ impl From<Box<OsStr>> for OsString {
}

#[stable(feature = "box_from_os_string", since = "1.18.0")]
impl Into<Box<OsStr>> for OsString {
fn into(self) -> Box<OsStr> {
self.into_boxed_os_str()
impl From<OsString> for Box<OsStr> {
fn from(s: OsString) -> Box<OsStr> {
s.into_boxed_os_str()
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libstd/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1349,9 +1349,9 @@ impl From<Box<Path>> for PathBuf {
}

#[stable(feature = "box_from_path_buf", since = "1.18.0")]
impl Into<Box<Path>> for PathBuf {
fn into(self) -> Box<Path> {
self.into_boxed_path()
impl From<PathBuf> for Box<Path> {
fn from(p: PathBuf) -> Box<Path> {
p.into_boxed_path()
}
}

Expand Down