diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-09-17 12:56:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-09-21 22:15:51 -0700 |
| commit | 0169218047dc989acf9ea25e3122b9c659acb6b3 (patch) | |
| tree | 8b1cd720a9e38c745359581e74d216a04e39e5ef /src/librustdoc | |
| parent | 087b9283a0ed8df68f47ab07a25e60bc6a3ca050 (diff) | |
Fix fallout from Vec stabilization
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 8 | ||||
| -rw-r--r-- | src/librustdoc/flock.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/render.rs | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index b4d44aab239..660b6c7ade2 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -505,7 +505,7 @@ fn external_path(cx: &DocContext, name: &str, substs: &subst::Substs) -> Path { .iter() .filter_map(|v| v.clean(cx)) .collect(); - let types = Vec::from_slice(substs.types.get_slice(subst::TypeSpace)); + let types = substs.types.get_slice(subst::TypeSpace).to_vec(); let types = types.clean(cx); Path { global: false, @@ -661,8 +661,8 @@ impl<'a> Clean<Generics> for (&'a ty::Generics, subst::ParamSpace) { fn clean(&self, cx: &DocContext) -> Generics { let (me, space) = *self; Generics { - type_params: Vec::from_slice(me.types.get_slice(space)).clean(cx), - lifetimes: Vec::from_slice(me.regions.get_slice(space)).clean(cx), + type_params: me.types.get_slice(space).to_vec().clean(cx), + lifetimes: me.regions.get_slice(space).to_vec().clean(cx), } } } @@ -991,7 +991,7 @@ impl Clean<Item> for ty::Method { self.fty.sig.clone()), s => { let sig = ty::FnSig { - inputs: Vec::from_slice(self.fty.sig.inputs.slice_from(1)), + inputs: self.fty.sig.inputs.slice_from(1).to_vec(), ..self.fty.sig.clone() }; let s = match s { diff --git a/src/librustdoc/flock.rs b/src/librustdoc/flock.rs index f05e8c7cd8b..8b72bd9e102 100644 --- a/src/librustdoc/flock.rs +++ b/src/librustdoc/flock.rs @@ -183,8 +183,8 @@ mod imp { impl Lock { pub fn new(p: &Path) -> Lock { - let p_16: Vec<u16> = p.as_str().unwrap().utf16_units().collect(); - let p_16 = p_16.append_one(0); + let mut p_16: Vec<u16> = p.as_str().unwrap().utf16_units().collect(); + p_16.push(0); let handle = unsafe { libc::CreateFileW(p_16.as_ptr(), libc::FILE_GENERIC_READ | diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index cf625d4ddfc..c831015e539 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -740,8 +740,9 @@ impl<'a> SourceCollector<'a> { root_path.push_str("../"); }); - cur.push(Vec::from_slice(p.filename().expect("source has no filename")) - .append(b".html")); + let mut fname = p.filename().expect("source has no filename").to_vec(); + fname.extend(".html".bytes()); + cur.push(fname); let mut w = BufferedWriter::new(try!(File::create(&cur))); let title = format!("{} -- source", cur.filename_display()); |
