Skip to content

Rollup of 20 pull requests #82148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
c2e849c
added a suggestion to create a `const` item if the `fn` in the array …
henryboisdequin Jan 29, 2021
bfd1ccf
Seal the CommandExt, OsStrExt and OsStringExt traits
Amanieu Feb 10, 2021
5fe8490
Add match pattern diagnostics regression test
vandenheuvel Feb 8, 2021
dd9db23
Fix typos in BTreeSet::{first, last} docs
taiki-e Feb 13, 2021
d6dcb3d
CTFE validation: catch ReadPointerAsBytes and better error
RalfJung Feb 13, 2021
a3e0795
Heat up the ICE-y error reporting
BoxyUwU Feb 13, 2021
ee9709f
Fixed minor typo in catch_unwind docs
Feb 13, 2021
68405fd
debug!("paramenv={}paramenv={}paramenv={}paramenv={}")
BoxyUwU Feb 13, 2021
b6144e7
yeet ya fixme into the void
BoxyUwU Feb 13, 2021
a419e11
a wild test has appeared uwu
BoxyUwU Feb 13, 2021
1c3841e
Edit `rustc_arena::DropArena` docs
pierwill Feb 13, 2021
64fe2c1
update message
henryboisdequin Feb 14, 2021
d1a541e
Add tests for Atomic*::fetch_{min,max}
bjorn3 Feb 14, 2021
7bd7126
param_env debugs are instrumental to rustc's success
BoxyUwU Feb 14, 2021
ba72bc9
fix typo
TaKO8Ki Feb 14, 2021
c583860
Remove unnecessary `Option` in `default_doc`
jyn514 Feb 14, 2021
0038eae
rustc_span: Remove obsolete `allow_internal_unstable_backcompat_hack`
petrochenkov Feb 14, 2021
18c94b3
expand: Remove obsolete `ExpansionConfig::keep_macs`
petrochenkov Feb 14, 2021
6e11a8b
expand: Remove redundant calls to configure
petrochenkov Feb 14, 2021
dee5424
Add missing env!-decl variant
lukaslueg Feb 14, 2021
1aa9651
Fix typo in link to CreateSymbolicLinkW documentation.
m-ou-se Feb 14, 2021
3d7fcff
Update library/core/src/macros/mod.rs
lukaslueg Feb 14, 2021
4613b37
Stabilize Arguments::as_str
sfackler Feb 14, 2021
63806cc
Remove redundant bool_to_option feature gate
est31 Feb 15, 2021
ec77574
Update link for extern prelude.
ehuss Feb 15, 2021
fd21eb1
32-bit ARM: Emit `lr` instead of `r14` when specified as an `asm!` ou…
Feb 15, 2021
6931027
:arrow_up: rust-analyzer
lnicola Feb 15, 2021
f7c658f
Rollup merge of #81503 - henryboisdequin:fix-const-fn-arr-err-msg, r=…
jonas-schievink Feb 15, 2021
d2c18d8
Rollup merge of #81897 - vandenheuvel:match_exhaustive_diagnostics_re…
jonas-schievink Feb 15, 2021
5735e5d
Rollup merge of #81975 - Amanieu:seal2, r=m-ou-se
jonas-schievink Feb 15, 2021
d5f0877
Rollup merge of #82009 - BoxyUwU:idontknooow, r=varkor
jonas-schievink Feb 15, 2021
8667478
Rollup merge of #82060 - taiki-e:typo, r=m-ou-se
jonas-schievink Feb 15, 2021
95d3159
Rollup merge of #82061 - RalfJung:ctfe-read-pointer-as-bytes, r=oli-obk
jonas-schievink Feb 15, 2021
c9a104c
Rollup merge of #82063 - NULLx76:fix-minor-typo, r=jonas-schievink
jonas-schievink Feb 15, 2021
ada22ee
Rollup merge of #82067 - BoxyUwU:hahaicantthinkofabadpun, r=oli-obk
jonas-schievink Feb 15, 2021
1b97090
Rollup merge of #82077 - pierwill:edit-droparena, r=lcnr
jonas-schievink Feb 15, 2021
0deeba3
Rollup merge of #82093 - bjorn3:more_atomic_tests, r=kennytm
jonas-schievink Feb 15, 2021
b9cb948
Rollup merge of #82096 - TaKO8Ki:fix-typo, r=GuillaumeGomez
jonas-schievink Feb 15, 2021
f4f052a
Rollup merge of #82106 - jyn514:cleanup-bootstrap, r=Mark-Simulacrum
jonas-schievink Feb 15, 2021
19da712
Rollup merge of #82107 - petrochenkov:minexpclean, r=Aaron1011
jonas-schievink Feb 15, 2021
47c8b4d
Rollup merge of #82118 - lukaslueg:env_decl, r=m-ou-se
jonas-schievink Feb 15, 2021
a5ad91d
Rollup merge of #82119 - m-ou-se:typo, r=dtolnay
jonas-schievink Feb 15, 2021
dfd87a4
Rollup merge of #82120 - sfackler:arguments-as-str, r=dtolnay
jonas-schievink Feb 15, 2021
0d71d96
Rollup merge of #82129 - est31:master, r=jyn514
jonas-schievink Feb 15, 2021
737f2b4
Rollup merge of #82133 - ehuss:extern-prelude-link, r=jyn514
jonas-schievink Feb 15, 2021
f2f0b8b
Rollup merge of #82141 - jrvanwhy:issue-82052, r=sanxiyn
jonas-schievink Feb 15, 2021
4f47637
Rollup merge of #82147 - lnicola:rust-analyzer-2021-02-15, r=jonas-sc…
jonas-schievink Feb 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
expand: Remove obsolete ExpansionConfig::keep_macs
Maybe it was used before the introduction of placeholders, but now it has no effect.
  • Loading branch information
petrochenkov committed Feb 14, 2021
commit 18c94b3eddc424717bb4be14a23b8173c93cccc7
6 changes: 2 additions & 4 deletions compiler/rustc_expand/src/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1614,9 +1614,8 @@ pub struct ExpansionConfig<'feat> {
pub features: Option<&'feat Features>,
pub recursion_limit: Limit,
pub trace_mac: bool,
pub should_test: bool, // If false, strip `#[test]` nodes
pub keep_macs: bool,
pub span_debug: bool, // If true, use verbose debugging for `proc_macro::Span`
pub should_test: bool, // If false, strip `#[test]` nodes
pub span_debug: bool, // If true, use verbose debugging for `proc_macro::Span`
pub proc_macro_backtrace: bool, // If true, show backtraces for proc-macro panics
}

Expand All @@ -1628,7 +1627,6 @@ impl<'feat> ExpansionConfig<'feat> {
recursion_limit: Limit::new(1024),
trace_mac: false,
should_test: false,
keep_macs: false,
span_debug: false,
proc_macro_backtrace: false,
}
Expand Down
8 changes: 0 additions & 8 deletions compiler/rustc_expand/src/placeholders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -371,12 +371,4 @@ impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
}
}
}

fn visit_mod(&mut self, module: &mut ast::Mod) {
noop_visit_mod(module, self);
// remove macro definitions
module.items.retain(
|item| !matches!(item.kind, ast::ItemKind::MacCall(_) if !self.cx.ecfg.keep_macs),
);
}
}