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.

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

Rollup of 10 pull requests #41901

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4d7c0b6
all queries use dep nodes
hackeryarn May 3, 2017
a12a55f
item_attrs
hackeryarn May 3, 2017
c72a16b
fn_arg_names
hackeryarn May 3, 2017
70c267f
Windows io::Error: also format NTSTATUS error codes
May 3, 2017
aa5a532
trait_of_item
hackeryarn May 4, 2017
03fe10d
impl_parent
hackeryarn May 4, 2017
5b71d76
moved metadata provider impls to decoder
hackeryarn May 4, 2017
5a7946d
is_foreign_item
hackeryarn May 5, 2017
d561d4c
propper trait of item impl
hackeryarn May 5, 2017
1f532bf
is_exported_symbol
hackeryarn May 8, 2017
dfb740f
removed unnecessary if
hackeryarn May 8, 2017
f383cbf
Update to the oxidized rust-installer
cuviper May 8, 2017
c9b2410
Use "rust-installer tarball" to create rustc-src too
cuviper May 8, 2017
49f793a
ci: Update android ndk and sdk
malbarbo May 6, 2017
8eaff4d
Force tool-rust-installer deps to build-only
cuviper May 9, 2017
35812d1
resolved merge conflicts
hackeryarn May 9, 2017
2e509d2
Add disabled android host builders
malbarbo May 5, 2017
84a40c1
ICH: Handle case of removed FileMaps.
michaelwoerister May 10, 2017
d23a650
compiletest: force GDB to print values in the Rust format.
eddyb May 10, 2017
7612727
Add `eprint!` and `eprintln!` macros to the prelude.
zackw Jan 21, 2017
07766f6
Revise the eprint(ln)! feature.
zackw Apr 13, 2017
4ab3bcb
Fix up stability annotations per feedback.
zackw Apr 20, 2017
a06f9a6
Remove debug message
est31 May 10, 2017
3305e74
Add test
May 3, 2017
2729b71
Don't use sanitize_sh with rust-installer
cuviper May 10, 2017
72588a2
Skip print-stdout-eprint-stderr test on emscripten
zackw May 10, 2017
1ffa6b7
Update RLS
nrc May 10, 2017
3187c48
Rollup merge of #41192 - zackw:eprintln, r=alexcrichton
frewsxcv May 11, 2017
8778d7f
Rollup merge of #41684 - jethrogb:feature/ntstatus, r=alexcrichton
frewsxcv May 11, 2017
d841313
Rollup merge of #41724 - achernyak:master, r=nikomatsakis
frewsxcv May 11, 2017
6f4567d
Rollup merge of #41843 - cuviper:oxidized-installer, r=alexcrichton
frewsxcv May 11, 2017
a17b15b
Rollup merge of #41863 - malbarbo:update-android-builder, r=alexcrichton
frewsxcv May 11, 2017
a4a07d4
Rollup merge of #41864 - malbarbo:android-docker, r=alexcrichton
frewsxcv May 11, 2017
7e38b09
Rollup merge of #41873 - michaelwoerister:fix-filemap-hash-lookup, r=…
frewsxcv May 11, 2017
7b29f90
Rollup merge of #41877 - eddyb:gdb-force-rust, r=michaelwoerister
frewsxcv May 11, 2017
42a3522
Rollup merge of #41889 - est31:master, r=estebank
frewsxcv May 11, 2017
59b40df
Rollup merge of #41900 - nrc:update-rls, r=Mark-Simulacrum
frewsxcv May 11, 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
Add test
  • Loading branch information
Jethro Beekman committed May 10, 2017
commit 3305e74979310fbf0521530d11105dbbb64ae409
14 changes: 14 additions & 0 deletions src/libstd/sys/windows/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,3 +317,17 @@ pub fn home_dir() -> Option<PathBuf> {
pub fn exit(code: i32) -> ! {
unsafe { c::ExitProcess(code as c::UINT) }
}

#[cfg(test)]
mod tests {
use io::Error;
use sys::c;

// tests `error_string` above
#[test]
fn ntstatus_error() {
const STATUS_UNSUCCESSFUL: u32 = 0xc000_0001;
assert!(!Error::from_raw_os_error(STATUS_UNSUCCESSFUL | c::FACILITY_NT_BIT as _)
.to_string().contains("FormatMessageW() returned error"));
}
}