about summary refs log tree commit diff
path: root/src/libsyntax/parse/mod.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-12-18 13:43:46 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-12-18 20:02:12 +0530
commit9e953df6f05765679db074b8895ed2178d75eb26 (patch)
treee71174db4adcf4adf1709afb41ff3fc125d5c35b /src/libsyntax/parse/mod.rs
parent158a1bdd7dac47356a0cc44dd52308c7145f4afe (diff)
parent6c87b191580be9ecd5a99a34ef97375af0b9d659 (diff)
downloadrust-9e953df6f05765679db074b8895ed2178d75eb26.tar.gz
rust-9e953df6f05765679db074b8895ed2178d75eb26.zip
Rollup merge of #30420 - petrochenkov:owned2, r=nrc
Part of https://github.com/rust-lang/rust/pull/30095 not causing mysterious segfaults.

r? @nrc
Diffstat (limited to 'src/libsyntax/parse/mod.rs')
-rw-r--r--src/libsyntax/parse/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index ed87961e7f3..cff106f838a 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -671,7 +671,6 @@ mod tests {
     use super::*;
     use std::rc::Rc;
     use codemap::{Span, BytePos, Pos, Spanned, NO_EXPANSION};
-    use owned_slice::OwnedSlice;
     use ast::{self, TokenTree};
     use abi;
     use attr::{first_attr_value_str_by_name, AttrMetaMethods};
@@ -947,7 +946,7 @@ mod tests {
                                     abi::Rust,
                                     ast::Generics{ // no idea on either of these:
                                         lifetimes: Vec::new(),
-                                        ty_params: OwnedSlice::empty(),
+                                        ty_params: P::empty(),
                                         where_clause: ast::WhereClause {
                                             id: ast::DUMMY_NODE_ID,
                                             predicates: Vec::new(),