Skip to content

Commit 2ccf063

Browse files
committedMar 15, 2021
Auto merge of #83149 - Dylan-DPC:rollup-ov70c5v, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #82989 (Custom error on literal names from other languages) - #83054 (Validate rustc_layout_scalar_valid_range_{start,end} attributes) - #83098 (Find more invalid doc attributes) - #83108 (Remove unused `opt_local_def_id_to_hir_id` function) - #83110 (Fix typos in `library/core/src/ptr/mod.rs` and `library/std/src/sys_common/thread_local_dtor.rs`) - #83113 (Minor refactoring in try_index_step) - #83127 (Introduce `proc_macro_back_compat` lint, and emit for `time-macros-impl`) - #83132 (Don't encode file information for span with a dummy location) - #83141 (:arrow_up: rust-analyzer) - #83144 (Introduce `rustc_interface::interface::Config::parse_sess_created` callback) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7a7bbdb + 2816c11 commit 2ccf063

File tree

42 files changed

+687
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+687
-159
lines changed
 

Diff for: ‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4247,6 +4247,7 @@ name = "rustc_passes"
42474247
version = "0.0.0"
42484248
dependencies = [
42494249
"rustc_ast",
4250+
"rustc_ast_pretty",
42504251
"rustc_attr",
42514252
"rustc_data_structures",
42524253
"rustc_errors",

Diff for: ‎compiler/rustc_ast/src/attr/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl NestedMetaItem {
120120
}
121121

122122
impl Attribute {
123+
#[inline]
123124
pub fn has_name(&self, name: Symbol) -> bool {
124125
match self.kind {
125126
AttrKind::Normal(ref item, _) => item.path == name,

0 commit comments

Comments
 (0)
Please sign in to comment.