mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use try blocks in rustc_codegen_ssa

Browse Source
This commit is contained in:
Taiki Endo 2019-03-14 23:12:56 +09:00
parent 2a8f6a7806
commit ab19e5870e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_codegen_ssa/back/linker.rs
View File

@ -382,20 +382,19 @@ impl<'a> Linker for GccLinker<'a> {
if self.sess.target.target.options.is_like_osx { if self.sess.target.target.options.is_like_osx {
// Write a plain, newline-separated list of symbols // Write a plain, newline-separated list of symbols
let res = (|| -> io::Result<()> { let res: io::Result<()> = try {
let mut f = BufWriter::new(File::create(&path)?); let mut f = BufWriter::new(File::create(&path)?);
for sym in self.info.exports[&crate_type].iter() { for sym in self.info.exports[&crate_type].iter() {
debug!(" _{}", sym); debug!(" _{}", sym);
writeln!(f, "_{}", sym)?; writeln!(f, "_{}", sym)?;
} }
Ok(()) };
})();
if let Err(e) = res { if let Err(e) = res {
self.sess.fatal(&format!("failed to write lib.def file: {}", e)); self.sess.fatal(&format!("failed to write lib.def file: {}", e));
} }
} else { } else {
// Write an LD version script // Write an LD version script
let res = (|| -> io::Result<()> { let res: io::Result<()> = try {
let mut f = BufWriter::new(File::create(&path)?); let mut f = BufWriter::new(File::create(&path)?);
writeln!(f, "{{\n global:")?; writeln!(f, "{{\n global:")?;
for sym in self.info.exports[&crate_type].iter() { for sym in self.info.exports[&crate_type].iter() {
@ -403,8 +402,7 @@ impl<'a> Linker for GccLinker<'a> {
writeln!(f, " {};", sym)?; writeln!(f, " {};", sym)?;
} }
writeln!(f, "\n local:\n *;\n}};")?; writeln!(f, "\n local:\n *;\n}};")?;
Ok(()) };
})();
if let Err(e) = res { if let Err(e) = res {
self.sess.fatal(&format!("failed to write version script: {}", e)); self.sess.fatal(&format!("failed to write version script: {}", e));
} }
@ -644,7 +642,7 @@ impl<'a> Linker for MsvcLinker<'a> {
tmpdir: &Path, tmpdir: &Path,
crate_type: CrateType) { crate_type: CrateType) {
let path = tmpdir.join("lib.def"); let path = tmpdir.join("lib.def");
let res = (|| -> io::Result<()> { let res: io::Result<()> = try {
let mut f = BufWriter::new(File::create(&path)?); let mut f = BufWriter::new(File::create(&path)?);
// Start off with the standard module name header and then go // Start off with the standard module name header and then go
@ -655,8 +653,7 @@ impl<'a> Linker for MsvcLinker<'a> {
debug!(" _{}", symbol); debug!(" _{}", symbol);
writeln!(f, " {}", symbol)?; writeln!(f, " {}", symbol)?;
} }
Ok(()) };
})();
if let Err(e) = res { if let Err(e) = res {
self.sess.fatal(&format!("failed to write lib.def file: {}", e)); self.sess.fatal(&format!("failed to write lib.def file: {}", e));
} }

1
src/librustc_codegen_ssa/lib.rs
View File

@ -7,6 +7,7 @@
#![feature(libc)] #![feature(libc)]
#![feature(rustc_diagnostic_macros)] #![feature(rustc_diagnostic_macros)]
#![feature(stmt_expr_attributes)] #![feature(stmt_expr_attributes)]
#![feature(try_blocks)]
#![feature(in_band_lifetimes)] #![feature(in_band_lifetimes)]
#![feature(nll)] #![feature(nll)]
#![allow(unused_attributes)] #![allow(unused_attributes)]