1
Fork 0

Remove unnecessary explicit lifetime bounds.

These explicit lifetimes can be ommitted because of lifetime elision
rules. Instances were found using rust-clippy.
This commit is contained in:
Corey Farwell 2016-02-17 20:20:41 -05:00
parent 4d3eebff9d
commit 5850d16d52
10 changed files with 41 additions and 41 deletions

View file

@ -115,7 +115,7 @@ impl<N:Debug,E:Debug> Graph<N,E> {
// Simple accessors // Simple accessors
#[inline] #[inline]
pub fn all_nodes<'a>(&'a self) -> &'a [Node<N>] { pub fn all_nodes(&self) -> &[Node<N>] {
&self.nodes &self.nodes
} }
@ -125,7 +125,7 @@ impl<N:Debug,E:Debug> Graph<N,E> {
} }
#[inline] #[inline]
pub fn all_edges<'a>(&'a self) -> &'a [Edge<E>] { pub fn all_edges(&self) -> &[Edge<E>] {
&self.edges &self.edges
} }
@ -150,15 +150,15 @@ impl<N:Debug,E:Debug> Graph<N,E> {
idx idx
} }
pub fn mut_node_data<'a>(&'a mut self, idx: NodeIndex) -> &'a mut N { pub fn mut_node_data(&mut self, idx: NodeIndex) -> &mut N {
&mut self.nodes[idx.0].data &mut self.nodes[idx.0].data
} }
pub fn node_data<'a>(&'a self, idx: NodeIndex) -> &'a N { pub fn node_data(&self, idx: NodeIndex) -> &N {
&self.nodes[idx.0].data &self.nodes[idx.0].data
} }
pub fn node<'a>(&'a self, idx: NodeIndex) -> &'a Node<N> { pub fn node(&self, idx: NodeIndex) -> &Node<N> {
&self.nodes[idx.0] &self.nodes[idx.0]
} }
@ -199,15 +199,15 @@ impl<N:Debug,E:Debug> Graph<N,E> {
return idx; return idx;
} }
pub fn mut_edge_data<'a>(&'a mut self, idx: EdgeIndex) -> &'a mut E { pub fn mut_edge_data(&mut self, idx: EdgeIndex) -> &mut E {
&mut self.edges[idx.0].data &mut self.edges[idx.0].data
} }
pub fn edge_data<'a>(&'a self, idx: EdgeIndex) -> &'a E { pub fn edge_data(&self, idx: EdgeIndex) -> &E {
&self.edges[idx.0].data &self.edges[idx.0].data
} }
pub fn edge<'a>(&'a self, idx: EdgeIndex) -> &'a Edge<E> { pub fn edge(&self, idx: EdgeIndex) -> &Edge<E> {
&self.edges[idx.0] &self.edges[idx.0]
} }
@ -257,11 +257,11 @@ impl<N:Debug,E:Debug> Graph<N,E> {
AdjacentEdges { graph: self, direction: direction, next: first_edge } AdjacentEdges { graph: self, direction: direction, next: first_edge }
} }
pub fn successor_nodes<'a>(&'a self, source: NodeIndex) -> AdjacentTargets<N,E> { pub fn successor_nodes(&self, source: NodeIndex) -> AdjacentTargets<N,E> {
self.outgoing_edges(source).targets() self.outgoing_edges(source).targets()
} }
pub fn predecessor_nodes<'a>(&'a self, target: NodeIndex) -> AdjacentSources<N,E> { pub fn predecessor_nodes(&self, target: NodeIndex) -> AdjacentSources<N,E> {
self.incoming_edges(target).sources() self.incoming_edges(target).sources()
} }

View file

@ -91,14 +91,14 @@ impl<D:SnapshotVecDelegate> SnapshotVec<D> {
len len
} }
pub fn get<'a>(&'a self, index: usize) -> &'a D::Value { pub fn get(&self, index: usize) -> &D::Value {
&self.values[index] &self.values[index]
} }
/// Returns a mutable pointer into the vec; whatever changes you make here cannot be undone /// Returns a mutable pointer into the vec; whatever changes you make here cannot be undone
/// automatically, so you should be sure call `record()` with some sort of suitable undo /// automatically, so you should be sure call `record()` with some sort of suitable undo
/// action. /// action.
pub fn get_mut<'a>(&'a mut self, index: usize) -> &'a mut D::Value { pub fn get_mut(&mut self, index: usize) -> &mut D::Value {
&mut self.values[index] &mut self.values[index]
} }

View file

@ -261,12 +261,12 @@ impl AttrBuilder {
} }
} }
pub fn arg<'a, T: AttrHelper + 'static>(&'a mut self, idx: usize, a: T) -> &'a mut AttrBuilder { pub fn arg<T: AttrHelper + 'static>(&mut self, idx: usize, a: T) -> &mut AttrBuilder {
self.attrs.push((idx, box a as Box<AttrHelper+'static>)); self.attrs.push((idx, box a as Box<AttrHelper+'static>));
self self
} }
pub fn ret<'a, T: AttrHelper + 'static>(&'a mut self, a: T) -> &'a mut AttrBuilder { pub fn ret<T: AttrHelper + 'static>(&mut self, a: T) -> &mut AttrBuilder {
self.attrs.push((ReturnIndex as usize, box a as Box<AttrHelper+'static>)); self.attrs.push((ReturnIndex as usize, box a as Box<AttrHelper+'static>));
self self
} }

View file

@ -1289,7 +1289,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
span: Span, span: Span,
lp: LastPrivate) lp: LastPrivate)
-> ResolveResult<(Module<'a>, LastPrivate)> { -> ResolveResult<(Module<'a>, LastPrivate)> {
fn search_parent_externals<'a>(needle: Name, module: Module<'a>) -> Option<Module<'a>> { fn search_parent_externals(needle: Name, module: Module) -> Option<Module> {
match module.resolve_name(needle, TypeNS, false) { match module.resolve_name(needle, TypeNS, false) {
Success(binding) if binding.is_extern_crate() => Some(module), Success(binding) if binding.is_extern_crate() => Some(module),
_ => match module.parent_link { _ => match module.parent_link {
@ -3513,10 +3513,10 @@ fn path_names_to_string(path: &Path, depth: usize) -> String {
} }
/// A somewhat inefficient routine to obtain the name of a module. /// A somewhat inefficient routine to obtain the name of a module.
fn module_to_string<'a>(module: Module<'a>) -> String { fn module_to_string(module: Module) -> String {
let mut names = Vec::new(); let mut names = Vec::new();
fn collect_mod<'a>(names: &mut Vec<ast::Name>, module: Module<'a>) { fn collect_mod(names: &mut Vec<ast::Name>, module: Module) {
match module.parent_link { match module.parent_link {
NoParentLink => {} NoParentLink => {}
ModuleParentLink(ref module, name) => { ModuleParentLink(ref module, name) => {

View file

@ -30,9 +30,9 @@ pub trait UnicodeStr {
fn split_whitespace<'a>(&'a self) -> SplitWhitespace<'a>; fn split_whitespace<'a>(&'a self) -> SplitWhitespace<'a>;
fn is_whitespace(&self) -> bool; fn is_whitespace(&self) -> bool;
fn is_alphanumeric(&self) -> bool; fn is_alphanumeric(&self) -> bool;
fn trim<'a>(&'a self) -> &'a str; fn trim(&self) -> &str;
fn trim_left<'a>(&'a self) -> &'a str; fn trim_left(&self) -> &str;
fn trim_right<'a>(&'a self) -> &'a str; fn trim_right(&self) -> &str;
} }
impl UnicodeStr for str { impl UnicodeStr for str {

View file

@ -1227,7 +1227,7 @@ impl<'a> Index<&'a str> for Json {
impl Index<usize> for Json { impl Index<usize> for Json {
type Output = Json; type Output = Json;
fn index<'a>(&'a self, idx: usize) -> &'a Json { fn index(&self, idx: usize) -> &Json {
match *self { match *self {
Json::Array(ref v) => &v[idx], Json::Array(ref v) => &v[idx],
_ => panic!("can only index Json with usize if it is an array") _ => panic!("can only index Json with usize if it is an array")
@ -1309,7 +1309,7 @@ impl Stack {
/// Provides access to the StackElement at a given index. /// Provides access to the StackElement at a given index.
/// lower indices are at the bottom of the stack while higher indices are /// lower indices are at the bottom of the stack while higher indices are
/// at the top. /// at the top.
pub fn get<'l>(&'l self, idx: usize) -> StackElement<'l> { pub fn get(&self, idx: usize) -> StackElement {
match self.stack[idx] { match self.stack[idx] {
InternalIndex(i) => StackElement::Index(i), InternalIndex(i) => StackElement::Index(i),
InternalKey(start, size) => { InternalKey(start, size) => {
@ -1351,7 +1351,7 @@ impl Stack {
} }
/// Returns the top-most element (if any). /// Returns the top-most element (if any).
pub fn top<'l>(&'l self) -> Option<StackElement<'l>> { pub fn top(&self) -> Option<StackElement> {
match self.stack.last() { match self.stack.last() {
None => None, None => None,
Some(&InternalIndex(i)) => Some(StackElement::Index(i)), Some(&InternalIndex(i)) => Some(StackElement::Index(i)),
@ -1463,7 +1463,7 @@ impl<T: Iterator<Item=char>> Parser<T> {
/// Provides access to the current position in the logical structure of the /// Provides access to the current position in the logical structure of the
/// JSON stream. /// JSON stream.
pub fn stack<'l>(&'l self) -> &'l Stack { pub fn stack(&self) -> &Stack {
&self.stack &self.stack
} }

View file

@ -403,10 +403,10 @@ enum Flavor<T> {
#[doc(hidden)] #[doc(hidden)]
trait UnsafeFlavor<T> { trait UnsafeFlavor<T> {
fn inner_unsafe(&self) -> &UnsafeCell<Flavor<T>>; fn inner_unsafe(&self) -> &UnsafeCell<Flavor<T>>;
unsafe fn inner_mut<'a>(&'a self) -> &'a mut Flavor<T> { unsafe fn inner_mut(&self) -> &mut Flavor<T> {
&mut *self.inner_unsafe().get() &mut *self.inner_unsafe().get()
} }
unsafe fn inner<'a>(&'a self) -> &'a Flavor<T> { unsafe fn inner(&self) -> &Flavor<T> {
&*self.inner_unsafe().get() &*self.inner_unsafe().get()
} }
} }

View file

@ -55,11 +55,11 @@ pub struct TtReader<'a> {
/// This can do Macro-By-Example transcription. On the other hand, if /// This can do Macro-By-Example transcription. On the other hand, if
/// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can /// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can
/// (and should) be None. /// (and should) be None.
pub fn new_tt_reader<'a>(sp_diag: &'a Handler, pub fn new_tt_reader(sp_diag: &Handler,
interp: Option<HashMap<Name, Rc<NamedMatch>>>, interp: Option<HashMap<Name, Rc<NamedMatch>>>,
imported_from: Option<Ident>, imported_from: Option<Ident>,
src: Vec<ast::TokenTree>) src: Vec<ast::TokenTree>)
-> TtReader<'a> { -> TtReader {
new_tt_reader_with_doc_flag(sp_diag, interp, imported_from, src, false) new_tt_reader_with_doc_flag(sp_diag, interp, imported_from, src, false)
} }
@ -69,12 +69,12 @@ pub fn new_tt_reader<'a>(sp_diag: &'a Handler,
/// This can do Macro-By-Example transcription. On the other hand, if /// This can do Macro-By-Example transcription. On the other hand, if
/// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can /// `src` contains no `TokenTree::Sequence`s, `MatchNt`s or `SubstNt`s, `interp` can
/// (and should) be None. /// (and should) be None.
pub fn new_tt_reader_with_doc_flag<'a>(sp_diag: &'a Handler, pub fn new_tt_reader_with_doc_flag(sp_diag: &Handler,
interp: Option<HashMap<Name, Rc<NamedMatch>>>, interp: Option<HashMap<Name, Rc<NamedMatch>>>,
imported_from: Option<Ident>, imported_from: Option<Ident>,
src: Vec<ast::TokenTree>, src: Vec<ast::TokenTree>,
desugar_doc_comments: bool) desugar_doc_comments: bool)
-> TtReader<'a> { -> TtReader {
let mut r = TtReader { let mut r = TtReader {
sp_diag: sp_diag, sp_diag: sp_diag,
stack: vec!(TtFrame { stack: vec!(TtFrame {

View file

@ -211,10 +211,10 @@ pub trait Terminal: Write {
fn reset(&mut self) -> io::Result<bool>; fn reset(&mut self) -> io::Result<bool>;
/// Gets an immutable reference to the stream inside /// Gets an immutable reference to the stream inside
fn get_ref<'a>(&'a self) -> &'a Self::Output; fn get_ref(&self) -> &Self::Output;
/// Gets a mutable reference to the stream inside /// Gets a mutable reference to the stream inside
fn get_mut<'a>(&'a mut self) -> &'a mut Self::Output; fn get_mut(&mut self) -> &mut Self::Output;
/// Returns the contained stream, destroying the `Terminal` /// Returns the contained stream, destroying the `Terminal`
fn into_inner(self) -> Self::Output where Self: Sized; fn into_inner(self) -> Self::Output where Self: Sized;

View file

@ -205,11 +205,11 @@ impl<T: Write + Send> Terminal for TerminfoTerminal<T> {
self.out.write_all(&cmd).and(Ok(true)) self.out.write_all(&cmd).and(Ok(true))
} }
fn get_ref<'a>(&'a self) -> &'a T { fn get_ref(&self) -> &T {
&self.out &self.out
} }
fn get_mut<'a>(&'a mut self) -> &'a mut T { fn get_mut(&mut self) -> &mut T {
&mut self.out &mut self.out
} }