Skip to content

Rollup of 10 pull requests #40629

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

Closed
frewsxcv wants to merge 36 commits into from
Closed

Rollup of 10 pull requests #40629

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
befeb04
Remove unused param from bootstrap::clean::rm_rf
mbrubeck Mar 15, 2017
9b89274
Fix const not displayed in rustdoc
GuillaumeGomez Mar 16, 2017
50cede0
documented order of conversion between u32 an ipv4addr
Mar 17, 2017
c96491f
Update libc to 0.2.21
malbarbo Mar 7, 2017
5798817
Fix c_char (u8 -> i8) definition for i686-linux-android
malbarbo Mar 16, 2017
3435c60
Fix libc::bind call on aarch64-linux-android
malbarbo Mar 17, 2017
963d4df
minor wording tweak to slice::{as_ptr, as_mut_ptr}
QuietMisdreavus Mar 17, 2017
ec8ecf4
Fix typo in mutex.rs docs
ScottAbbey Mar 17, 2017
33a5665
Stabilize move_cell feature, closes #39264
aturon Mar 15, 2017
65b7c4e
Stabilize expect_err feature, closes #39041
aturon Mar 15, 2017
d38ea8b
Stabilize ptr_unaligned feature, closes #37955
aturon Mar 15, 2017
9511fe6
Stabilize process_abort feature, closes #37838
aturon Mar 15, 2017
10510ae
Stabilize ptr_eq feature, closes #36497
aturon Mar 15, 2017
37b38a2
Stabilize btree_range, closes #27787
aturon Mar 15, 2017
48890d4
Stabilize ordering_chaining, closes #37053
aturon Mar 15, 2017
a8f4a1b
Stabilize rc_raw feature, closes #37197
aturon Mar 15, 2017
1241a88
Minor fixups to fix tidy errors
alexcrichton Mar 15, 2017
2976ddb
Fix a spelling error in HashMap documentation, and slightly reword it…
jswalden Mar 18, 2017
db00ba9
Fix race condition in fs::create_dir_all
droundy Dec 1, 2015
0ec28b7
Fix new version of `create_dir_all`
dpc Mar 11, 2017
f2adee7
Add `concurrent_recursive_mkdir` test
dpc Mar 13, 2017
a51c6aa
Break line longer than 100 characters
dpc Mar 14, 2017
c3e2eaf
Fix problems found on Windows in `dir_create_all`
dpc Mar 15, 2017
bcae6a3
Reorder match checks in `create_dir_all`
dpc Mar 15, 2017
b5d590b
Fix `create_dir_all("")`
dpc Mar 15, 2017
9fb737b
Update the cargo submodule again
alexcrichton Mar 18, 2017
8dbe1c7
Rollup merge of #39799 - dpc:create_dir_all, r=alexcrichton
frewsxcv Mar 18, 2017
d85ed11
Rollup merge of #40317 - malbarbo:update-libc, r=alexcrichton
frewsxcv Mar 18, 2017
46a9dcc
Rollup merge of #40538 - aturon:stab-1.17, r=alexcrichton
frewsxcv Mar 18, 2017
89c7d45
Rollup merge of #40562 - mbrubeck:bootstrap, r=alexcrichton
frewsxcv Mar 18, 2017
632eb11
Rollup merge of #40564 - GuillaumeGomez:rustdoc-const, r=frewsxcv
frewsxcv Mar 18, 2017
99b8b6a
Rollup merge of #40590 - z1mvader:master, r=steveklabnik
frewsxcv Mar 18, 2017
4407289
Rollup merge of #40603 - QuietMisdreavus:slice-ptr-docs, r=GuillaumeG…
frewsxcv Mar 18, 2017
3d107f6
Rollup merge of #40611 - ScottAbbey:patch-1, r=GuillaumeGomez
frewsxcv Mar 18, 2017
f59a0f6
Rollup merge of #40621 - jswalden:dependant-spelling-fix, r=sfackler
frewsxcv Mar 18, 2017
01937b1
Rollup merge of #40625 - alexcrichton:update-cargo-again, r=alexcrichton
frewsxcv Mar 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
Prev Previous commit
Next Next commit
Fix c_char (u8 -> i8) definition for i686-linux-android
  • Loading branch information
@malbarbo
malbarbo committed Mar 17, 2017
commit 579881748c05ea30847f20a5b16a37662a92e89a
10 changes: 6 additions & 4 deletions src/libstd/os/raw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@

use fmt;

#[cfg(any(target_os = "android",
target_os = "emscripten",
#[cfg(any(target_os = "emscripten",
all(target_os = "linux", any(target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "s390x")),
all(target_os = "android", any(target_arch = "aarch64",
target_arch = "arm")),
all(target_os = "fuchsia", target_arch = "aarch64")))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8;
#[cfg(not(any(target_os = "android",
target_os = "emscripten",
#[cfg(not(any(target_os = "emscripten",
all(target_os = "linux", any(target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "s390x")),
all(target_os = "android", any(target_arch = "aarch64",
target_arch = "arm")),
all(target_os = "fuchsia", target_arch = "aarch64"))))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8;
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8;
Expand Down