bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

save-analysis: run rustfmt

Browse source
This commit is contained in:
Nick Cameron 2017-11-08 10:43:05 +13:00
parent 1328c29d4a
commit b98290cb1f
5 changed files with 945 additions and 767 deletions
Download patch file Download diff file Expand all files Collapse all files

325
src/librustc_save_analysis/sig.rs
View file

@ -35,9 +35,9 @@
//
// FIXME where clauses need implementing, defs/refs in generics are mostly missing.
use {SaveContext, id_from_def_id, id_from_node_id};
use {id_from_def_id, id_from_node_id, SaveContext};
use rls_data::{Signature, SigElement};
use rls_data::{SigElement, Signature};
use rustc::hir::def::Def;
use syntax::ast::{self, NodeId};
@ -75,36 +75,39 @@ pub fn variant_signature(variant: &ast::Variant, scx: &SaveContext) -> Option<Si
variant.node.make(0, None, scx).ok()
}
pub fn method_signature(id: NodeId,
ident: ast::Ident,
generics: &ast::Generics,
m: &ast::MethodSig,
scx: &SaveContext)
-> Option<Signature> {
pub fn method_signature(
id: NodeId,
ident: ast::Ident,
generics: &ast::Generics,
m: &ast::MethodSig,
scx: &SaveContext,
) -> Option<Signature> {
if !scx.config.signatures {
return None;
}
make_method_signature(id, ident, generics, m, scx).ok()
}
pub fn assoc_const_signature(id: NodeId,
ident: ast::Name,
ty: &ast::Ty,
default: Option<&ast::Expr>,
scx: &SaveContext)
-> Option<Signature> {
pub fn assoc_const_signature(
id: NodeId,
ident: ast::Name,
ty: &ast::Ty,
default: Option<&ast::Expr>,
scx: &SaveContext,
) -> Option<Signature> {
if !scx.config.signatures {
return None;
}
make_assoc_const_signature(id, ident, ty, default, scx).ok()
}
pub fn assoc_type_signature(id: NodeId,
ident: ast::Ident,
bounds: Option<&ast::TyParamBounds>,
default: Option<&ast::Ty>,
scx: &SaveContext)
-> Option<Signature> {
pub fn assoc_type_signature(
id: NodeId,
ident: ast::Ident,
bounds: Option<&ast::TyParamBounds>,
default: Option<&ast::Ty>,
scx: &SaveContext,
) -> Option<Signature> {
if !scx.config.signatures {
return None;
}
@ -117,11 +120,12 @@ trait Sig {
fn make(&self, offset: usize, id: Option<NodeId>, scx: &SaveContext) -> Result;
}
fn extend_sig(mut sig: Signature,
text: String,
defs: Vec<SigElement>,
refs: Vec<SigElement>)
-> Signature {
fn extend_sig(
mut sig: Signature,
text: String,
defs: Vec<SigElement>,
refs: Vec<SigElement>,
) -> Signature {
sig.text = text;
sig.defs.extend(defs.into_iter());
sig.refs.extend(refs.into_iter());
@ -142,8 +146,12 @@ fn merge_sigs(text: String, sigs: Vec<Signature>) -> Signature {
let (defs, refs): (Vec<_>, Vec<_>) = sigs.into_iter().map(|s| (s.defs, s.refs)).unzip();
result.defs.extend(defs.into_iter().flat_map(|ds| ds.into_iter()));
result.refs.extend(refs.into_iter().flat_map(|rs| rs.into_iter()));
result
.defs
.extend(defs.into_iter().flat_map(|ds| ds.into_iter()));
result
.refs
.extend(refs.into_iter().flat_map(|rs| rs.into_iter()));
result
}
@ -188,9 +196,7 @@ impl Sig for ast::Ty {
let text = format!("{}{}", prefix, nested.text);
Ok(replace_text(nested, text))
}
ast::TyKind::Never => {
Ok(text_sig("!".to_owned()))
},
ast::TyKind::Never => Ok(text_sig("!".to_owned())),
ast::TyKind::Tup(ref ts) => {
let mut text = "(".to_owned();
let mut defs = vec![];
@ -215,8 +221,11 @@ impl Sig for ast::Ty {
if !f.lifetimes.is_empty() {
// FIXME defs, bounds on lifetimes
text.push_str("for<");
text.push_str(&f.lifetimes.iter().map(|l|
l.lifetime.ident.to_string()).collect::<Vec<_>>().join(", "));
text.push_str(&f.lifetimes
.iter()
.map(|l| l.lifetime.ident.to_string())
.collect::<Vec<_>>()
.join(", "));
text.push('>');
}
@ -251,9 +260,7 @@ impl Sig for ast::Ty {
Ok(Signature { text, defs, refs })
}
ast::TyKind::Path(None, ref path) => {
path.make(offset, id, scx)
}
ast::TyKind::Path(None, ref path) => path.make(offset, id, scx),
ast::TyKind::Path(Some(ref qself), ref path) => {
let nested_ty = qself.ty.make(offset + 1, id, scx)?;
let prefix = if qself.position == 0 {
@ -325,11 +332,13 @@ impl Sig for ast::Item {
text.push_str("mut ");
}
let name = self.ident.to_string();
let defs = vec![SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
}];
let defs = vec![
SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
},
];
text.push_str(&name);
text.push_str(": ");
@ -346,11 +355,13 @@ impl Sig for ast::Item {
ast::ItemKind::Const(ref ty, ref expr) => {
let mut text = "const ".to_owned();
let name = self.ident.to_string();
let defs = vec![SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
}];
let defs = vec![
SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
},
];
text.push_str(&name);
text.push_str(": ");
@ -379,12 +390,7 @@ impl Sig for ast::Item {
}
text.push_str("fn ");
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push('(');
for i in &decl.inputs {
@ -413,11 +419,13 @@ impl Sig for ast::Item {
ast::ItemKind::Mod(ref _mod) => {
let mut text = "mod ".to_owned();
let name = self.ident.to_string();
let defs = vec![SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
}];
let defs = vec![
SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
},
];
text.push_str(&name);
// Could be either `mod foo;` or `mod foo { ... }`, but we'll just puck one.
text.push(';');
@ -430,12 +438,7 @@ impl Sig for ast::Item {
}
ast::ItemKind::Ty(ref ty, ref generics) => {
let text = "type ".to_owned();
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push_str(" = ");
let ty = ty.make(offset + sig.text.len(), id, scx)?;
@ -446,34 +449,19 @@ impl Sig for ast::Item {
}
ast::ItemKind::Enum(_, ref generics) => {
let text = "enum ".to_owned();
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push_str(" {}");
Ok(sig)
}
ast::ItemKind::Struct(_, ref generics) => {
let text = "struct ".to_owned();
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push_str(" {}");
Ok(sig)
}
ast::ItemKind::Union(_, ref generics) => {
let text = "union ".to_owned();
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push_str(" {}");
Ok(sig)
}
@ -488,12 +476,7 @@ impl Sig for ast::Item {
text.push_str("unsafe ");
}
text.push_str("trait ");
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
if !bounds.is_empty() {
sig.text.push_str(": ");
@ -515,13 +498,15 @@ impl Sig for ast::Item {
text.push_str(" for .. {}");
Ok(replace_text(trait_sig, text))
}
ast::ItemKind::Impl(unsafety,
polarity,
defaultness,
ref generics,
ref opt_trait,
ref ty,
_) => {
ast::ItemKind::Impl(
unsafety,
polarity,
defaultness,
ref generics,
ref opt_trait,
ref ty,
_,
) => {
let mut text = String::new();
if let ast::Defaultness::Default = defaultness {
text.push_str("default ");
@ -562,8 +547,7 @@ impl Sig for ast::Item {
ast::ItemKind::ExternCrate(_) => Err("extern crate"),
// FIXME should implement this (e.g., pub use).
ast::ItemKind::Use(_) => Err("import"),
ast::ItemKind::Mac(..) |
ast::ItemKind::MacroDef(_) => Err("Macro"),
ast::ItemKind::Mac(..) | ast::ItemKind::MacroDef(_) => Err("Macro"),
}
}
}
@ -573,19 +557,14 @@ impl Sig for ast::Path {
let def = scx.get_path_def(id.ok_or("Missing id for Path")?);
let (name, start, end) = match def {
Def::Label(..) |
Def::PrimTy(..) |
Def::SelfTy(..) |
Def::Err => {
Def::Label(..) | Def::PrimTy(..) | Def::SelfTy(..) | Def::Err => {
return Ok(Signature {
text: pprust::path_to_string(self),
defs: vec![],
refs: vec![],
})
}
Def::AssociatedConst(..) |
Def::Variant(..) |
Def::VariantCtor(..) => {
Def::AssociatedConst(..) | Def::Variant(..) | Def::VariantCtor(..) => {
let len = self.segments.len();
if len < 2 {
return Err("Bad path");
@ -635,9 +614,11 @@ impl Sig for ast::Generics {
if !l.bounds.is_empty() {
l_text.push_str(": ");
let bounds = l.bounds.iter().map(|l| {
l.ident.to_string()
}).collect::<Vec<_>>().join(" + ");
let bounds = l.bounds
.iter()
.map(|l| l.ident.to_string())
.collect::<Vec<_>>()
.join(" + ");
l_text.push_str(&bounds);
// FIXME add lifetime bounds refs.
}
@ -662,7 +643,11 @@ impl Sig for ast::Generics {
}
text.push('>');
Ok(Signature {text, defs, refs: vec![] })
Ok(Signature {
text,
defs,
refs: vec![],
})
}
}
@ -710,11 +695,7 @@ impl Sig for ast::Variant_ {
refs.extend(field_sig.refs.into_iter());
}
text.push('}');
Ok(Signature {
text,
defs,
refs,
})
Ok(Signature { text, defs, refs })
}
ast::VariantData::Tuple(ref fields, id) => {
let name_def = SigElement {
@ -733,11 +714,7 @@ impl Sig for ast::Variant_ {
refs.extend(field_sig.refs.into_iter());
}
text.push(')');
Ok(Signature {
text,
defs,
refs,
})
Ok(Signature { text, defs, refs })
}
ast::VariantData::Unit(id) => {
let name_def = SigElement {
@ -763,12 +740,7 @@ impl Sig for ast::ForeignItem {
let mut text = String::new();
text.push_str("fn ");
let mut sig = name_and_generics(text,
offset,
generics,
self.id,
self.ident,
scx)?;
let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
sig.text.push('(');
for i in &decl.inputs {
@ -800,11 +772,13 @@ impl Sig for ast::ForeignItem {
text.push_str("mut ");
}
let name = self.ident.to_string();
let defs = vec![SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
}];
let defs = vec![
SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
},
];
text.push_str(&name);
text.push_str(": ");
@ -816,11 +790,13 @@ impl Sig for ast::ForeignItem {
ast::ForeignItemKind::Ty => {
let mut text = "type ".to_owned();
let name = self.ident.to_string();
let defs = vec![SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
}];
let defs = vec![
SigElement {
id: id_from_node_id(self.id, scx),
start: offset + text.len(),
end: offset + text.len() + name.len(),
},
];
text.push_str(&name);
text.push(';');
@ -834,13 +810,14 @@ impl Sig for ast::ForeignItem {
}
}
fn name_and_generics(mut text: String,
offset: usize,
generics: &ast::Generics,
id: NodeId,
name: ast::Ident,
scx: &SaveContext)
-> Result {
fn name_and_generics(
mut text: String,
offset: usize,
generics: &ast::Generics,
id: NodeId,
name: ast::Ident,
scx: &SaveContext,
) -> Result {
let name = name.to_string();
let def = SigElement {
id: id_from_node_id(id, scx),
@ -855,19 +832,22 @@ fn name_and_generics(mut text: String,
}
fn make_assoc_type_signature(id: NodeId,
ident: ast::Ident,
bounds: Option<&ast::TyParamBounds>,
default: Option<&ast::Ty>,
scx: &SaveContext)
-> Result {
fn make_assoc_type_signature(
id: NodeId,
ident: ast::Ident,
bounds: Option<&ast::TyParamBounds>,
default: Option<&ast::Ty>,
scx: &SaveContext,
) -> Result {
let mut text = "type ".to_owned();
let name = ident.to_string();
let mut defs = vec![SigElement {
id: id_from_node_id(id, scx),
start: text.len(),
end: text.len() + name.len(),
}];
let mut defs = vec![
SigElement {
id: id_from_node_id(id, scx),
start: text.len(),
end: text.len() + name.len(),
},
];
let mut refs = vec![];
text.push_str(&name);
if let Some(bounds) = bounds {
@ -886,19 +866,22 @@ fn make_assoc_type_signature(id: NodeId,
Ok(Signature { text, defs, refs })
}
fn make_assoc_const_signature(id: NodeId,
ident: ast::Name,
ty: &ast::Ty,
default: Option<&ast::Expr>,
scx: &SaveContext)
-> Result {
fn make_assoc_const_signature(
id: NodeId,
ident: ast::Name,
ty: &ast::Ty,
default: Option<&ast::Expr>,
scx: &SaveContext,
) -> Result {
let mut text = "const ".to_owned();
let name = ident.to_string();
let mut defs = vec![SigElement {
id: id_from_node_id(id, scx),
start: text.len(),
end: text.len() + name.len(),
}];
let mut defs = vec![
SigElement {
id: id_from_node_id(id, scx),
start: text.len(),
end: text.len() + name.len(),
},
];
let mut refs = vec![];
text.push_str(&name);
text.push_str(": ");
@ -916,12 +899,13 @@ fn make_assoc_const_signature(id: NodeId,
Ok(Signature { text, defs, refs })
}
fn make_method_signature(id: NodeId,
ident: ast::Ident,
generics: &ast::Generics,
m: &ast::MethodSig,
scx: &SaveContext)
-> Result {
fn make_method_signature(
id: NodeId,
ident: ast::Ident,
generics: &ast::Generics,
m: &ast::MethodSig,
scx: &SaveContext,
) -> Result {
// FIXME code dup with function signature
let mut text = String::new();
if m.constness.node == ast::Constness::Const {
@ -937,12 +921,7 @@ fn make_method_signature(id: NodeId,
}
text.push_str("fn ");
let mut sig = name_and_generics(text,
0,
generics,
id,
ident,
scx)?;
let mut sig = name_and_generics(text, 0, generics, id, ident, scx)?;
sig.text.push('(');
for i in &m.decl.inputs {