Skip to content
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

Rollup of 8 pull requests #69927

Closed
wants to merge 51 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
35c4aae
Added tvOS as a backend
simlay Jan 11, 2020
a266169
Merge branch 'master' of github.com:rust-lang/rust into add-tvSO-target
Feb 14, 2020
6b17330
Merged apple_tvos_base and apple_ios_base into apple_sdk_base.
Feb 15, 2020
2599771
fmt
Feb 20, 2020
0e1cd59
Toolstate: remove redundant beta-week check.
ehuss Mar 4, 2020
a6d8c9c
more toolstate comments
RalfJung Mar 4, 2020
a41f1f1
Further clarifications and comments on toolstate operation.
ehuss Mar 4, 2020
3d146a3
Document unsafe blocks in core::fmt
foeb Feb 10, 2020
4897594
miri: ICE on invalid terminators
RalfJung Mar 8, 2020
f2cbe30
submod_path_from_attr: simplify & document
Centril Mar 7, 2020
9b3364f
extract error_cannot_declare_mod_here
Centril Mar 7, 2020
6cb04d9
extract error_decl_mod_in_block
Centril Mar 7, 2020
024af0b
simplify submod_path
Centril Mar 7, 2020
9855b34
submod_path: use id.span
Centril Mar 7, 2020
3eb86cf
extract parse_mod
Centril Mar 7, 2020
cbcb550
extract error_on_circular_module
Centril Mar 7, 2020
996449b
detach submod_path from Parser
Centril Mar 8, 2020
81b3500
decouple push_directory from Parser
Centril Mar 8, 2020
f284eb3
decouple eval_src_mod from Parser
Centril Mar 8, 2020
aff35c4
expand: use push_directory
Centril Mar 8, 2020
75ad1b8
de-fatalize outline module parsing
Centril Mar 8, 2020
e0d001e
extract parse_external_module
Centril Mar 8, 2020
df3792c
extract error_on_circular_module
Centril Mar 8, 2020
a9fd977
outline modules: parse -> expand.
Centril Mar 8, 2020
e994922
parse: module parsing -> item.rs
Centril Mar 8, 2020
65d072d
move Directory -> parser::module
Centril Mar 8, 2020
1b527ae
{rustc_parse::parser -> rustc_expand}::module
Centril Mar 8, 2020
adc3451
{rustc_parse -> rustc_expand}::config
Centril Mar 8, 2020
d171e59
add test for stripped nested outline module
Centril Mar 8, 2020
ad0b078
parser/expand: minor cleanup
Centril Mar 9, 2020
8a8870f
miri: add machine hook for Abort terminator
RalfJung Mar 9, 2020
911c75f
also handle abort intrinsic with new machine hook
RalfJung Mar 9, 2020
7df5868
tweak outline module parsing spans
Centril Mar 9, 2020
42ab820
use pretty-compare-only in a test
Centril Mar 10, 2020
0037f4e
Rename rustc-guide to rustc-dev-guide
spastorino Mar 6, 2020
9d4fdba
Rename rustc guide to rustc dev guide
spastorino Mar 5, 2020
1ddcea3
Rename rustc_guide to rustc_dev_guide
spastorino Mar 6, 2020
d00b269
Rename Rustc Guide to Rustc Dev Guide
spastorino Mar 6, 2020
b3b32b7
rust-lang.github.io/rustc-dev-guide -> rustc-dev-guide.rust-lang.org
spastorino Mar 9, 2020
cdc7304
Compute the correct layout for variants of uninhabited enums and read…
oli-obk Mar 6, 2020
ec88ffa
Comment nits
oli-obk Mar 11, 2020
3244c84
rustdoc: remove unused import
matthiaskrgr Mar 11, 2020
74608c7
Rustfmt and adjust capitalization
oli-obk Mar 11, 2020
8296e2c
Rollup merge of #68191 - simlay:add-tvSO-target, r=nagisa
Centril Mar 11, 2020
baef20b
Rollup merge of #69011 - foeb:document-unsafe-core-fmt, r=Mark-Simula…
Centril Mar 11, 2020
7f51b9f
Rollup merge of #69705 - ehuss:toolstate-remove-redundant-beta, r=Mar…
Centril Mar 11, 2020
64f4b79
Rollup merge of #69747 - spastorino:rename-rustc-guide, r=pietroalbini
Centril Mar 11, 2020
3dc5218
Rollup merge of #69768 - oli-obk:union_field_ice, r=eddyb,RalfJung
Centril Mar 11, 2020
4d75a9a
Rollup merge of #69830 - RalfJung:miri-invalid-terminator, r=oli-obk
Centril Mar 11, 2020
9e299ee
Rollup merge of #69838 - Centril:expand-module, r=petrochenkov,eddyb
Centril Mar 11, 2020
0f2f612
Rollup merge of #69921 - matthiaskrgr:rustdoc_import, r=Centril
Centril Mar 11, 2020
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
add test for stripped nested outline module
  • Loading branch information
Centril committed Mar 8, 2020
commit d171e59716f997c76070b0577990b84096f326bf
13 changes: 13 additions & 0 deletions src/test/ui/parser/stripped-nested-outline-mod-pass.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Expansion drives parsing, so conditional compilation will strip
// out outline modules and we will never attempt parsing them.

// check-pass

fn main() {}

#[cfg(FALSE)]
mod foo {
mod bar {
mod baz; // This was an error before.
}
}