OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #80790 - JohnTitor:rollup-js1noez, r=JohnTitor 

Rollup of 10 pull requests

Successful merges:

 - #80012 (Add pointing const identifier when emitting E0435)
 - #80521 (MIR Inline is incompatible with coverage)
 - #80659 (Edit rustc_ast::tokenstream docs)
 - #80660 (Properly handle primitive disambiguators in rustdoc)
 - #80738 (Remove bottom margin from crate version when the docs sidebar is collapsed)
 - #80744 (rustdoc: Turn `next_def_id` comments into docs)
 - #80750 (Don't use to_string on Symbol in rustc_passes/check_attr.rs)
 - #80769 (Improve wording of parse doc)
 - #80780 (Return EOF_CHAR constant instead of magic char.)
 - #80784 (rustc_parse: Better spans for synthesized token streams)

Failed merges:

 - #80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2021-01-07 18:20:12 +00:00
parent 8f0b945cfc 695f878332
commit c8915eebea
43 changed files with 607 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_ast/src/token.rs
View File

@ -771,7 +771,7 @@ impl fmt::Display for NonterminalKind {
}
impl Nonterminal {
fn span(&self) -> Span {
pub fn span(&self) -> Span {
match self {
NtItem(item) => item.span,
NtBlock(block) => block.span,

33
compiler/rustc_ast/src/tokenstream.rs
View File

@ -1,15 +1,15 @@
//! # Token Streams
//!
//! `TokenStream`s represent syntactic objects before they are converted into ASTs.
//! A `TokenStream` is, roughly speaking, a sequence (eg stream) of `TokenTree`s,
//! which are themselves a single `Token` or a `Delimited` subsequence of tokens.
//! A `TokenStream` is, roughly speaking, a sequence of [`TokenTree`]s,
//! which are themselves a single [`Token`] or a `Delimited` subsequence of tokens.
//!
//! ## Ownership
//!
//! `TokenStream`s are persistent data structures constructed as ropes with reference
//! counted-children. In general, this means that calling an operation on a `TokenStream`
//! (such as `slice`) produces an entirely new `TokenStream` from the borrowed reference to
//! the original. This essentially coerces `TokenStream`s into 'views' of their subparts,
//! the original. This essentially coerces `TokenStream`s into "views" of their subparts,
//! and a borrowed `TokenStream` is sufficient to build an owned `TokenStream` without taking
//! ownership of the original.
@ -24,9 +24,9 @@ use smallvec::{smallvec, SmallVec};
use std::{fmt, iter, mem};
/// When the main rust parser encounters a syntax-extension invocation, it
/// parses the arguments to the invocation as a token-tree. This is a very
/// loose structure, such that all sorts of different AST-fragments can
/// When the main Rust parser encounters a syntax-extension invocation, it
/// parses the arguments to the invocation as a token tree. This is a very
/// loose structure, such that all sorts of different AST fragments can
/// be passed to syntax extensions using a uniform type.
///
/// If the syntax extension is an MBE macro, it will attempt to match its
@ -38,9 +38,9 @@ use std::{fmt, iter, mem};
/// Nothing special happens to misnamed or misplaced `SubstNt`s.
#[derive(Debug, Clone, PartialEq, Encodable, Decodable, HashStable_Generic)]
pub enum TokenTree {
/// A single token
/// A single token.
Token(Token),
/// A delimited sequence of token trees
/// A delimited sequence of token trees.
Delimited(DelimSpan, DelimToken, TokenStream),
}
@ -62,7 +62,7 @@ where
}
impl TokenTree {
/// Checks if this TokenTree is equal to the other, regardless of span information.
/// Checks if this `TokenTree` is equal to the other, regardless of span information.
pub fn eq_unspanned(&self, other: &TokenTree) -> bool {
match (self, other) {
(TokenTree::Token(token), TokenTree::Token(token2)) => token.kind == token2.kind,
@ -73,7 +73,7 @@ impl TokenTree {
}
}
/// Retrieves the TokenTree's span.
/// Retrieves the `TokenTree`'s span.
pub fn span(&self) -> Span {
match self {
TokenTree::Token(token) => token.span,
@ -140,7 +140,7 @@ impl CreateTokenStream for TokenStream {
}
}
/// A lazy version of `TokenStream`, which defers creation
/// A lazy version of [`TokenStream`], which defers creation
/// of an actual `TokenStream` until it is needed.
/// `Box` is here only to reduce the structure size.
#[derive(Clone)]
@ -188,11 +188,12 @@ impl<CTX> HashStable<CTX> for LazyTokenStream {
}
}
/// A `TokenStream` is an abstract sequence of tokens, organized into `TokenTree`s.
/// A `TokenStream` is an abstract sequence of tokens, organized into [`TokenTree`]s.
///
/// The goal is for procedural macros to work with `TokenStream`s and `TokenTree`s
/// instead of a representation of the abstract syntax tree.
/// Today's `TokenTree`s can still contain AST via `token::Interpolated` for back-compat.
/// Today's `TokenTree`s can still contain AST via `token::Interpolated` for
/// backwards compatability.
#[derive(Clone, Debug, Default, Encodable, Decodable)]
pub struct TokenStream(pub(crate) Lrc<Vec<TreeAndSpacing>>);
@ -429,7 +430,7 @@ impl TokenStreamBuilder {
}
}
/// By-reference iterator over a `TokenStream`.
/// By-reference iterator over a [`TokenStream`].
#[derive(Clone)]
pub struct CursorRef<'t> {
stream: &'t TokenStream,
@ -457,8 +458,8 @@ impl<'t> Iterator for CursorRef<'t> {
}
}
/// Owning by-value iterator over a `TokenStream`.
/// FIXME: Many uses of this can be replaced with by-reference iterator to avoid clones.
/// Owning by-value iterator over a [`TokenStream`].
// FIXME: Many uses of this can be replaced with by-reference iterator to avoid clones.
#[derive(Clone)]
pub struct Cursor {
pub stream: TokenStream,

10
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -206,8 +206,7 @@ pub trait ResolverAstLowering {
) -> LocalDefId;
}
type NtToTokenstream =
fn(&Nonterminal, &ParseSess, Span, CanSynthesizeMissingTokens) -> TokenStream;
type NtToTokenstream = fn(&Nonterminal, &ParseSess, CanSynthesizeMissingTokens) -> TokenStream;
/// Context of `impl Trait` in code, which determines whether it is allowed in an HIR subtree,
/// and if so, what meaning it has.
@ -417,12 +416,7 @@ impl<'a> TokenStreamLowering<'a> {
fn lower_token(&mut self, token: Token) -> TokenStream {
match token.kind {
token::Interpolated(nt) => {
let tts = (self.nt_to_tokenstream)(
&nt,
self.parse_sess,
token.span,
self.synthesize_tokens,
);
let tts = (self.nt_to_tokenstream)(&nt, self.parse_sess, self.synthesize_tokens);
TokenTree::Delimited(
DelimSpan::from_single(token.span),
DelimToken::NoDelim,

6
compiler/rustc_error_codes/src/error_codes/E0435.md
View File

@ -7,6 +7,12 @@ let foo = 42;
let a: [u8; foo]; // error: attempt to use a non-constant value in a constant
```
'constant' means 'a compile-time value'.
More details can be found in the [Variables and Mutability] section of the book.
[Variables and Mutability]: https://doc.rust-lang.org/book/ch03-01-variables-and-mutability.html#differences-between-variables-and-constants
To fix this error, please replace the value with a constant. Example:
```

2
compiler/rustc_expand/src/base.rs
View File

@ -141,7 +141,7 @@ impl Annotatable {
}
crate fn into_tokens(self, sess: &ParseSess) -> TokenStream {
nt_to_tokenstream(&self.into_nonterminal(), sess, DUMMY_SP, CanSynthesizeMissingTokens::No)
nt_to_tokenstream(&self.into_nonterminal(), sess, CanSynthesizeMissingTokens::No)
}
pub fn expect_item(self) -> P<ast::Item> {

1
compiler/rustc_expand/src/expand.rs
View File

@ -743,7 +743,6 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
AttrStyle::Inner => rustc_parse::fake_token_stream(
&self.cx.sess.parse_sess,
&item.into_nonterminal(),
span,
),
};
let attr_item = attr.unwrap_normal_item();

7
compiler/rustc_expand/src/proc_macro.rs
View File

@ -94,12 +94,7 @@ impl MultiItemModifier for ProcMacroDerive {
let input = if item.pretty_printing_compatibility_hack() {
TokenTree::token(token::Interpolated(Lrc::new(item)), DUMMY_SP).into()
} else {
nt_to_tokenstream(
&item,
&ecx.sess.parse_sess,
DUMMY_SP,
CanSynthesizeMissingTokens::Yes,
)
nt_to_tokenstream(&item, &ecx.sess.parse_sess, CanSynthesizeMissingTokens::Yes)
};
let server = proc_macro_server::Rustc::new(ecx);

2
compiler/rustc_expand/src/proc_macro_server.rs
View File

@ -179,7 +179,7 @@ impl FromInternal<(TreeAndSpacing, &'_ ParseSess, &'_ mut Vec<Self>)>
{
TokenTree::Ident(Ident::new(sess, name.name, is_raw, name.span))
} else {
let stream = nt_to_tokenstream(&nt, sess, span, CanSynthesizeMissingTokens::No);
let stream = nt_to_tokenstream(&nt, sess, CanSynthesizeMissingTokens::No);
TokenTree::Group(Group {
delimiter: Delimiter::None,
stream,

2
compiler/rustc_lexer/src/cursor.rs
View File

@ -33,7 +33,7 @@ impl<'a> Cursor<'a> {
#[cfg(not(debug_assertions))]
{
'\0'
EOF_CHAR
}
}

9
compiler/rustc_mir/src/transform/inline.rs
View File

@ -41,6 +41,15 @@ impl<'tcx> MirPass<'tcx> for Inline {
return;
}
if tcx.sess.opts.debugging_opts.instrument_coverage {
// Since `Inline` happens after `InstrumentCoverage`, the function-specific coverage
// counters can be invalidated, such as by merging coverage counter statements from
// a pre-inlined function into a different function. This kind of change is invalid,
// so inlining must be skipped. Note: This check is performed here so inlining can
// be disabled without preventing other optimizations (regardless of `mir_opt_level`).
return;
}
if inline(tcx, body) {
debug!("running simplify cfg on {:?}", body.source);
CfgSimplifier::new(body).simplify();

20
compiler/rustc_parse/src/lib.rs
View File

@ -236,7 +236,6 @@ pub fn parse_in<'a, T>(
pub fn nt_to_tokenstream(
nt: &Nonterminal,
sess: &ParseSess,
span: Span,
synthesize_tokens: CanSynthesizeMissingTokens,
) -> TokenStream {
// A `Nonterminal` is often a parsed AST item. At this point we now
@ -256,11 +255,9 @@ pub fn nt_to_tokenstream(
|tokens: Option<&LazyTokenStream>| tokens.as_ref().map(|t| t.create_token_stream());
let tokens = match *nt {
Nonterminal::NtItem(ref item) => {
prepend_attrs(sess, &item.attrs, nt, span, item.tokens.as_ref())
}
Nonterminal::NtItem(ref item) => prepend_attrs(sess, &item.attrs, nt, item.tokens.as_ref()),
Nonterminal::NtBlock(ref block) => convert_tokens(block.tokens.as_ref()),
Nonterminal::NtStmt(ref stmt) => prepend_attrs(sess, stmt.attrs(), nt, span, stmt.tokens()),
Nonterminal::NtStmt(ref stmt) => prepend_attrs(sess, stmt.attrs(), nt, stmt.tokens()),
Nonterminal::NtPat(ref pat) => convert_tokens(pat.tokens.as_ref()),
Nonterminal::NtTy(ref ty) => convert_tokens(ty.tokens.as_ref()),
Nonterminal::NtIdent(ident, is_raw) => {
@ -277,31 +274,30 @@ pub fn nt_to_tokenstream(
if expr.tokens.is_none() {
debug!("missing tokens for expr {:?}", expr);
}
prepend_attrs(sess, &expr.attrs, nt, span, expr.tokens.as_ref())
prepend_attrs(sess, &expr.attrs, nt, expr.tokens.as_ref())
}
};
if let Some(tokens) = tokens {
return tokens;
} else if matches!(synthesize_tokens, CanSynthesizeMissingTokens::Yes) {
return fake_token_stream(sess, nt, span);
return fake_token_stream(sess, nt);
} else {
let pretty = rustc_ast_pretty::pprust::nonterminal_to_string_no_extra_parens(&nt);
panic!("Missing tokens at {:?} for nt {:?}", span, pretty);
panic!("Missing tokens for nt {:?}", pretty);
}
}
pub fn fake_token_stream(sess: &ParseSess, nt: &Nonterminal, span: Span) -> TokenStream {
pub fn fake_token_stream(sess: &ParseSess, nt: &Nonterminal) -> TokenStream {
let source = pprust::nonterminal_to_string(nt);
let filename = FileName::macro_expansion_source_code(&source);
parse_stream_from_source_str(filename, source, sess, Some(span))
parse_stream_from_source_str(filename, source, sess, Some(nt.span()))
}
fn prepend_attrs(
sess: &ParseSess,
attrs: &[ast::Attribute],
nt: &Nonterminal,
span: Span,
tokens: Option<&tokenstream::LazyTokenStream>,
) -> Option<tokenstream::TokenStream> {
if attrs.is_empty() {
@ -312,7 +308,7 @@ fn prepend_attrs(
// FIXME: Correctly handle tokens for inner attributes.
// For now, we fall back to reparsing the original AST node
if attr.style == ast::AttrStyle::Inner {
return Some(fake_token_stream(sess, nt, span));
return Some(fake_token_stream(sess, nt));
}
builder.push(attr.tokens());
}

2
compiler/rustc_passes/src/check_attr.rs
View File

@ -359,7 +359,7 @@ impl CheckAttrVisitor<'tcx> {
return false;
}
let item_name = self.tcx.hir().name(hir_id);
if item_name.to_string() == doc_alias {
if &*item_name.as_str() == doc_alias {
self.tcx
.sess
.struct_span_err(

8
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -398,13 +398,19 @@ impl<'a> Resolver<'a> {
err.help("use the `|| { ... }` closure form instead");
err
}
ResolutionError::AttemptToUseNonConstantValueInConstant => {
ResolutionError::AttemptToUseNonConstantValueInConstant(ident, sugg) => {
let mut err = struct_span_err!(
self.session,
span,
E0435,
"attempt to use a non-constant value in a constant"
);
err.span_suggestion(
ident.span,
&sugg,
"".to_string(),
Applicability::MaybeIncorrect,
);
err.span_label(span, "non-constant value");
err
}

38
compiler/rustc_resolve/src/late.rs
View File

@ -92,6 +92,12 @@ crate enum HasGenericParams {
No,
}
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
crate enum ConstantItemKind {
Const,
Static,
}
/// The rib kind restricts certain accesses,
/// e.g. to a `Res::Local` of an outer item.
#[derive(Copy, Clone, Debug)]
@ -119,7 +125,7 @@ crate enum RibKind<'a> {
///
/// The `bool` indicates if this constant may reference generic parameters
/// and is used to only allow generic parameters to be used in trivial constant expressions.
ConstantItemRibKind(bool),
ConstantItemRibKind(bool, Option<(Ident, ConstantItemKind)>),
/// We passed through a module.
ModuleRibKind(Module<'a>),
@ -145,7 +151,7 @@ impl RibKind<'_> {
NormalRibKind
| ClosureOrAsyncRibKind
| FnItemRibKind
| ConstantItemRibKind(_)
| ConstantItemRibKind(..)
| ModuleRibKind(_)
| MacroDefinition(_)
| ConstParamTyRibKind => false,
@ -634,7 +640,7 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
// Note that we might not be inside of an repeat expression here,
// but considering that `IsRepeatExpr` is only relevant for
// non-trivial constants this is doesn't matter.
self.with_constant_rib(IsRepeatExpr::No, true, |this| {
self.with_constant_rib(IsRepeatExpr::No, true, None, |this| {
this.smart_resolve_path(
ty.id,
qself.as_ref(),
@ -843,7 +849,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
| ClosureOrAsyncRibKind
| FnItemRibKind
| ItemRibKind(..)
| ConstantItemRibKind(_)
| ConstantItemRibKind(..)
| ModuleRibKind(..)
| ForwardTyParamBanRibKind
| ConstParamTyRibKind => {
@ -970,6 +976,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
this.with_constant_rib(
IsRepeatExpr::No,
true,
None,
|this| this.visit_expr(expr),
);
}
@ -1012,11 +1019,19 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
self.with_item_rib(HasGenericParams::No, |this| {
this.visit_ty(ty);
if let Some(expr) = expr {
let constant_item_kind = match item.kind {
ItemKind::Const(..) => ConstantItemKind::Const,
ItemKind::Static(..) => ConstantItemKind::Static,
_ => unreachable!(),
};
// We already forbid generic params because of the above item rib,
// so it doesn't matter whether this is a trivial constant.
this.with_constant_rib(IsRepeatExpr::No, true, |this| {
this.visit_expr(expr)
});
this.with_constant_rib(
IsRepeatExpr::No,
true,
Some((item.ident, constant_item_kind)),
|this| this.visit_expr(expr),
);
}
});
}
@ -1118,15 +1133,16 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
&mut self,
is_repeat: IsRepeatExpr,
is_trivial: bool,
item: Option<(Ident, ConstantItemKind)>,
f: impl FnOnce(&mut Self),
) {
debug!("with_constant_rib: is_repeat={:?} is_trivial={}", is_repeat, is_trivial);
self.with_rib(ValueNS, ConstantItemRibKind(is_trivial), |this| {
self.with_rib(ValueNS, ConstantItemRibKind(is_trivial, item), |this| {
this.with_rib(
TypeNS,
ConstantItemRibKind(is_repeat == IsRepeatExpr::Yes || is_trivial),
ConstantItemRibKind(is_repeat == IsRepeatExpr::Yes || is_trivial, item),
|this| {
this.with_label_rib(ConstantItemRibKind(is_trivial), f);
this.with_label_rib(ConstantItemRibKind(is_trivial, item), f);
},
)
});
@ -1266,6 +1282,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
this.with_constant_rib(
IsRepeatExpr::No,
true,
None,
|this| {
visit::walk_assoc_item(
this,
@ -2200,6 +2217,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
self.with_constant_rib(
is_repeat,
constant.value.is_potential_trivial_const_param(),
None,
|this| {
visit::walk_anon_const(this, constant);
},

40
compiler/rustc_resolve/src/lib.rs
View File

@ -64,7 +64,7 @@ use tracing::debug;
use diagnostics::{extend_span_to_previous_binding, find_span_of_binding_until_next_binding};
use diagnostics::{ImportSuggestion, LabelSuggestion, Suggestion};
use imports::{Import, ImportKind, ImportResolver, NameResolution};
use late::{HasGenericParams, PathSource, Rib, RibKind::*};
use late::{ConstantItemKind, HasGenericParams, PathSource, Rib, RibKind::*};
use macros::{MacroRulesBinding, MacroRulesScope, MacroRulesScopeRef};
type Res = def::Res<NodeId>;
@ -210,7 +210,7 @@ enum ResolutionError<'a> {
/// Error E0434: can't capture dynamic environment in a fn item.
CannotCaptureDynamicEnvironmentInFnItem,
/// Error E0435: attempt to use a non-constant value in a constant.
AttemptToUseNonConstantValueInConstant,
AttemptToUseNonConstantValueInConstant(Ident, String),
/// Error E0530: `X` bindings cannot shadow `Y`s.
BindingShadowsSomethingUnacceptable(&'static str, Symbol, &'a NameBinding<'a>),
/// Error E0128: type parameters with a default cannot use forward-declared identifiers.
@ -1837,14 +1837,16 @@ impl<'a> Resolver<'a> {
// Use the rib kind to determine whether we are resolving parameters
// (macro 2.0 hygiene) or local variables (`macro_rules` hygiene).
let rib_ident = if ribs[i].kind.contains_params() { normalized_ident } else { ident };
if let Some(res) = ribs[i].bindings.get(&rib_ident).cloned() {
if let Some((original_rib_ident_def, res)) = ribs[i].bindings.get_key_value(&rib_ident)
{
// The ident resolves to a type parameter or local variable.
return Some(LexicalScopeBinding::Res(self.validate_res_from_ribs(
i,
rib_ident,
res,
*res,
record_used,
path_span,
*original_rib_ident_def,
ribs,
)));
}
@ -2556,6 +2558,7 @@ impl<'a> Resolver<'a> {
mut res: Res,
record_used: bool,
span: Span,
original_rib_ident_def: Ident,
all_ribs: &[Rib<'a>],
) -> Res {
const CG_BUG_STR: &str = "min_const_generics resolve check didn't stop compilation";
@ -2602,10 +2605,31 @@ impl<'a> Resolver<'a> {
res_err = Some(CannotCaptureDynamicEnvironmentInFnItem);
}
}
ConstantItemRibKind(_) => {
ConstantItemRibKind(_, item) => {
// Still doesn't deal with upvars
if record_used {
self.report_error(span, AttemptToUseNonConstantValueInConstant);
let (span, resolution_error) =
if let Some((ident, constant_item_kind)) = item {
let kind_str = match constant_item_kind {
ConstantItemKind::Const => "const",
ConstantItemKind::Static => "static",
};
let sugg = format!(
"consider using `let` instead of `{}`",
kind_str
);
(span, AttemptToUseNonConstantValueInConstant(ident, sugg))
} else {
let sugg = "consider using `const` instead of `let`";
(
rib_ident.span,
AttemptToUseNonConstantValueInConstant(
original_rib_ident_def,
sugg.to_string(),
),
)
};
self.report_error(span, resolution_error);
}
return Res::Err;
}
@ -2641,7 +2665,7 @@ impl<'a> Resolver<'a> {
in_ty_param_default = true;
continue;
}
ConstantItemRibKind(trivial) => {
ConstantItemRibKind(trivial, _) => {
let features = self.session.features_untracked();
// HACK(min_const_generics): We currently only allow `N` or `{ N }`.
if !(trivial
@ -2734,7 +2758,7 @@ impl<'a> Resolver<'a> {
in_ty_param_default = true;
continue;
}
ConstantItemRibKind(trivial) => {
ConstantItemRibKind(trivial, _) => {
let features = self.session.features_untracked();
// HACK(min_const_generics): We currently only allow `N` or `{ N }`.
if !(trivial

10
compiler/rustc_session/src/config.rs
View File

@ -1829,11 +1829,17 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
}
if debugging_opts.mir_opt_level > 1 {
// Functions inlined during MIR transform can, at best, make it impossible to
// effectively cover inlined functions, and, at worst, break coverage map generation
// during LLVM codegen. For example, function counter IDs are only unique within a
// function. Inlining after these counters are injected can produce duplicate counters,
// resulting in an invalid coverage map (and ICE); so this option combination is not
// allowed.
early_warn(
error_format,
&format!(
"`-Z mir-opt-level={}` (any level > 1) enables function inlining, which \
limits the effectiveness of `-Z instrument-coverage`.",
"`-Z mir-opt-level={}` (or any level > 1) enables function inlining, which \
is incompatible with `-Z instrument-coverage`. Inlining will be disabled.",
debugging_opts.mir_opt_level,
),
);

2
library/core/src/str/mod.rs
View File

@ -2175,7 +2175,7 @@ impl str {
/// helps the inference algorithm understand specifically which type
/// you're trying to parse into.
///
/// `parse` can parse any type that implements the [`FromStr`] trait.
/// `parse` can parse into any type that implements the [`FromStr`] trait.
///
/// # Errors

4
src/librustdoc/clean/types.rs
View File

@ -291,7 +291,9 @@ impl Item {
}
}
/// See comments on next_def_id
/// See the documentation for [`next_def_id()`].
///
/// [`next_def_id()`]: DocContext::next_def_id()
crate fn is_fake(&self) -> bool {
MAX_DEF_ID.with(|m| {
m.borrow().get(&self.def_id.krate).map(|id| self.def_id >= *id).unwrap_or(false)

22
src/librustdoc/core.rs
View File

@ -120,14 +120,20 @@ impl<'tcx> DocContext<'tcx> {
r
}
// This is an ugly hack, but it's the simplest way to handle synthetic impls without greatly
// refactoring either librustdoc or librustc_middle. In particular, allowing new DefIds to be
// registered after the AST is constructed would require storing the defid mapping in a
// RefCell, decreasing the performance for normal compilation for very little gain.
//
// Instead, we construct 'fake' def ids, which start immediately after the last DefId.
// In the Debug impl for clean::Item, we explicitly check for fake
// def ids, as we'll end up with a panic if we use the DefId Debug impl for fake DefIds
/// Create a new "fake" [`DefId`].
///
/// This is an ugly hack, but it's the simplest way to handle synthetic impls without greatly
/// refactoring either rustdoc or [`rustc_middle`]. In particular, allowing new [`DefId`]s
/// to be registered after the AST is constructed would require storing the [`DefId`] mapping
/// in a [`RefCell`], decreasing the performance for normal compilation for very little gain.
///
/// Instead, we construct "fake" [`DefId`]s, which start immediately after the last `DefId`.
/// In the [`Debug`] impl for [`clean::Item`], we explicitly check for fake `DefId`s,
/// as we'll end up with a panic if we use the `DefId` `Debug` impl for fake `DefId`s.
///
/// [`RefCell`]: std::cell::RefCell
/// [`Debug`]: std::fmt::Debug
/// [`clean::Item`]: crate::clean::types::Item
crate fn next_def_id(&self, crate_num: CrateNum) -> DefId {
let start_def_id = {
let num_def_ids = if crate_num == LOCAL_CRATE {

1
src/librustdoc/html/static/rustdoc.css
View File

@ -1412,6 +1412,7 @@ h4 > .notable-traits {
.sidebar > .block.version {
border-bottom: none;
margin-top: 12px;
margin-bottom: 0;
}
nav.sub {

48
src/librustdoc/passes/collect_intra_doc_links.rs
View File

@ -394,10 +394,14 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
ns,
impl_,
)
.map(|item| match item.kind {
.map(|item| {
let kind = item.kind;
self.kind_side_channel.set(Some((kind.as_def_kind(), item.def_id)));
match kind {
ty::AssocKind::Fn => "method",
ty::AssocKind::Const => "associatedconstant",
ty::AssocKind::Type => "associatedtype",
}
})
.map(|out| {
(
@ -1142,17 +1146,8 @@ impl LinkCollector<'_, '_> {
callback,
);
};
match res {
Res::Primitive(_) => match disambiguator {
Some(Disambiguator::Primitive | Disambiguator::Namespace(_)) | None => {
Some(ItemLink { link: ori_link.link, link_text, did: None, fragment })
}
Some(other) => {
report_mismatch(other, Disambiguator::Primitive);
None
}
},
Res::Def(kind, id) => {
let verify = |kind: DefKind, id: DefId| {
debug!("intra-doc link to {} resolved to {:?}", path_str, res);
// Disallow e.g. linking to enums with `struct@`
@ -1191,6 +1186,35 @@ impl LinkCollector<'_, '_> {
privacy_error(cx, &item, &path_str, dox, &ori_link);
}
}
Some((kind, id))
};
match res {
Res::Primitive(_) => {
if let Some((kind, id)) = self.kind_side_channel.take() {
// We're actually resolving an associated item of a primitive, so we need to
// verify the disambiguator (if any) matches the type of the associated item.
// This case should really follow the same flow as the `Res::Def` branch below,
// but attempting to add a call to `clean::register_res` causes an ICE. @jyn514
// thinks `register_res` is only needed for cross-crate re-exports, but Rust
// doesn't allow statements like `use str::trim;`, making this a (hopefully)
// valid omission. See https://github.com/rust-lang/rust/pull/80660#discussion_r551585677
// for discussion on the matter.
verify(kind, id)?;
} else {
match disambiguator {
Some(Disambiguator::Primitive | Disambiguator::Namespace(_)) | None => {}
Some(other) => {
report_mismatch(other, Disambiguator::Primitive);
return None;
}
}
}
Some(ItemLink { link: ori_link.link, link_text, did: None, fragment })
}
Res::Def(kind, id) => {
let (kind, id) = verify(kind, id)?;
let id = clean::register_res(cx, rustc_hir::def::Res::Def(kind, id));
Some(ItemLink { link: ori_link.link, link_text, did: Some(id), fragment })
}

124
src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt
View File

@ -21,50 +21,86 @@
20| |//!
21| |//! doctest returning a result:
22| 1|//! ```
23| 1|//! #[derive(Debug)]
24| 1|//! struct SomeError;
25| 1|//! let mut res = Err(SomeError);
26| 1|//! if res.is_ok() {
27| 0|//! res?;
28| 1|//! } else {
29| 1|//! res = Ok(0);
30| 1|//! }
31| |//! // need to be explicit because rustdoc cant infer the return type
32| 1|//! Ok::<(), SomeError>(())
33| 1|//! ```
34| |//!
35| |//! doctest with custom main:
36| |//! ```
37| |//! #[derive(Debug)]
38| |//! struct SomeError;
39| |//!
40| |//! extern crate doctest_crate;
41| |//!
42| 1|//! fn doctest_main() -> Result<(), SomeError> {
43| 1|//! doctest_crate::fn_run_in_doctests(2);
44| 1|//! Ok(())
45| 1|//! }
46| |//!
47| |//! // this `main` is not shown as covered, as it clashes with all the other
48| |//! // `main` functions that were automatically generated for doctests
49| |//! fn main() -> Result<(), SomeError> {
50| |//! doctest_main()
51| |//! }
52| |//! ```
53| |
54| |/// doctest attached to fn testing external code:
55| |/// ```
56| 1|/// extern crate doctest_crate;
57| 1|/// doctest_crate::fn_run_in_doctests(3);
58| 1|/// ```
59| |///
60| 1|fn main() {
61| 1| if true {
62| 1| assert_eq!(1, 1);
63| | } else {
64| | assert_eq!(1, 2);
65| | }
66| 1|}
23| 2|//! #[derive(Debug, PartialEq)]
^1
24| 1|//! struct SomeError {
25| 1|//! msg: String,
26| 1|//! }
27| 1|//! let mut res = Err(SomeError { msg: String::from("a message") });
28| 1|//! if res.is_ok() {
29| 0|//! res?;
30| |//! } else {
31| 1|//! if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
32| 1|//! println!("{:?}", res);
33| 1|//! }
^0
34| 1|//! if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
35| 1|//! res = Ok(1);
36| 1|//! }
^0
37| 1|//! res = Ok(0);
38| |//! }
39| |//! // need to be explicit because rustdoc cant infer the return type
40| 1|//! Ok::<(), SomeError>(())
41| 1|//! ```
42| |//!
43| |//! doctest with custom main:
44| |//! ```
45| 1|//! fn some_func() {
46| 1|//! println!("called some_func()");
47| 1|//! }
48| |//!
49| |//! #[derive(Debug)]
50| |//! struct SomeError;
51| |//!
52| |//! extern crate doctest_crate;
53| |//!
54| 1|//! fn doctest_main() -> Result<(), SomeError> {
55| 1|//! some_func();
56| 1|//! doctest_crate::fn_run_in_doctests(2);
57| 1|//! Ok(())
58| 1|//! }
59| |//!
60| |//! // this `main` is not shown as covered, as it clashes with all the other
61| |//! // `main` functions that were automatically generated for doctests
62| |//! fn main() -> Result<(), SomeError> {
63| |//! doctest_main()
64| |//! }
65| |//! ```
66| |
67| |/// doctest attached to fn testing external code:
68| |/// ```
69| 1|/// extern crate doctest_crate;
70| 1|/// doctest_crate::fn_run_in_doctests(3);
71| 1|/// ```
72| |///
73| 1|fn main() {
74| 1| if true {
75| 1| assert_eq!(1, 1);
76| | } else {
77| | assert_eq!(1, 2);
78| | }
79| 1|}
80| |
81| |// FIXME(Swatinem): Fix known issue that coverage code region columns need to be offset by the
82| |// doc comment line prefix (`///` or `//!`) and any additional indent (before or after the doc
83| |// comment characters). This test produces `llvm-cov show` results demonstrating the problem.
84| |//
85| |// One of the above tests now includes: `derive(Debug, PartialEq)`, producing an `llvm-cov show`
86| |// result with a distinct count for `Debug`, denoted by `^1`, but the caret points to the wrong
87| |// column. Similarly, the `if` blocks without `else` blocks show `^0`, which should point at, or
88| |// one character past, the `if` block's closing brace. In both cases, these are most likely off
89| |// by the number of characters stripped from the beginning of each doc comment line: indent
90| |// whitespace, if any, doc comment prefix (`//!` in this case) and (I assume) one space character
91| |// (?). Note, when viewing `llvm-cov show` results in `--color` mode, the column offset errors are
92| |// more pronounced, and show up in more places, with background color used to show some distinct
93| |// code regions with different coverage counts.
94| |//
95| |// NOTE: Since the doc comment line prefix may vary, one possible solution is to replace each
96| |// character stripped from the beginning of doc comment lines with a space. This will give coverage
97| |// results the correct column offsets, and I think it should compile correctly, but I don't know
98| |// what affect it might have on diagnostic messages from the compiler, and whether anyone would care
99| |// if the indentation changed. I don't know if there is a more viable solution.
../coverage/lib/doctest_crate.rs:
1| |/// A function run only from within doctests

104
src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest/doctest.main.-------.InstrumentCoverage.0.html
View File

@ -69,59 +69,59 @@ For revisions in Pull Requests (PR):
</style>
</head>
<body>
<div class="code" style="counter-reset: line 59"><span class="line"><span><span class="code even" style="--layer: 1"><span class="annotation">@0⦊</span>fn main() <span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">{</span></span>
<span class="line"><span class="code" style="--layer: 0"> if </span><span><span class="code even" style="--layer: 1" title="61:8-61:12: @0[1]: _1 = const true
61:8-61:12: @0[2]: FakeRead(ForMatchedPlace, _1)"><span class="annotation">@0⦊</span>true<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0"> {</span></span>
<span class="line"><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="62:9-62:26: @5[0]: _2 = const ()"><span class="annotation">@5⦊</span></span></span><span class="code even" style="--layer: 2" title="62:9-62:26: @6[5]: _75 = const main::promoted[3]
62:9-62:26: @6[6]: _18 = &amp;(*_75)
62:9-62:26: @6[7]: _17 = &amp;(*_18)
62:9-62:26: @6[8]: _16 = move _17 as &amp;[&amp;str] (Pointer(Unsize))
62:9-62:26: @6[17]: _26 = &amp;(*_8)
62:9-62:26: @6[18]: _25 = &amp;_26
62:9-62:26: @6[21]: _28 = &amp;(*_9)
62:9-62:26: @6[22]: _27 = &amp;_28
62:9-62:26: @6[23]: _24 = (move _25, move _27)
62:9-62:26: @6[26]: FakeRead(ForMatchedPlace, _24)
62:9-62:26: @6[28]: _29 = (_24.0: &amp;&amp;i32)
62:9-62:26: @6[30]: _30 = (_24.1: &amp;&amp;i32)
62:9-62:26: @6[33]: _32 = &amp;(*_29)
62:9-62:26: @6[35]: _33 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
62:9-62:26: @6.Call: _31 = ArgumentV1::new::&lt;&amp;i32&gt;(move _32, move _33) -&gt; [return: bb7, unwind: bb17]
62:9-62:26: @7[4]: _35 = &amp;(*_30)
62:9-62:26: @7[6]: _36 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
62:9-62:26: @7.Call: _34 = ArgumentV1::new::&lt;&amp;i32&gt;(move _35, move _36) -&gt; [return: bb8, unwind: bb17]
62:9-62:26: @8[2]: _23 = [move _31, move _34]
62:9-62:26: @8[7]: _22 = &amp;_23
62:9-62:26: @8[8]: _21 = &amp;(*_22)
62:9-62:26: @8[9]: _20 = move _21 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
62:9-62:26: @8.Call: _15 = Arguments::new_v1(move _16, move _20) -&gt; [return: bb9, unwind: bb17]
62:9-62:26: @9.Call: core::panicking::panic_fmt(move _15) -&gt; bb17"><span class="annotation">@4,6,7,8,9⦊</span>assert_eq!(1, 1);<span class="annotation">⦉@4,6,7,8,9</span></span><span><span class="code odd" style="--layer: 1" title="62:9-62:26: @5[0]: _2 = const ()"><span class="annotation">⦉@5</span></span></span><span class="code" style="--layer: 0"></span></span>
<div class="code" style="counter-reset: line 72"><span class="line"><span><span class="code even" style="--layer: 1"><span class="annotation">@0⦊</span>fn main() <span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">{</span></span>
<span class="line"><span class="code" style="--layer: 0"> if </span><span><span class="code even" style="--layer: 1" title="74:8-74:12: @0[1]: _1 = const true
74:8-74:12: @0[2]: FakeRead(ForMatchedPlace, _1)"><span class="annotation">@0⦊</span>true<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0"> {</span></span>
<span class="line"><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="75:9-75:26: @5[0]: _2 = const ()"><span class="annotation">@5⦊</span></span></span><span class="code even" style="--layer: 2" title="75:9-75:26: @6[5]: _75 = const main::promoted[3]
75:9-75:26: @6[6]: _18 = &amp;(*_75)
75:9-75:26: @6[7]: _17 = &amp;(*_18)
75:9-75:26: @6[8]: _16 = move _17 as &amp;[&amp;str] (Pointer(Unsize))
75:9-75:26: @6[17]: _26 = &amp;(*_8)
75:9-75:26: @6[18]: _25 = &amp;_26
75:9-75:26: @6[21]: _28 = &amp;(*_9)
75:9-75:26: @6[22]: _27 = &amp;_28
75:9-75:26: @6[23]: _24 = (move _25, move _27)
75:9-75:26: @6[26]: FakeRead(ForMatchedPlace, _24)
75:9-75:26: @6[28]: _29 = (_24.0: &amp;&amp;i32)
75:9-75:26: @6[30]: _30 = (_24.1: &amp;&amp;i32)
75:9-75:26: @6[33]: _32 = &amp;(*_29)
75:9-75:26: @6[35]: _33 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
75:9-75:26: @6.Call: _31 = ArgumentV1::new::&lt;&amp;i32&gt;(move _32, move _33) -&gt; [return: bb7, unwind: bb17]
75:9-75:26: @7[4]: _35 = &amp;(*_30)
75:9-75:26: @7[6]: _36 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
75:9-75:26: @7.Call: _34 = ArgumentV1::new::&lt;&amp;i32&gt;(move _35, move _36) -&gt; [return: bb8, unwind: bb17]
75:9-75:26: @8[2]: _23 = [move _31, move _34]
75:9-75:26: @8[7]: _22 = &amp;_23
75:9-75:26: @8[8]: _21 = &amp;(*_22)
75:9-75:26: @8[9]: _20 = move _21 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
75:9-75:26: @8.Call: _15 = Arguments::new_v1(move _16, move _20) -&gt; [return: bb9, unwind: bb17]
75:9-75:26: @9.Call: core::panicking::panic_fmt(move _15) -&gt; bb17"><span class="annotation">@4,6,7,8,9⦊</span>assert_eq!(1, 1);<span class="annotation">⦉@4,6,7,8,9</span></span><span><span class="code odd" style="--layer: 1" title="75:9-75:26: @5[0]: _2 = const ()"><span class="annotation">⦉@5</span></span></span><span class="code" style="--layer: 0"></span></span>
<span class="line"><span class="code" style="--layer: 0"> } else {</span></span>
<span class="line"><span class="code" style="--layer: 0"> </span><span><span class="code even" style="--layer: 1" title="64:9-64:26: @11[0]: _37 = const ()"><span class="annotation">@11⦊</span></span></span><span class="code even" style="--layer: 2" title="64:9-64:26: @12[5]: _72 = const main::promoted[0]
64:9-64:26: @12[6]: _53 = &amp;(*_72)
64:9-64:26: @12[7]: _52 = &amp;(*_53)
64:9-64:26: @12[8]: _51 = move _52 as &amp;[&amp;str] (Pointer(Unsize))
64:9-64:26: @12[17]: _61 = &amp;(*_43)
64:9-64:26: @12[18]: _60 = &amp;_61
64:9-64:26: @12[21]: _63 = &amp;(*_44)
64:9-64:26: @12[22]: _62 = &amp;_63
64:9-64:26: @12[23]: _59 = (move _60, move _62)
64:9-64:26: @12[26]: FakeRead(ForMatchedPlace, _59)
64:9-64:26: @12[28]: _64 = (_59.0: &amp;&amp;i32)
64:9-64:26: @12[30]: _65 = (_59.1: &amp;&amp;i32)
64:9-64:26: @12[33]: _67 = &amp;(*_64)
64:9-64:26: @12[35]: _68 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
64:9-64:26: @12.Call: _66 = ArgumentV1::new::&lt;&amp;i32&gt;(move _67, move _68) -&gt; [return: bb13, unwind: bb17]
64:9-64:26: @13[4]: _70 = &amp;(*_65)
64:9-64:26: @13[6]: _71 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
64:9-64:26: @13.Call: _69 = ArgumentV1::new::&lt;&amp;i32&gt;(move _70, move _71) -&gt; [return: bb14, unwind: bb17]
64:9-64:26: @14[2]: _58 = [move _66, move _69]
64:9-64:26: @14[7]: _57 = &amp;_58
64:9-64:26: @14[8]: _56 = &amp;(*_57)
64:9-64:26: @14[9]: _55 = move _56 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
64:9-64:26: @14.Call: _50 = Arguments::new_v1(move _51, move _55) -&gt; [return: bb15, unwind: bb17]
64:9-64:26: @15.Call: core::panicking::panic_fmt(move _50) -&gt; bb17"><span class="annotation">@10,12,13,14,15⦊</span>assert_eq!(1, 2);<span class="annotation">⦉@10,12,13,14,15</span></span><span><span class="code even" style="--layer: 1" title="64:9-64:26: @11[0]: _37 = const ()"><span class="annotation">⦉@11</span></span></span><span class="code" style="--layer: 0"></span></span>
<span class="line"><span class="code" style="--layer: 0"> </span><span><span class="code even" style="--layer: 1" title="77:9-77:26: @11[0]: _37 = const ()"><span class="annotation">@11⦊</span></span></span><span class="code even" style="--layer: 2" title="77:9-77:26: @12[5]: _72 = const main::promoted[0]
77:9-77:26: @12[6]: _53 = &amp;(*_72)
77:9-77:26: @12[7]: _52 = &amp;(*_53)
77:9-77:26: @12[8]: _51 = move _52 as &amp;[&amp;str] (Pointer(Unsize))
77:9-77:26: @12[17]: _61 = &amp;(*_43)
77:9-77:26: @12[18]: _60 = &amp;_61
77:9-77:26: @12[21]: _63 = &amp;(*_44)
77:9-77:26: @12[22]: _62 = &amp;_63
77:9-77:26: @12[23]: _59 = (move _60, move _62)
77:9-77:26: @12[26]: FakeRead(ForMatchedPlace, _59)
77:9-77:26: @12[28]: _64 = (_59.0: &amp;&amp;i32)
77:9-77:26: @12[30]: _65 = (_59.1: &amp;&amp;i32)
77:9-77:26: @12[33]: _67 = &amp;(*_64)
77:9-77:26: @12[35]: _68 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77:9-77:26: @12.Call: _66 = ArgumentV1::new::&lt;&amp;i32&gt;(move _67, move _68) -&gt; [return: bb13, unwind: bb17]
77:9-77:26: @13[4]: _70 = &amp;(*_65)
77:9-77:26: @13[6]: _71 = &lt;&amp;i32 as Debug&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r &amp;i32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77:9-77:26: @13.Call: _69 = ArgumentV1::new::&lt;&amp;i32&gt;(move _70, move _71) -&gt; [return: bb14, unwind: bb17]
77:9-77:26: @14[2]: _58 = [move _66, move _69]
77:9-77:26: @14[7]: _57 = &amp;_58
77:9-77:26: @14[8]: _56 = &amp;(*_57)
77:9-77:26: @14[9]: _55 = move _56 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
77:9-77:26: @14.Call: _50 = Arguments::new_v1(move _51, move _55) -&gt; [return: bb15, unwind: bb17]
77:9-77:26: @15.Call: core::panicking::panic_fmt(move _50) -&gt; bb17"><span class="annotation">@10,12,13,14,15⦊</span>assert_eq!(1, 2);<span class="annotation">⦉@10,12,13,14,15</span></span><span><span class="code even" style="--layer: 1" title="77:9-77:26: @11[0]: _37 = const ()"><span class="annotation">⦉@11</span></span></span><span class="code" style="--layer: 0"></span></span>
<span class="line"><span class="code" style="--layer: 0"> }</span></span>
<span class="line"><span class="code" style="--layer: 0">}</span><span><span class="code odd" style="--layer: 1" title="66:2-66:2: @16.Return: return"><span class="annotation">@16⦊</span>‸<span class="annotation">⦉@16</span></span></span></span></div>
<span class="line"><span class="code" style="--layer: 0">}</span><span><span class="code odd" style="--layer: 1" title="79:2-79:2: @16.Return: return"><span class="annotation">@16⦊</span>‸<span class="annotation">⦉@16</span></span></span></span></div>
</body>
</html>

39
src/test/run-make-fulldeps/coverage/doctest.rs
View File

@ -20,12 +20,20 @@
//!
//! doctest returning a result:
//! ```
//! #[derive(Debug)]
//! struct SomeError;
//! let mut res = Err(SomeError);
//! #[derive(Debug, PartialEq)]
//! struct SomeError {
//! msg: String,
//! }
//! let mut res = Err(SomeError { msg: String::from("a message") });
//! if res.is_ok() {
//! res?;
//! } else {
//! if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
//! println!("{:?}", res);
//! }
//! if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
//! res = Ok(1);
//! }
//! res = Ok(0);
//! }
//! // need to be explicit because rustdoc cant infer the return type
@ -34,12 +42,17 @@
//!
//! doctest with custom main:
//! ```
//! fn some_func() {
//! println!("called some_func()");
//! }
//!
//! #[derive(Debug)]
//! struct SomeError;
//!
//! extern crate doctest_crate;
//!
//! fn doctest_main() -> Result<(), SomeError> {
//! some_func();
//! doctest_crate::fn_run_in_doctests(2);
//! Ok(())
//! }
@ -64,3 +77,23 @@ fn main() {
assert_eq!(1, 2);
}
}
// FIXME(Swatinem): Fix known issue that coverage code region columns need to be offset by the
// doc comment line prefix (`///` or `//!`) and any additional indent (before or after the doc
// comment characters). This test produces `llvm-cov show` results demonstrating the problem.
//
// One of the above tests now includes: `derive(Debug, PartialEq)`, producing an `llvm-cov show`
// result with a distinct count for `Debug`, denoted by `^1`, but the caret points to the wrong
// column. Similarly, the `if` blocks without `else` blocks show `^0`, which should point at, or
// one character past, the `if` block's closing brace. In both cases, these are most likely off
// by the number of characters stripped from the beginning of each doc comment line: indent
// whitespace, if any, doc comment prefix (`//!` in this case) and (I assume) one space character
// (?). Note, when viewing `llvm-cov show` results in `--color` mode, the column offset errors are
// more pronounced, and show up in more places, with background color used to show some distinct
// code regions with different coverage counts.
//
// NOTE: Since the doc comment line prefix may vary, one possible solution is to replace each
// character stripped from the beginning of doc comment lines with a space. This will give coverage
// results the correct column offsets, and I think it should compile correctly, but I don't know
// what affect it might have on diagnostic messages from the compiler, and whether anyone would care
// if the indentation changed. I don't know if there is a more viable solution.

3
src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.rs Normal file
View File

@ -0,0 +1,3 @@
#![deny(broken_intra_doc_links)]
//! [static@u8::MIN]
//~^ ERROR incompatible link kind

15
src/test/rustdoc-ui/intra-doc/incompatible-primitive-disambiguator.stderr Normal file
View File

@ -0,0 +1,15 @@
error: incompatible link kind for `u8::MIN`
--> $DIR/incompatible-primitive-disambiguator.rs:2:6
|
LL | //! [static@u8::MIN]
| ^^^^^^^^^^^^^^ help: to link to the associated constant, prefix with `const@`: `const@u8::MIN`
|
note: the lint level is defined here
--> $DIR/incompatible-primitive-disambiguator.rs:1:9
|
LL | #![deny(broken_intra_doc_links)]
| ^^^^^^^^^^^^^^^^^^^^^^
= note: this link resolved to an associated constant, which is not a static
error: aborting due to previous error

4
src/test/rustdoc/intra-doc/primitive-disambiguators.rs Normal file
View File

@ -0,0 +1,4 @@
#![deny(broken_intra_doc_links)]
// @has primitive_disambiguators/index.html
// @has - '//a/@href' 'https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim'
//! [str::trim()]

2
src/test/ui/error-codes/E0435.stderr
View File

@ -1,6 +1,8 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/E0435.rs:3:17
|
LL | let foo = 42u32;
| --- help: consider using `const` instead of `let`
LL | let _: [u8; foo];
| ^^^ non-constant value

16
src/test/ui/impl-trait/bindings.stderr
View File

@ -2,25 +2,33 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/bindings.rs:5:29
|
LL | const foo: impl Clone = x;
| ^ non-constant value
| --- ^ non-constant value
| |
| help: consider using `let` instead of `const`
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/bindings.rs:11:33
|
LL | const foo: impl Clone = x;
| ^ non-constant value
| --- ^ non-constant value
| |
| help: consider using `let` instead of `const`
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/bindings.rs:18:33
|
LL | const foo: impl Clone = x;
| ^ non-constant value
| --- ^ non-constant value
| |
| help: consider using `let` instead of `const`
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/bindings.rs:25:33
|
LL | const foo: impl Clone = x;
| ^ non-constant value
| --- ^ non-constant value
| |
| help: consider using `let` instead of `const`
warning: the feature `impl_trait_in_bindings` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/bindings.rs:1:12

4
src/test/ui/issues/issue-27433.stderr
View File

@ -2,7 +2,9 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-27433.rs:3:23
|
LL | const FOO : u32 = foo;
| ^^^ non-constant value
| --- ^^^ non-constant value
| |
| help: consider using `let` instead of `const`
error: aborting due to previous error

4
src/test/ui/issues/issue-3521-2.stderr
View File

@ -2,7 +2,9 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-3521-2.rs:4:23
|
LL | static y: isize = foo + 1;
| ^^^ non-constant value
| - ^^^ non-constant value
| |
| help: consider using `let` instead of `static`
error: aborting due to previous error

3
src/test/ui/issues/issue-3521.stderr
View File

@ -1,6 +1,9 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-3521.rs:6:15
|
LL | let foo = 100;
| --- help: consider using `const` instead of `let`
...
LL | Bar = foo
| ^^^ non-constant value

4
src/test/ui/issues/issue-3668-2.stderr
View File

@ -2,7 +2,9 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-3668-2.rs:2:27
|
LL | static child: isize = x + 1;
| ^ non-constant value
| ----- ^ non-constant value
| |
| help: consider using `let` instead of `static`
error: aborting due to previous error

4
src/test/ui/issues/issue-3668.stderr
View File

@ -2,7 +2,9 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-3668.rs:8:34
|
LL | static childVal: Box<P> = self.child.get();
| ^^^^ non-constant value
| -------- ^^^^ non-constant value
| |
| help: consider using `let` instead of `static`
error: aborting due to previous error

4
src/test/ui/issues/issue-42060.stderr
View File

@ -1,12 +1,16 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-42060.rs:3:23
|
LL | let thing = ();
| ----- help: consider using `const` instead of `let`
LL | let other: typeof(thing) = thing;
| ^^^^^ non-constant value
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-42060.rs:9:13
|
LL | let q = 1;
| - help: consider using `const` instead of `let`
LL | <typeof(q)>::N
| ^ non-constant value

3
src/test/ui/issues/issue-44239.stderr
View File

@ -1,6 +1,9 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/issue-44239.rs:6:26
|
LL | let n = 0;
| - help: consider using `const` instead of `let`
...
LL | const N: usize = n;
| ^ non-constant value

21
src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs Normal file
View File

@ -0,0 +1,21 @@
// Ensures -Zmir-opt-level=2 (specifically, inlining) is not allowed with -Zinstrument-coverage.
// Regression test for issue #80060.
//
// needs-profiler-support
// build-pass
// compile-flags: -Zmir-opt-level=2 -Zinstrument-coverage
#[inline(never)]
fn foo() {}
pub fn baz() {
bar();
}
#[inline(always)]
fn bar() {
foo();
}
fn main() {
bar();
}

2
src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.stderr Normal file
View File

@ -0,0 +1,2 @@
warning: `-Z mir-opt-level=2` (or any level > 1) enables function inlining, which is incompatible with `-Z instrument-coverage`. Inlining will be disabled.

2
src/test/ui/non-constant-expr-for-arr-len.stderr
View File

@ -1,6 +1,8 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/non-constant-expr-for-arr-len.rs:5:22
|
LL | fn bar(n: usize) {
| - help: consider using `const` instead of `let`
LL | let _x = [0; n];
| ^ non-constant value

256
src/test/ui/proc-macro/issue-75930-derive-cfg.stdout
View File

@ -1211,141 +1211,141 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "allow",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "dead_code",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_helper",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "b",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_helper",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "a",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "struct",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "Foo",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '<',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "B",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '>',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Ident {
ident: "second",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "bool",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "third",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "u8",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
@ -1353,58 +1353,58 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "not",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "struct",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "Inner",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "match",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "true",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
@ -1412,146 +1412,146 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "allow",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "warnings",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "false",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '=',
spacing: Joint,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '>',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "_",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '=',
spacing: Joint,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '>',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_helper",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "c",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "not",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "fn",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "kept_fn",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
@ -1559,82 +1559,82 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Joint,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "not",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "let",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "my_val",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '=',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "true",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "enum",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "TupleEnum",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Brace,
stream: TokenStream [
Ident {
ident: "Foo",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
@ -1642,69 +1642,69 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "not",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "i32",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "u8",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "struct",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "TupleStruct",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
@ -1712,120 +1712,120 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "cfg",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "not",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "FALSE",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "i32",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "u8",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ';',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Literal {
kind: Integer,
symbol: "0",
suffix: None,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: '#',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "print_helper",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "d",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "fourth",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ':',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Ident {
ident: "B",
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
Punct {
ch: ',',
spacing: Alone,
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
],
span: $DIR/issue-75930-derive-cfg.rs:1:1: 1:1 (#0),
span: $DIR/issue-75930-derive-cfg.rs:21:1: 64:2 (#0),
},
]

18
src/test/ui/proc-macro/issue-78675-captured-inner-attrs.stdout
View File

@ -34,11 +34,11 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
stream: TokenStream [
Ident {
ident: "mod",
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Ident {
ident: "bar",
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Group {
delimiter: Brace,
@ -46,36 +46,36 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
Punct {
ch: '#',
spacing: Joint,
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Punct {
ch: '!',
spacing: Alone,
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Group {
delimiter: Bracket,
stream: TokenStream [
Ident {
ident: "doc",
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Punct {
ch: '=',
spacing: Alone,
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
Literal {
kind: StrRaw(0),
symbol: " Foo",
suffix: None,
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
],
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
],
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),
span: $DIR/issue-78675-captured-inner-attrs.rs:27:5: 29:6 (#0),
},
],
span: $DIR/issue-78675-captured-inner-attrs.rs:22:13: 22:18 (#4),

2
src/test/ui/repeat_count.stderr
View File

@ -1,6 +1,8 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/repeat_count.rs:5:17
|
LL | let n = 1;
| - help: consider using `const` instead of `let`
LL | let a = [0; n];
| ^ non-constant value

4
src/test/ui/type/type-dependent-def-issue-49241.stderr
View File

@ -2,7 +2,9 @@ error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/type-dependent-def-issue-49241.rs:3:22
|
LL | const l: usize = v.count();
| ^ non-constant value
| - ^ non-constant value
| |
| help: consider using `let` instead of `const`
error: aborting due to previous error