diff options
47 files changed, 249 insertions, 76 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 9e314251934..daf556795fa 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -95,7 +95,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize; /// # Cloning references /// /// Creating a new reference from an existing reference counted pointer is done using the -/// `Clone` trait implemented for [`Arc<T>`][`arc`] and [`Weak<T>`][`weak`]. +/// `Clone` trait implemented for [`Arc<T>`][arc] and [`Weak<T>`][weak]. /// /// ``` /// use std::sync::Arc; diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 622cc68964b..322b137e99f 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -144,7 +144,7 @@ use boxed::Box; /// # Deref /// /// `String`s implement [`Deref`]`<Target=str>`, and so inherit all of [`str`]'s -/// methods. In addition, this means that you can pass a `String` to any +/// methods. In addition, this means that you can pass a `String` to a /// function which takes a [`&str`] by using an ampersand (`&`): /// /// ``` @@ -160,8 +160,38 @@ use boxed::Box; /// /// This will create a [`&str`] from the `String` and pass it in. This /// conversion is very inexpensive, and so generally, functions will accept -/// [`&str`]s as arguments unless they need a `String` for some specific reason. +/// [`&str`]s as arguments unless they need a `String` for some specific +/// reason. /// +/// In certain cases Rust doesn't have enough information to make this +/// conversion, known as `Deref` coercion. In the following example a string +/// slice `&'a str` implements the trait `TraitExample`, and the function +/// `example_func` takes anything that implements the trait. In this case Rust +/// would need to make two implicit conversions, which Rust doesn't have the +/// means to do. For that reason, the following example will not compile. +/// +/// ```compile_fail,E0277 +/// trait TraitExample {} +/// +/// impl<'a> TraitExample for &'a str {} +/// +/// fn example_func<A: TraitExample>(example_arg: A) {} +/// +/// fn main() { +/// let example_string = String::from("example_string"); +/// example_func(&example_string); +/// } +/// ``` +/// +/// There are two options that would work instead. The first would be to +/// change the line `example_func(&example_string);` to +/// `example_func(example_string.as_str());`, using the method `as_str()` +/// to explicitly extract the string slice containing the string. The second +/// way changes `example_func(&example_string);` to +/// `example_func(&*example_string);`. In this case we are dereferencing a +/// `String` to a `str`, then referencing the `str` back to `&str`. The +/// second way is more idiomatic, however both work to do the conversion +/// explicitly rather than relying on the implicit conversion. /// /// # Representation /// diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs index e770f1d55dc..4ee9b2e65a7 100644 --- a/src/librustc/ty/layout.rs +++ b/src/librustc/ty/layout.rs @@ -2197,8 +2197,8 @@ impl<'a, 'tcx> TyLayout<'tcx> { let tcx = cx.tcx(); let ptr_field_type = |pointee: Ty<'tcx>| { + assert!(i < 2); let slice = |element: Ty<'tcx>| { - assert!(i < 2); if i == 0 { tcx.mk_mut_ptr(element) } else { diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index c35d8407c9d..8a753a0ae4b 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -563,7 +563,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> { Entry { kind: EntryKind::Mod(self.lazy(&data)), visibility: self.lazy(&ty::Visibility::from_hir(vis, id, tcx)), - span: self.lazy(&md.inner), + span: self.lazy(&tcx.def_span(def_id)), attributes: self.encode_attributes(attrs), children: self.lazy_seq(md.item_ids.iter().map(|item_id| { tcx.hir.local_def_id(item_id.id).index diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 35ca19698e8..c74dc24ddc3 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -1525,9 +1525,9 @@ static BAR: _ = "test"; // error, explicitly write out the type instead "##, E0122: r##" -An attempt was made to add a generic constraint to a type alias. While Rust will -allow this with a warning, it will not currently enforce the constraint. -Consider the example below: +An attempt was made to add a generic constraint to a type alias. This constraint +is entirely ignored. For backwards compatibility, Rust still allows this with a +warning. Consider the example below: ``` trait Foo{} diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index fc0adef70ba..563c5618759 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -2141,8 +2141,8 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, if !types.is_empty() { write!(w, " - <h2 id='associated-types' class='section-header'> - <a href='#associated-types'>Associated Types</a> + <h2 id='associated-types' class='small-section-header'> + Associated Types<a href='#associated-types' class='anchor'></a> </h2> <div class='methods'> ")?; @@ -2154,8 +2154,8 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, if !consts.is_empty() { write!(w, " - <h2 id='associated-const' class='section-header'> - <a href='#associated-const'>Associated Constants</a> + <h2 id='associated-const' class='small-section-header'> + Associated Constants<a href='#associated-const' class='anchor'></a> </h2> <div class='methods'> ")?; @@ -2168,8 +2168,8 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, // Output the documentation for each function individually if !required.is_empty() { write!(w, " - <h2 id='required-methods' class='section-header'> - <a href='#required-methods'>Required Methods</a> + <h2 id='required-methods' class='small-section-header'> + Required Methods<a href='#required-methods' class='anchor'></a> </h2> <div class='methods'> ")?; @@ -2180,8 +2180,8 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, } if !provided.is_empty() { write!(w, " - <h2 id='provided-methods' class='section-header'> - <a href='#provided-methods'>Provided Methods</a> + <h2 id='provided-methods' class='small-section-header'> + Provided Methods<a href='#provided-methods' class='anchor'></a> </h2> <div class='methods'> ")?; @@ -2196,8 +2196,8 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, let cache = cache(); write!(w, " - <h2 id='implementors' class='section-header'> - <a href='#implementors'>Implementors</a> + <h2 id='implementors' class='small-section-header'> + Implementors<a href='#implementors' class='anchor'></a> </h2> <ul class='item-list' id='implementors-list'> ")?; @@ -2436,8 +2436,8 @@ fn item_struct(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, }).peekable(); if let doctree::Plain = s.struct_type { if fields.peek().is_some() { - write!(w, "<h2 id='fields' class='fields section-header'> - <a href='#fields'>Fields</a></h2>")?; + write!(w, "<h2 id='fields' class='fields small-section-header'> + Fields<a href='#fields' class='anchor'></a></h2>")?; for (field, ty) in fields { let id = derive_id(format!("{}.{}", ItemType::StructField, @@ -2485,8 +2485,8 @@ fn item_union(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, } }).peekable(); if fields.peek().is_some() { - write!(w, "<h2 id='fields' class='fields section-header'> - <a href='#fields'>Fields</a></h2>")?; + write!(w, "<h2 id='fields' class='fields small-section-header'> + Fields<a href='#fields' class='anchor'></a></h2>")?; for (field, ty) in fields { write!(w, "<span id='{shortty}.{name}' class=\"{shortty}\"><code>{name}: {ty}</code> </span>", @@ -2558,8 +2558,8 @@ fn item_enum(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item, document(w, cx, it)?; if !e.variants.is_empty() { - write!(w, "<h2 id='variants' class='variants section-header'> - <a href='#variants'>Variants</a></h2>\n")?; + write!(w, "<h2 id='variants' class='variants small-section-header'> + Variants<a href='#variants' class='anchor'></a></h2>\n")?; for variant in &e.variants { let id = derive_id(format!("{}.{}", ItemType::Variant, @@ -2831,16 +2831,16 @@ fn render_assoc_items(w: &mut fmt::Formatter, let render_mode = match what { AssocItemRender::All => { write!(w, " - <h2 id='methods' class='section-header'> - <a href='#methods'>Methods</a> + <h2 id='methods' class='small-section-header'> + Methods<a href='#methods' class='anchor'></a> </h2> ")?; RenderMode::Normal } AssocItemRender::DerefFor { trait_, type_, deref_mut_ } => { write!(w, " - <h2 id='deref-methods' class='section-header'> - <a href='#deref-methods'>Methods from {}<Target = {}></a> + <h2 id='deref-methods' class='small-section-header'> + Methods from {}<Target = {}><a href='#deref-methods' class='anchor'></a> </h2> ", trait_, type_)?; RenderMode::ForDeref { mut_: deref_mut_ } @@ -2865,8 +2865,8 @@ fn render_assoc_items(w: &mut fmt::Formatter, render_deref_methods(w, cx, impl_, containing_item, has_deref_mut)?; } write!(w, " - <h2 id='implementations' class='section-header'> - <a href='#implementations'>Trait Implementations</a> + <h2 id='implementations' class='small-section-header'> + Trait Implementations<a href='#implementations' class='anchor'></a> </h2> ")?; for i in &traits { diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css index 51465bafc42..ee94f0baeb9 100644 --- a/src/librustdoc/html/static/rustdoc.css +++ b/src/librustdoc/html/static/rustdoc.css @@ -438,6 +438,16 @@ a { background: transparent; } +.small-section-header:hover > .anchor { + display: initial; +} +.anchor { + display: none; +} +.anchor:after { + content: '\2002\00a7\2002'; +} + .docblock a:hover, .docblock-short a:hover, .stability a { text-decoration: underline; } @@ -677,6 +687,10 @@ span.since { left: 0; } +.variant + .toggle-wrapper + .docblock > p { + margin-top: 5px; +} + .variant + .toggle-wrapper > a { margin-top: 5px; } @@ -695,7 +709,7 @@ span.since { margin-bottom: 25px; } -.enum .variant, .struct .structfield, .union .structfield { +#main > .variant, #main > .structfield { display: block; } diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 38d3312b4e7..062186ef708 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -28,7 +28,7 @@ use time::SystemTime; /// A reference to an open file on the filesystem. /// /// An instance of a `File` can be read and/or written depending on what options -/// it was opened with. Files also implement `Seek` to alter the logical cursor +/// it was opened with. Files also implement [`Seek`] to alter the logical cursor /// that the file contains internally. /// /// Files are automatically closed when they go out of scope. @@ -48,7 +48,7 @@ use time::SystemTime; /// # } /// ``` /// -/// Read the contents of a file into a `String`: +/// Read the contents of a file into a [`String`]: /// /// ```no_run /// use std::fs::File; @@ -81,6 +81,8 @@ use time::SystemTime; /// # } /// ``` /// +/// [`Seek`]: ../io/trait.Seek.html +/// [`String`]: ../string/struct.String.html /// [`Read`]: ../io/trait.Read.html /// [`BufReader<R>`]: ../io/struct.BufReader.html #[stable(feature = "rust1", since = "1.0.0")] @@ -104,19 +106,19 @@ pub struct Metadata(fs_imp::FileAttr); /// Iterator over the entries in a directory. /// /// This iterator is returned from the [`read_dir`] function of this module and -/// will yield instances of `io::Result<DirEntry>`. Through a [`DirEntry`] +/// will yield instances of [`io::Result`]`<`[`DirEntry`]`>`. Through a [`DirEntry`] /// information like the entry's path and possibly other metadata can be /// learned. /// -/// [`read_dir`]: fn.read_dir.html -/// [`DirEntry`]: struct.DirEntry.html -/// /// # Errors /// -/// This [`io::Result`] will be an `Err` if there's some sort of intermittent +/// This [`io::Result`] will be an [`Err`] if there's some sort of intermittent /// IO error during iteration. /// +/// [`read_dir`]: fn.read_dir.html +/// [`DirEntry`]: struct.DirEntry.html /// [`io::Result`]: ../io/type.Result.html +/// [`Err`]: ../result/enum.Result.html#variant.Err #[stable(feature = "rust1", since = "1.0.0")] #[derive(Debug)] pub struct ReadDir(fs_imp::ReadDir); diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs index 0a5804a7744..68f55221a6c 100644 --- a/src/libstd/io/error.rs +++ b/src/libstd/io/error.rs @@ -17,17 +17,21 @@ use convert::From; /// A specialized [`Result`](../result/enum.Result.html) type for I/O /// operations. /// -/// This type is broadly used across `std::io` for any operation which may +/// This type is broadly used across [`std::io`] for any operation which may /// produce an error. /// -/// This typedef is generally used to avoid writing out `io::Error` directly and -/// is otherwise a direct mapping to `Result`. +/// This typedef is generally used to avoid writing out [`io::Error`] directly and +/// is otherwise a direct mapping to [`Result`]. /// -/// While usual Rust style is to import types directly, aliases of `Result` -/// often are not, to make it easier to distinguish between them. `Result` is -/// generally assumed to be `std::result::Result`, and so users of this alias +/// While usual Rust style is to import types directly, aliases of [`Result`] +/// often are not, to make it easier to distinguish between them. [`Result`] is +/// generally assumed to be [`std::result::Result`][`Result`], and so users of this alias /// will generally use `io::Result` instead of shadowing the prelude's import -/// of `std::result::Result`. +/// of [`std::result::Result`][`Result`]. +/// +/// [`std::io`]: ../io/index.html +/// [`io::Error`]: ../io/struct.Error.html +/// [`Result`]: ../result/enum.Result.html /// /// # Examples /// @@ -47,13 +51,16 @@ use convert::From; #[stable(feature = "rust1", since = "1.0.0")] pub type Result<T> = result::Result<T, Error>; -/// The error type for I/O operations of the `Read`, `Write`, `Seek`, and +/// The error type for I/O operations of the [`Read`], [`Write`], [`Seek`], and /// associated traits. /// /// Errors mostly originate from the underlying OS, but custom instances of /// `Error` can be created with crafted error messages and a particular value of /// [`ErrorKind`]. /// +/// [`Read`]: ../io/trait.Read.html +/// [`Write`]: ../io/trait.Write.html +/// [`Seek`]: ../io/trait.Seek.html /// [`ErrorKind`]: enum.ErrorKind.html #[derive(Debug)] #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 9a3036f753e..f486493f98b 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -22,7 +22,7 @@ //! you'll see a few different types of I/O throughout the documentation in //! this module: [`File`]s, [`TcpStream`]s, and sometimes even [`Vec<T>`]s. For //! example, [`Read`] adds a [`read`][`Read::read`] method, which we can use on -//! `File`s: +//! [`File`]s: //! //! ``` //! use std::io; @@ -146,9 +146,9 @@ //! # } //! ``` //! -//! Note that you cannot use the `?` operator in functions that do not return -//! a `Result<T, E>` (e.g. `main`). Instead, you can call `.unwrap()` or `match` -//! on the return value to catch any possible errors: +//! Note that you cannot use the [`?` operator] in functions that do not return +//! a [`Result<T, E>`][`Result`] (e.g. `main`). Instead, you can call [`.unwrap()`] +//! or `match` on the return value to catch any possible errors: //! //! ``` //! use std::io; @@ -265,6 +265,8 @@ //! [`io::Result`]: type.Result.html //! [`?` operator]: ../../book/first-edition/syntax-index.html //! [`Read::read`]: trait.Read.html#tymethod.read +//! [`Result`]: ../result/enum.Result.html +//! [`.unwrap()`]: ../result/enum.Result.html#method.unwrap #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 1e5368896af..0abf8179cc9 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -466,7 +466,7 @@ impl Ipv4Addr { /// - test addresses used for documentation (192.0.2.0/24, 198.51.100.0/24 and 203.0.113.0/24) /// - the unspecified address (0.0.0.0) /// - /// [ipv4-sr]: http://goo.gl/RaZ7lg + /// [ipv4-sr]: https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml /// [`true`]: ../../std/primitive.bool.html /// /// # Examples diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index 94b87a6bff4..7701ae25b41 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -655,7 +655,7 @@ impl UnixListener { /// Accepts a new incoming connection to this listener. /// /// This function will block the calling thread until a new Unix connection - /// is established. When established, the corersponding [`UnixStream`] and + /// is established. When established, the corresponding [`UnixStream`] and /// the remote peer's address will be returned. /// /// [`UnixStream`]: ../../../../std/os/unix/net/struct.UnixStream.html diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 7eeafa72c68..194d30e25d4 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub use self::SyntaxExtension::{MultiDecorator, MultiModifier, NormalTT, IdentTT}; +pub use self::SyntaxExtension::*; use ast::{self, Attribute, Name, PatKind, MetaItem}; use attr::HasAttrs; diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 16c264e0f94..4843a66a750 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -294,7 +294,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { let item = match self.cx.resolver.resolve_macro( Mark::root(), path, MacroKind::Derive, false) { Ok(ext) => match *ext { - SyntaxExtension::BuiltinDerive(..) => item_with_markers.clone(), + BuiltinDerive(..) => item_with_markers.clone(), _ => item.clone(), }, _ => item.clone(), @@ -427,7 +427,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { items.push(item); kind.expect_from_annotatables(items) } - SyntaxExtension::AttrProcMacro(ref mac) => { + AttrProcMacro(ref mac) => { let item_tok = TokenTree::Token(DUMMY_SP, Token::interpolated(match item { Annotatable::Item(item) => token::NtItem(item), Annotatable::TraitItem(item) => token::NtTraitItem(item.unwrap()), @@ -436,7 +436,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { let tok_result = mac.expand(self.cx, attr.span, attr.tokens, item_tok); self.parse_expansion(tok_result, kind, &attr.path, attr.span) } - SyntaxExtension::ProcMacroDerive(..) | SyntaxExtension::BuiltinDerive(..) => { + ProcMacroDerive(..) | BuiltinDerive(..) => { self.cx.span_err(attr.span, &format!("`{}` is a derive mode", attr.path)); kind.dummy(attr.span) } @@ -474,7 +474,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { }; let opt_expanded = match *ext { - SyntaxExtension::DeclMacro(ref expand, def_span) => { + DeclMacro(ref expand, def_span) => { if let Err(msg) = validate_and_set_expn_info(def_span.map(|(_, s)| s), false) { self.cx.span_err(path.span, &msg); @@ -512,18 +512,18 @@ impl<'a, 'b> MacroExpander<'a, 'b> { kind.make_from(expander.expand(self.cx, span, ident, input)) } - MultiDecorator(..) | MultiModifier(..) | SyntaxExtension::AttrProcMacro(..) => { + MultiDecorator(..) | MultiModifier(..) | AttrProcMacro(..) => { self.cx.span_err(path.span, &format!("`{}` can only be used in attributes", path)); return kind.dummy(span); } - SyntaxExtension::ProcMacroDerive(..) | SyntaxExtension::BuiltinDerive(..) => { + ProcMacroDerive(..) | BuiltinDerive(..) => { self.cx.span_err(path.span, &format!("`{}` is a derive mode", path)); return kind.dummy(span); } - SyntaxExtension::ProcMacro(ref expandfun) => { + ProcMacro(ref expandfun) => { if ident.name != keywords::Invalid.name() { let msg = format!("macro {}! expects no ident argument, given '{}'", path, ident); @@ -582,7 +582,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { }; match *ext { - SyntaxExtension::ProcMacroDerive(ref ext, _) => { + ProcMacroDerive(ref ext, _) => { invoc.expansion_data.mark.set_expn_info(expn_info); let span = Span { ctxt: self.cx.backtrace(), ..span }; let dummy = ast::MetaItem { // FIXME(jseyfried) avoid this @@ -592,7 +592,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { }; kind.expect_from_annotatables(ext.expand(self.cx, span, &dummy, item)) } - SyntaxExtension::BuiltinDerive(func) => { + BuiltinDerive(func) => { expn_info.callee.allow_internal_unstable = true; invoc.expansion_data.mark.set_expn_info(expn_info); let span = Span { ctxt: self.cx.backtrace(), ..span }; diff --git a/src/libsyntax/parse/lexer/unicode_chars.rs b/src/libsyntax/parse/lexer/unicode_chars.rs index 85df4eee913..c36fdef2d4c 100644 --- a/src/libsyntax/parse/lexer/unicode_chars.rs +++ b/src/libsyntax/parse/lexer/unicode_chars.rs @@ -82,7 +82,7 @@ const UNICODE_ARRAY: &'static [(char, &'static str, char)] = &[ ('։', "Armenian Full Stop", ':'), ('܃', "Syriac Supralinear Colon", ':'), ('܄', "Syriac Sublinear Colon", ':'), - ('᛬', "Runic Multiple Ponctuation", ':'), + ('᛬', "Runic Multiple Punctuation", ':'), ('︰', "Presentation Form For Vertical Two Dot Leader", ':'), ('᠃', "Mongolian Full Stop", ':'), ('᠉', "Mongolian Manchu Full Stop", ':'), @@ -264,7 +264,7 @@ const UNICODE_ARRAY: &'static [(char, &'static str, char)] = &[ ('ꝸ', "Latin Small Letter Um", '&'), ('＆', "Fullwidth Ampersand", '&'), - ('᛭', "Runic Cros Punctuation", '+'), + ('᛭', "Runic Cross Punctuation", '+'), ('➕', "Heavy Plus Sign", '+'), ('𐊛', "Lycian Letter H", '+'), ('﬩', "Hebrew Letter Alternative Plus Sign", '+'), diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs index 65f4b6350c4..00a27818327 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:attribute-with-error.rs +// ignore-stage1 #![feature(proc_macro)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs index f42d1006bf5..2adbee1d3fb 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:attributes-included.rs +// ignore-stage1 #![feature(proc_macro, rustc_attrs)] #![warn(unused)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs index 42fad803bfa..b03409c9c28 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-bad.rs +// ignore-stage1 #[macro_use] extern crate derive_bad; diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs index e4fcbb117a5..6f254dcbdb1 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-unstable-2.rs +// ignore-stage1 #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs index 836e336fc22..ca0f0e382ed 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-unstable.rs +// ignore-stage1 #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs index 42475e6de90..1d645a7ec51 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue_38586.rs +// ignore-stage1 #![feature(proc_macro)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs index 4133e75e3a6..c0d4d71a6ec 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-b.rs +// ignore-stage1 #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs index 93dead1a156..b1fb7d42d86 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:bang_proc_macro2.rs +// ignore-stage1 #![feature(proc_macro)] #![allow(unused_macros)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs index df881bedec1..153e4dd0571 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-b.rs +// ignore-stage1 #![allow(warnings)] diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs index 9ac76a5f4ea..677c92ea71b 100644 --- a/src/test/mir-opt/validate_1.rs +++ b/src/test/mir-opt/validate_1.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-tidy-linelength -// compile-flags: -Z verbose -Z mir-emit-validate=1 +// compile-flags: -Z verbose -Z mir-emit-validate=1 -Z span_free_formats struct Test(i32); @@ -20,16 +20,13 @@ impl Test { fn main() { let mut x = 0; - Test(0).foo(&mut x); + Test(0).foo(&mut x); // just making sure we do not panic when there is a tuple struct ctor // Also test closures let c = |x: &mut i32| { let y = &*x; *y }; c(&mut x); } -// FIXME: Also test code generated inside the closure, make sure it has validation. Unfortunately, -// the interesting lines of code also contain name of the source file, so we cannot test for it. - // END RUST SOURCE // START rustc.node12.EraseRegions.after.mir // bb0: { @@ -57,3 +54,24 @@ fn main() { // } // } // END rustc.node23.EraseRegions.after.mir +// START rustc.node50.EraseRegions.after.mir +// fn main::{{closure}}(_1: &ReErased [closure@NodeId(50)], _2: &ReErased mut i32) -> i32 { +// bb0: { +// Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_1/8cd878b::main[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(50)], _2: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_1/8cd878b::main[0]::{{closure}}[0] }, BrAnon(1)) mut i32]); +// StorageLive(_3); +// _3 = _2; +// StorageLive(_4); +// Validate(Suspend(ReScope(Remainder(BlockRemainder { block: NodeId(41), first_statement_index: 0 }))), [(*_3): i32]); +// _4 = &ReErased (*_3); +// Validate(Acquire, [(*_4): i32/ReScope(Remainder(BlockRemainder { block: NodeId(41), first_statement_index: 0 })) (imm)]); +// StorageLive(_5); +// _5 = (*_4); +// _0 = _5; +// StorageDead(_5); +// StorageDead(_4); +// EndRegion(ReScope(Remainder(BlockRemainder { block: NodeId(41), first_statement_index: 0 }))); +// StorageDead(_3); +// return; +// } +// } +// END rustc.node50.EraseRegions.after.mir diff --git a/src/test/mir-opt/validate_4.rs b/src/test/mir-opt/validate_4.rs index 591de975740..2ee459d6809 100644 --- a/src/test/mir-opt/validate_4.rs +++ b/src/test/mir-opt/validate_4.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-tidy-linelength -// compile-flags: -Z verbose -Z mir-emit-validate=1 +// compile-flags: -Z verbose -Z mir-emit-validate=1 -Z span_free_formats // Make sure unsafe fns and fns with an unsafe block only get restricted validation. @@ -45,6 +45,19 @@ fn main() { // } // } // END rustc.node4.EraseRegions.after.mir +// START rustc.node22.EraseRegions.after.mir +// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(22)], _2: *mut i32) -> () { +// bb0: { +// Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483659) => validate_4/8cd878b::write_42[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(22)], _2: *mut i32]); +// Validate(Release, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483659) => validate_4/8cd878b::write_42[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(22)], _2: *mut i32]); +// StorageLive(_3); +// _3 = _2; +// (*_3) = const 23i32; +// StorageDead(_3); +// return; +// } +// } +// END rustc.node22.EraseRegions.after.mir // START rustc.node31.EraseRegions.after.mir // fn test(_1: &ReErased mut i32) -> () { // bb0: { @@ -58,3 +71,13 @@ fn main() { // } // } // END rustc.node31.EraseRegions.after.mir +// START rustc.node60.EraseRegions.after.mir +// fn main::{{closure}}(_1: &ReErased [closure@NodeId(60)], _2: &ReErased mut i32) -> bool { +// bb0: { +// Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_4/8cd878b::main[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(60)], _2: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_4/8cd878b::main[0]::{{closure}}[0] }, BrAnon(1)) mut i32]); +// Validate(Release, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_4/8cd878b::main[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(60)], _2: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483663) => validate_4/8cd878b::main[0]::{{closure}}[0] }, BrAnon(1)) mut i32]); +// StorageLive(_3); +// _0 = const write_42(_4) -> bb1; +// } +// } +// END rustc.node60.EraseRegions.after.mir diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs index e9919af9fd3..0182e6e2964 100644 --- a/src/test/mir-opt/validate_5.rs +++ b/src/test/mir-opt/validate_5.rs @@ -9,9 +9,9 @@ // except according to those terms. // ignore-tidy-linelength -// compile-flags: -Z verbose -Z mir-emit-validate=2 +// compile-flags: -Z verbose -Z mir-emit-validate=2 -Z span_free_formats -// Make sure unsafe fns and fns with an unsafe block only get full validation. +// Make sure unsafe fns and fns with an unsafe block still get full validation. unsafe fn write_42(x: *mut i32) -> bool { *x = 42; @@ -26,12 +26,12 @@ fn main() { test(&mut 0); let test_closure = unsafe { |x: &mut i32| write_42(x) }; + // Note that validation will fail if this is executed: The closure keeps the lock on + // x, so the write in write_42 fails. This test just checks code generation, + // so the UB doesn't matter. test_closure(&mut 0); } -// FIXME: Also test code generated inside the closure, make sure it has validation. Unfortunately, -// the interesting lines of code also contain name of the source file, so we cannot test for it. - // END RUST SOURCE // START rustc.node17.EraseRegions.after.mir // fn test(_1: &ReErased mut i32) -> () { @@ -42,3 +42,22 @@ fn main() { // } // } // END rustc.node17.EraseRegions.after.mir +// START rustc.node46.EraseRegions.after.mir +// fn main::{{closure}}(_1: &ReErased [closure@NodeId(46)], _2: &ReErased mut i32) -> bool { +// bb0: { +// Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483660) => validate_5/8cd878b::main[0]::{{closure}}[0] }, "BrEnv") [closure@NodeId(46)], _2: &ReFree(DefId { krate: CrateNum(0), node: DefIndex(2147483660) => validate_5/8cd878b::main[0]::{{closure}}[0] }, BrAnon(1)) mut i32]); +// StorageLive(_3); +// _3 = _2; +// StorageLive(_4); +// StorageLive(_5); +// Validate(Suspend(ReScope(Misc(NodeId(44)))), [(*_3): i32]); +// _5 = &ReErased mut (*_3); +// Validate(Acquire, [(*_5): i32/ReScope(Misc(NodeId(44)))]); +// _4 = _5 as *mut i32 (Misc); +// StorageDead(_5); +// EndRegion(ReScope(Misc(NodeId(44)))); +// Validate(Release, [_0: bool, _4: *mut i32]); +// _0 = const write_42(_4) -> bb1; +// } +// } +// END rustc.node46.EraseRegions.after.mir diff --git a/src/test/run-make/issue-37839/Makefile b/src/test/run-make/issue-37839/Makefile index f17ce537fb8..8b3355b9622 100644 --- a/src/test/run-make/issue-37839/Makefile +++ b/src/test/run-make/issue-37839/Makefile @@ -1,6 +1,12 @@ -include ../tools.mk +ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1) +# ignore stage1 +all: + +else all: $(RUSTC) a.rs && $(RUSTC) b.rs $(BARE_RUSTC) c.rs -L dependency=$(TMPDIR) --extern b=$(TMPDIR)/libb.rlib \ --out-dir=$(TMPDIR) +endif diff --git a/src/test/run-make/issue-37893/Makefile b/src/test/run-make/issue-37893/Makefile index 27b69baf977..c7732cc2682 100644 --- a/src/test/run-make/issue-37893/Makefile +++ b/src/test/run-make/issue-37893/Makefile @@ -1,4 +1,10 @@ -include ../tools.mk +ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1) +# ignore stage1 +all: + +else all: $(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs +endif diff --git a/src/test/run-make/issue-38237/Makefile b/src/test/run-make/issue-38237/Makefile index 0a681401b1a..855d958b344 100644 --- a/src/test/run-make/issue-38237/Makefile +++ b/src/test/run-make/issue-38237/Makefile @@ -1,5 +1,11 @@ -include ../tools.mk +ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1) +# ignore stage1 +all: + +else all: $(RUSTC) foo.rs; $(RUSTC) bar.rs $(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR) +endif diff --git a/src/test/run-make/llvm-pass/Makefile b/src/test/run-make/llvm-pass/Makefile index aab6e895f22..0d31d2c8235 100644 --- a/src/test/run-make/llvm-pass/Makefile +++ b/src/test/run-make/llvm-pass/Makefile @@ -1,5 +1,10 @@ -include ../tools.mk +ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1) +# ignore stage1 +all: + +else # Windows doesn't correctly handle include statements with escaping paths, # so this test will not get run on Windows. ifdef IS_WINDOWS @@ -15,3 +20,5 @@ $(TMPDIR)/libllvm-function-pass.o: $(TMPDIR)/libllvm-module-pass.o: $(CXX) $(CFLAGS) $(LLVM_CXXFLAGS) -c llvm-module-pass.so.cc -o $(TMPDIR)/libllvm-module-pass.o endif + +endif diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make/rustc-macro-dep-files/Makefile index e3a6776c808..1ab27397e31 100644 --- a/src/test/run-make/rustc-macro-dep-files/Makefile +++ b/src/test/run-make/rustc-macro-dep-files/Makefile @@ -1,6 +1,12 @@ -include ../tools.mk +ifeq ($(findstring stage1,$(RUST_BUILD_STAGE)),stage1) +# ignore stage1 +all: + +else all: $(RUSTC) foo.rs $(RUSTC) bar.rs --emit dep-info grep "proc-macro source" $(TMPDIR)/bar.d && exit 1 || exit 0 +endif diff --git a/src/test/run-pass-fulldeps/issue-40663.rs b/src/test/run-pass-fulldeps/issue-40663.rs index d030eab64e5..8cb9dc4a1b6 100644 --- a/src/test/run-pass-fulldeps/issue-40663.rs +++ b/src/test/run-pass-fulldeps/issue-40663.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:custom_derive_plugin.rs +// ignore-stage1 #![feature(plugin, custom_derive)] #![plugin(custom_derive_plugin)] diff --git a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs index 7ea7ceafc28..5175fe174a9 100644 --- a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:add-impl.rs +// ignore-stage1 #[macro_use] extern crate add_impl; diff --git a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs index 591f3331d28..37aef7ef131 100644 --- a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:append-impl.rs +// ignore-stage1 #![allow(warnings)] diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs index 8a9fdd75367..2968cc7871d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs +++ b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:attr-args.rs +// ignore-stage1 #![allow(warnings)] #![feature(proc_macro)] diff --git a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs index 531bd0dd356..ffa4731f1e6 100644 --- a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:bang-macro.rs +// ignore-stage1 #![feature(proc_macro)] diff --git a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs index 1a2b144e471..00ad0e76ed0 100644 --- a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs +++ b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:count_compound_ops.rs +// ignore-stage1 #![feature(proc_macro)] diff --git a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs index ba1417ecb56..b6acb0faab2 100644 --- a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs +++ b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:double.rs +// ignore-stage1 #![allow(unused)] diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs index ce3ba60b0ec..ba5a639a759 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:derive-same-struct.rs +// ignore-stage1 #[macro_use] extern crate derive_same_struct; diff --git a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs index 51198db5aa7..4cac7d19b4d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs +++ b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs @@ -10,6 +10,7 @@ // aux-build:hygiene_example_codegen.rs // aux-build:hygiene_example.rs +// ignore-stage1 #![feature(proc_macro)] diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs index 05610116ad6..87130242c0f 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-39889.rs +// ignore-stage1 #![feature(proc_macro)] #![allow(unused)] diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs index 54e84b7f618..b7826edd8b4 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-40001-plugin.rs +// ignore-stage1 #![feature(proc_macro, plugin)] #![plugin(issue_40001_plugin)] diff --git a/src/test/run-pass-fulldeps/proc-macro/load-two.rs b/src/test/run-pass-fulldeps/proc-macro/load-two.rs index d15a83a2cbe..67c12377814 100644 --- a/src/test/run-pass-fulldeps/proc-macro/load-two.rs +++ b/src/test/run-pass-fulldeps/proc-macro/load-two.rs @@ -10,6 +10,7 @@ // aux-build:derive-atob.rs // aux-build:derive-ctod.rs +// ignore-stage1 #[macro_use] extern crate derive_atob; diff --git a/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs b/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs index f0a1bfe6528..03dfeb1f5c9 100644 --- a/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs +++ b/src/test/run-pass-fulldeps/proc-macro/use-reexport.rs @@ -10,6 +10,7 @@ // aux-build:derive-a.rs // aux-build:derive-reexport.rs +// ignore-stage1 #[macro_use] extern crate derive_reexport; diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs index 20f58301d45..64fd9e0a772 100644 --- a/src/test/run-pass/weird-exprs.rs +++ b/src/test/run-pass/weird-exprs.rs @@ -107,6 +107,10 @@ fn fishy() { String::<>::from::<>("><>").chars::<>().rev::<>().collect::<String>()); } +fn union() { + union union<'union> { union: &'union union<'union>, } +} + pub fn main() { strange(); funny(); @@ -119,4 +123,5 @@ pub fn main() { dots(); you_eight(); fishy(); + union(); } diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index b42beb37821..a689d8a8be4 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -83,7 +83,7 @@ fn line_is_url(line: &str) -> bool { => state = EXP_END, (EXP_URL, w) - if w.starts_with("http://") || w.starts_with("https://") + if w.starts_with("http://") || w.starts_with("https://") || w.starts_with("../") => state = EXP_END, (_, _) => return false, |