use std::borrow::Cow;
-use syntax::{abi, ptr};
-use syntax::ast::{self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem,
- NestedMetaItemKind, Path, Visibility};
+use rustc_target::spec::abi;
+use syntax::ast::{
+ self, Attribute, CrateSugar, MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind, Path,
+ Visibility, VisibilityKind,
+};
use syntax::codemap::{BytePos, Span, NO_EXPANSION};
+use syntax::ptr;
-use config::Color;
use rewrite::RewriteContext;
use shape::Shape;
-// When we get scoped annotations, we should have rustfmt::skip.
-const SKIP_ANNOTATION: &str = "rustfmt_skip";
+pub const DEPR_SKIP_ANNOTATION: &str = "rustfmt_skip";
+pub const SKIP_ANNOTATION: &str = "rustfmt::skip";
+
+pub fn rewrite_ident<'a>(context: &'a RewriteContext, ident: ast::Ident) -> &'a str {
+ context.snippet(ident.span)
+}
// Computes the length of a string's last line, minus offset.
pub fn extra_offset(text: &str, shape: Shape) -> usize {
match text.rfind('\n') {
// 1 for newline character
- Some(idx) => text.len()
- .checked_sub(idx + 1 + shape.used_width())
- .unwrap_or(0),
+ Some(idx) => text.len().saturating_sub(idx + 1 + shape.used_width()),
None => text.len(),
}
}
+pub fn is_same_visibility(a: &Visibility, b: &Visibility) -> bool {
+ match (&a.node, &b.node) {
+ (
+ VisibilityKind::Restricted { path: p, .. },
+ VisibilityKind::Restricted { path: q, .. },
+ ) => format!("{}", p) == format!("{}", q),
+ (VisibilityKind::Public, VisibilityKind::Public)
+ | (VisibilityKind::Inherited, VisibilityKind::Inherited)
+ | (
+ VisibilityKind::Crate(CrateSugar::PubCrate),
+ VisibilityKind::Crate(CrateSugar::PubCrate),
+ )
+ | (
+ VisibilityKind::Crate(CrateSugar::JustCrate),
+ VisibilityKind::Crate(CrateSugar::JustCrate),
+ ) => true,
+ _ => false,
+ }
+}
+
// Uses Cow to avoid allocating in the common cases.
-pub fn format_visibility(vis: &Visibility) -> Cow<'static, str> {
- match *vis {
- Visibility::Public => Cow::from("pub "),
- Visibility::Inherited => Cow::from(""),
- Visibility::Crate(_, CrateSugar::PubCrate) => Cow::from("pub(crate) "),
- Visibility::Crate(_, CrateSugar::JustCrate) => Cow::from("crate "),
- Visibility::Restricted { ref path, .. } => {
+pub fn format_visibility(context: &RewriteContext, vis: &Visibility) -> Cow<'static, str> {
+ match vis.node {
+ VisibilityKind::Public => Cow::from("pub "),
+ VisibilityKind::Inherited => Cow::from(""),
+ VisibilityKind::Crate(CrateSugar::PubCrate) => Cow::from("pub(crate) "),
+ VisibilityKind::Crate(CrateSugar::JustCrate) => Cow::from("crate "),
+ VisibilityKind::Restricted { ref path, .. } => {
let Path { ref segments, .. } = **path;
- let mut segments_iter = segments.iter().map(|seg| seg.identifier.name.to_string());
+ let mut segments_iter = segments.iter().map(|seg| rewrite_ident(context, seg.ident));
if path.is_global() {
segments_iter
.next()
}
}
+#[inline]
+pub fn format_async(is_async: ast::IsAsync) -> &'static str {
+ match is_async {
+ ast::IsAsync::Async { .. } => "async ",
+ ast::IsAsync::NotAsync => "",
+ }
+}
+
#[inline]
pub fn format_constness(constness: ast::Constness) -> &'static str {
match constness {
}
}
+#[inline]
+pub fn format_auto(is_auto: ast::IsAuto) -> &'static str {
+ match is_auto {
+ ast::IsAuto::Yes => "auto ",
+ ast::IsAuto::No => "",
+ }
+}
+
#[inline]
pub fn format_mutability(mutability: ast::Mutability) -> &'static str {
match mutability {
filter_attributes(attrs, ast::AttrStyle::Outer)
}
+#[inline]
+pub fn is_single_line(s: &str) -> bool {
+ s.chars().find(|&c| c == '\n').is_none()
+}
+
+#[inline]
+pub fn first_line_contains_single_line_comment(s: &str) -> bool {
+ s.lines().next().map_or(false, |l| l.contains("//"))
+}
+
#[inline]
pub fn last_line_contains_single_line_comment(s: &str) -> bool {
s.lines().last().map_or(false, |l| l.contains("//"))
}
for c in s.chars().rev() {
match c {
- ')' | ']' | '}' | '?' => continue,
+ '(' | ')' | ']' | '}' | '?' | '>' => continue,
'\n' => break,
_ if c.is_whitespace() => continue,
_ => return false,
#[inline]
fn is_skip(meta_item: &MetaItem) -> bool {
match meta_item.node {
- MetaItemKind::Word => meta_item.name == SKIP_ANNOTATION,
+ MetaItemKind::Word => {
+ let path_str = meta_item.ident.to_string();
+ path_str == SKIP_ANNOTATION || path_str == DEPR_SKIP_ANNOTATION
+ }
MetaItemKind::List(ref l) => {
- meta_item.name == "cfg_attr" && l.len() == 2 && is_skip_nested(&l[1])
+ meta_item.name() == "cfg_attr" && l.len() == 2 && is_skip_nested(&l[1])
}
_ => false,
}
#[inline]
pub fn count_newlines(input: &str) -> usize {
- input.chars().filter(|&c| c == '\n').count()
-}
-
-#[inline]
-pub fn trim_newlines(input: &str) -> &str {
- match input.find(|c| c != '\n' && c != '\r') {
- Some(start) => {
- let end = input.rfind(|c| c != '\n' && c != '\r').unwrap_or(0) + 1;
- &input[start..end]
- }
- None => "",
- }
-}
-
-// Macro for deriving implementations of Serialize/Deserialize for enums
-#[macro_export]
-macro_rules! impl_enum_serialize_and_deserialize {
- ( $e:ident, $( $x:ident ),* ) => {
- impl ::serde::ser::Serialize for $e {
- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
- where S: ::serde::ser::Serializer
- {
- use serde::ser::Error;
-
- // We don't know whether the user of the macro has given us all options.
- #[allow(unreachable_patterns)]
- match *self {
- $(
- $e::$x => serializer.serialize_str(stringify!($x)),
- )*
- _ => {
- Err(S::Error::custom(format!("Cannot serialize {:?}", self)))
- }
- }
- }
- }
-
- impl<'de> ::serde::de::Deserialize<'de> for $e {
- fn deserialize<D>(d: D) -> Result<Self, D::Error>
- where D: ::serde::Deserializer<'de> {
- use serde::de::{Error, Visitor};
- use std::marker::PhantomData;
- use std::fmt;
- struct StringOnly<T>(PhantomData<T>);
- impl<'de, T> Visitor<'de> for StringOnly<T>
- where T: ::serde::Deserializer<'de> {
- type Value = String;
- fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- formatter.write_str("string")
- }
- fn visit_str<E>(self, value: &str) -> Result<String, E> {
- Ok(String::from(value))
- }
- }
- let s = d.deserialize_string(StringOnly::<D>(PhantomData))?;
- $(
- if stringify!($x).eq_ignore_ascii_case(&s) {
- return Ok($e::$x);
- }
- )*
- static ALLOWED: &'static[&str] = &[$(stringify!($x),)*];
- Err(D::Error::unknown_variant(&s, ALLOWED))
- }
- }
-
- impl ::std::str::FromStr for $e {
- type Err = &'static str;
-
- fn from_str(s: &str) -> Result<Self, Self::Err> {
- $(
- if stringify!($x).eq_ignore_ascii_case(s) {
- return Ok($e::$x);
- }
- )*
- Err("Bad variant")
- }
- }
-
- impl ::config::ConfigType for $e {
- fn doc_hint() -> String {
- let mut variants = Vec::new();
- $(
- variants.push(stringify!($x));
- )*
- format!("[{}]", variants.join("|"))
- }
- }
- };
-}
-
-macro_rules! msg {
- ($($arg:tt)*) => (
- match writeln!(&mut ::std::io::stderr(), $($arg)* ) {
- Ok(_) => {},
- Err(x) => panic!("Unable to write to stderr: {}", x),
- }
- )
+ // Using `as_bytes` to omit UTF-8 decoding
+ input.as_bytes().iter().filter(|&&c| c == b'\n').count()
}
// For format_missing and last_pos, need to use the source callsite (if applicable).
// Required as generated code spans aren't guaranteed to follow on from the last span.
macro_rules! source {
- ($this:ident, $sp: expr) => {
+ ($this:ident, $sp:expr) => {
$sp.source_callsite()
- }
+ };
}
pub fn mk_sp(lo: BytePos, hi: BytePos) -> Span {
// Return true if the given span does not intersect with file lines.
macro_rules! out_of_file_lines_range {
($self:ident, $span:expr) => {
- !$self.config
+ !$self.config.file_lines().is_all() && !$self
+ .config
.file_lines()
.intersects(&$self.codemap.lookup_line_range($span))
- }
+ };
}
macro_rules! skip_out_of_file_lines_range {
if out_of_file_lines_range!($self, $span) {
return None;
}
- }
+ };
}
macro_rules! skip_out_of_file_lines_range_visitor {
$self.push_rewrite($span, None);
return;
}
- }
+ };
}
// Wraps String in an Option. Returns Some when the string adheres to the
-// Rewrite constraints defined for the Rewrite trait and else otherwise.
+// Rewrite constraints defined for the Rewrite trait and None otherwise.
pub fn wrap_str(s: String, max_width: usize, shape: Shape) -> Option<String> {
if is_valid_str(&s, max_width, shape) {
Some(s)
}
#[inline]
-pub fn paren_overhead(context: &RewriteContext) -> usize {
- if context.config.spaces_within_parens_and_brackets() {
- 4
- } else {
- 2
- }
-}
-
pub fn left_most_sub_expr(e: &ast::Expr) -> &ast::Expr {
match e.node {
- ast::ExprKind::InPlace(ref e, _)
- | ast::ExprKind::Call(ref e, _)
+ ast::ExprKind::Call(ref e, _)
| ast::ExprKind::Binary(_, ref e, _)
| ast::ExprKind::Cast(ref e, _)
| ast::ExprKind::Type(ref e, _)
| ast::ExprKind::Assign(ref e, _)
| ast::ExprKind::AssignOp(_, ref e, _)
| ast::ExprKind::Field(ref e, _)
- | ast::ExprKind::TupField(ref e, _)
| ast::ExprKind::Index(ref e, _)
| ast::ExprKind::Range(Some(ref e), _, _)
| ast::ExprKind::Try(ref e) => left_most_sub_expr(e),
}
}
-// isatty shamelessly adapted from cargo.
-#[cfg(unix)]
-pub fn isatty() -> bool {
- extern crate libc;
-
- unsafe { libc::isatty(libc::STDOUT_FILENO) != 0 }
-}
-#[cfg(windows)]
-pub fn isatty() -> bool {
- extern crate kernel32;
- extern crate winapi;
-
- unsafe {
- let handle = kernel32::GetStdHandle(winapi::winbase::STD_OUTPUT_HANDLE);
- let mut out = 0;
- kernel32::GetConsoleMode(handle, &mut out) != 0
- }
-}
-
-pub fn use_colored_tty(color: Color) -> bool {
- match color {
- Color::Always => true,
- Color::Never => false,
- Color::Auto => isatty(),
- }
-}
-
+#[inline]
pub fn starts_with_newline(s: &str) -> bool {
s.starts_with('\n') || s.starts_with("\r\n")
}
+
+#[inline]
+pub fn first_line_ends_with(s: &str, c: char) -> bool {
+ s.lines().next().map_or(false, |l| l.ends_with(c))
+}
projects / rust.git / blobdiff