Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f198510

Browse files
committedFeb 11, 2022
Auto merge of rust-lang#93921 - matthiaskrgr:rollup-wn3jlxj, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#90955 (Rename `FilenameTooLong` to `InvalidFilename` and also use it for Windows' `ERROR_INVALID_NAME`) - rust-lang#91607 (Make `span_extend_to_prev_str()` more robust) - rust-lang#92895 (Remove some unused functionality) - rust-lang#93635 (Add missing platform-specific information on current_dir and set_current_dir) - rust-lang#93660 (rustdoc-json: Add some tests for typealias item) - rust-lang#93782 (Split `pauth` target feature) - rust-lang#93868 (Fix incorrect register conflict detection in asm!) - rust-lang#93888 (Implement `AsFd` for `&T` and `&mut T`.) - rust-lang#93909 (Fix typo: explicitely -> explicitly) - rust-lang#93910 (fix mention of moved function in `rustc_hir` docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents e789f3a + de0feb3 commit f198510

File tree

41 files changed

+487
-99
lines changed

Some content is hidden

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

41 files changed

+487
-99
lines changed
 

‎compiler/rustc_ast_lowering/src/asm.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
373373
err.emit();
374374
}
375375
Entry::Vacant(v) => {
376-
v.insert(idx);
376+
if r == reg {
377+
v.insert(idx);
378+
}
377379
}
378380
}
379381
};

‎compiler/rustc_builtin_macros/src/standard_library_imports.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub fn inject(
1111
mut krate: ast::Crate,
1212
resolver: &mut dyn ResolverExpand,
1313
sess: &Session,
14-
alt_std_name: Option<Symbol>,
1514
) -> ast::Crate {
1615
let edition = sess.parse_sess.edition;
1716

@@ -53,7 +52,7 @@ pub fn inject(
5352
span,
5453
ident,
5554
vec![cx.attribute(cx.meta_word(span, sym::macro_use))],
56-
ast::ItemKind::ExternCrate(alt_std_name),
55+
ast::ItemKind::ExternCrate(None),
5756
),
5857
);
5958
}

0 commit comments

Comments
 (0)
This repository has been archived.