mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-01 15:01:51 +00:00
Auto merge of #34541 - jseyfried:rollup, r=jseyfried
Rollup of 5 pull requests - Successful merges: #34105, #34305, #34512, ~~#34531,~~ #34547
This commit is contained in:
commit
85c31af981
2
configure
vendored
2
configure
vendored
@ -1726,7 +1726,7 @@ do
|
||||
msg "configuring LLVM with:"
|
||||
msg "$CMAKE_ARGS"
|
||||
|
||||
(cd $LLVM_BUILD_DIR && eval "$CFG_CMAKE" $CMAKE_ARGS)
|
||||
(cd $LLVM_BUILD_DIR && eval "\"$CFG_CMAKE\"" $CMAKE_ARGS)
|
||||
need_ok "LLVM cmake configure failed"
|
||||
fi
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
use core::clone::Clone;
|
||||
use core::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
|
||||
use core::convert::AsRef;
|
||||
use core::default::Default;
|
||||
use core::hash::{Hash, Hasher};
|
||||
use core::marker::Sized;
|
||||
use core::ops::Deref;
|
||||
@ -248,6 +249,16 @@ impl<'a, B: ?Sized> fmt::Display for Cow<'a, B>
|
||||
}
|
||||
}
|
||||
|
||||
#[stable(feature = "default", since = "1.11.0")]
|
||||
impl<'a, B: ?Sized> Default for Cow<'a, B>
|
||||
where B: ToOwned,
|
||||
<B as ToOwned>::Owned: Default
|
||||
{
|
||||
fn default() -> Cow<'a, B> {
|
||||
Owned(<B as ToOwned>::Owned::default())
|
||||
}
|
||||
}
|
||||
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
impl<'a, B: ?Sized> Hash for Cow<'a, B> where B: Hash + ToOwned {
|
||||
#[inline]
|
||||
|
@ -432,7 +432,6 @@ pub fn build_impl<'a, 'tcx>(cx: &DocContext,
|
||||
ret.push(clean::Item {
|
||||
inner: clean::ImplItem(clean::Impl {
|
||||
unsafety: hir::Unsafety::Normal, // FIXME: this should be decoded
|
||||
derived: clean::detect_derived(&attrs),
|
||||
provided_trait_methods: provided,
|
||||
trait_: trait_,
|
||||
for_: for_,
|
||||
|
@ -2239,14 +2239,9 @@ pub struct Impl {
|
||||
pub trait_: Option<Type>,
|
||||
pub for_: Type,
|
||||
pub items: Vec<Item>,
|
||||
pub derived: bool,
|
||||
pub polarity: Option<ImplPolarity>,
|
||||
}
|
||||
|
||||
fn detect_derived<M: AttrMetaMethods>(attrs: &[M]) -> bool {
|
||||
attr::contains_name(attrs, "automatically_derived")
|
||||
}
|
||||
|
||||
impl Clean<Vec<Item>> for doctree::Impl {
|
||||
fn clean(&self, cx: &DocContext) -> Vec<Item> {
|
||||
let mut ret = Vec::new();
|
||||
@ -2283,7 +2278,6 @@ impl Clean<Vec<Item>> for doctree::Impl {
|
||||
trait_: trait_,
|
||||
for_: self.for_.clean(cx),
|
||||
items: items,
|
||||
derived: detect_derived(&self.attrs),
|
||||
polarity: Some(self.polarity.clean(cx)),
|
||||
}),
|
||||
});
|
||||
|
@ -399,7 +399,6 @@ fn init_ids() -> HashMap<String, usize> {
|
||||
"methods",
|
||||
"deref-methods",
|
||||
"implementations",
|
||||
"derived_implementations"
|
||||
].into_iter().map(|id| (String::from(*id), 1)).collect()
|
||||
}
|
||||
|
||||
@ -2527,25 +2526,11 @@ fn render_assoc_items(w: &mut fmt::Formatter,
|
||||
}
|
||||
write!(w, "<h2 id='implementations'>Trait \
|
||||
Implementations</h2>")?;
|
||||
let (derived, manual): (Vec<_>, Vec<&Impl>) = traits.iter().partition(|i| {
|
||||
i.inner_impl().derived
|
||||
});
|
||||
for i in &manual {
|
||||
for i in &traits {
|
||||
let did = i.trait_did().unwrap();
|
||||
let assoc_link = AssocItemLink::GotoSource(did, &i.inner_impl().provided_trait_methods);
|
||||
render_impl(w, cx, i, assoc_link, true, containing_item.stable_since())?;
|
||||
}
|
||||
if !derived.is_empty() {
|
||||
write!(w, "<h3 id='derived_implementations'>\
|
||||
Derived Implementations \
|
||||
</h3>")?;
|
||||
for i in &derived {
|
||||
let did = i.trait_did().unwrap();
|
||||
let assoc_link = AssocItemLink::GotoSource(did,
|
||||
&i.inner_impl().provided_trait_methods);
|
||||
render_impl(w, cx, i, assoc_link, true, containing_item.stable_since())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
@ -1338,7 +1338,7 @@ impl<'a> State<'a> {
|
||||
if comma {
|
||||
try!(self.word_space(","))
|
||||
}
|
||||
try!(self.print_lifetime_def(lifetime_def));
|
||||
try!(self.print_lifetime_bounds(&lifetime_def.lifetime, &lifetime_def.bounds));
|
||||
comma = true;
|
||||
}
|
||||
try!(word(&mut self.s, ">"));
|
||||
@ -2749,16 +2749,20 @@ impl<'a> State<'a> {
|
||||
self.print_name(lifetime.name)
|
||||
}
|
||||
|
||||
pub fn print_lifetime_def(&mut self,
|
||||
lifetime: &ast::LifetimeDef)
|
||||
-> io::Result<()>
|
||||
pub fn print_lifetime_bounds(&mut self,
|
||||
lifetime: &ast::Lifetime,
|
||||
bounds: &[ast::Lifetime])
|
||||
-> io::Result<()>
|
||||
{
|
||||
try!(self.print_lifetime(&lifetime.lifetime));
|
||||
let mut sep = ":";
|
||||
for v in &lifetime.bounds {
|
||||
try!(word(&mut self.s, sep));
|
||||
try!(self.print_lifetime(v));
|
||||
sep = "+";
|
||||
try!(self.print_lifetime(lifetime));
|
||||
if !bounds.is_empty() {
|
||||
try!(word(&mut self.s, ": "));
|
||||
for (i, bound) in bounds.iter().enumerate() {
|
||||
if i != 0 {
|
||||
try!(word(&mut self.s, " + "));
|
||||
}
|
||||
try!(self.print_lifetime(bound));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@ -2781,8 +2785,8 @@ impl<'a> State<'a> {
|
||||
|
||||
try!(self.commasep(Inconsistent, &ints[..], |s, &idx| {
|
||||
if idx < generics.lifetimes.len() {
|
||||
let lifetime = &generics.lifetimes[idx];
|
||||
s.print_lifetime_def(lifetime)
|
||||
let lifetime_def = &generics.lifetimes[idx];
|
||||
s.print_lifetime_bounds(&lifetime_def.lifetime, &lifetime_def.bounds)
|
||||
} else {
|
||||
let idx = idx - generics.lifetimes.len();
|
||||
let param = &generics.ty_params[idx];
|
||||
@ -2833,16 +2837,7 @@ impl<'a> State<'a> {
|
||||
ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate{ref lifetime,
|
||||
ref bounds,
|
||||
..}) => {
|
||||
try!(self.print_lifetime(lifetime));
|
||||
try!(word(&mut self.s, ":"));
|
||||
|
||||
for (i, bound) in bounds.iter().enumerate() {
|
||||
try!(self.print_lifetime(bound));
|
||||
|
||||
if i != 0 {
|
||||
try!(word(&mut self.s, ":"));
|
||||
}
|
||||
}
|
||||
try!(self.print_lifetime_bounds(lifetime, bounds));
|
||||
}
|
||||
ast::WherePredicate::EqPredicate(ast::WhereEqPredicate{ref path, ref ty, ..}) => {
|
||||
try!(self.print_path(path, false, 0));
|
||||
|
15
src/test/pretty/lifetime.rs
Normal file
15
src/test/pretty/lifetime.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// pp-exact
|
||||
|
||||
fn f1<'a, 'b, 'c>(_x: &'a u32, _y: &'b u32, _z: &'c u32) where 'c: 'a + 'b { }
|
||||
|
||||
fn main() { }
|
@ -10,6 +10,6 @@
|
||||
|
||||
// pp-exact
|
||||
|
||||
fn f<'a, 'b, T>(t: T) -> isize where T: 'a, 'a:'b, T: Eq { 0 }
|
||||
fn f<'a, 'b, T>(t: T) -> isize where T: 'a, 'a: 'b, T: Eq { 0 }
|
||||
|
||||
fn main() { }
|
||||
|
Loading…
Reference in New Issue
Block a user