bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #22975: alexcrichton/stabilize-ffi

Browse source 
Conflicts:
	src/librustc_trans/back/link.rs
	src/librustc_trans/lib.rs
This commit is contained in:
Alex Crichton 2015-03-06 15:37:14 -08:00
commit 2bd02ca837
11 changed files with 90 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustdoc/html/render.rs
View file

@ -38,7 +38,6 @@ use std::cell::RefCell;
use std::cmp::Ordering;
use std::collections::{HashMap, HashSet};
use std::default::Default;
use std::ffi::OsStr;
use std::fmt;
use std::fs::{self, File};
use std::io::prelude::*;
@ -761,7 +760,7 @@ impl<'a> SourceCollector<'a> {
let mut fname = p.file_name().expect("source has no filename")
.to_os_string();
fname.push_os_str(OsStr::from_str(".html"));
fname.push(".html");
cur.push(&fname);
let mut w = BufWriter::new(try!(File::create(&cur)));