diff options
| author | bors <bors@rust-lang.org> | 2020-07-07 00:56:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-07 00:56:44 +0000 |
| commit | 70f9d23b916f2db7da711aa4a0317a218997ba42 (patch) | |
| tree | 583d0a11c2b82dc7ebc149ebbcdab4523dedbdfe /src/test/rustdoc/structfields.rs | |
| parent | 8981dbbc36f1575b0a417b6849767bde29e7c6b4 (diff) | |
| parent | 73f2069d529c9d945967dd8f1a3b71b6003c7f96 (diff) | |
Auto merge of #74117 - Manishearth:rollup-ds7z0kx, r=Manishearth
Rollup of 14 pull requests Successful merges: - #70563 ([rustdoc] Page hash handling) - #73856 (Edit librustc_lexer top-level docs) - #73870 (typeck: adding type information to projection) - #73953 (Audit hidden/short code suggestions) - #73962 (libstd/net/tcp.rs: #![deny(unsafe_op_in_unsafe_fn)]) - #73969 (mir: mark mir construction temporaries as internal) - #73974 (Move A|Rc::as_ptr from feature(weak_into_raw) to feature(rc_as_ptr)) - #74067 (rustdoc: Restore underline text decoration on hover for FQN in header) - #74074 (Fix the return type of Windows' `OpenOptionsExt::security_qos_flags`.) - #74078 (Always resolve type@primitive as a primitive, not a module) - #74089 (Add rust-analyzer to the build manifest) - #74090 (Remove unused RUSTC_DEBUG_ASSERTIONS) - #74102 (Fix const prop ICE) - #74112 (Expand abbreviation in core::ffi description) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc/structfields.rs')
| -rw-r--r-- | src/test/rustdoc/structfields.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/test/rustdoc/structfields.rs b/src/test/rustdoc/structfields.rs index 235f0e852da..6de198453cd 100644 --- a/src/test/rustdoc/structfields.rs +++ b/src/test/rustdoc/structfields.rs @@ -1,7 +1,3 @@ -// compile-flags:-Z unstable-options --generate-redirect-pages - -// @has structfields/Foo.t.html -// @has - struct.Foo.html // @has structfields/struct.Foo.html pub struct Foo { // @has - //pre "pub a: ()" @@ -16,8 +12,6 @@ pub struct Foo { pub d: usize, } -// @has structfields/Bar.t.html -// @has - struct.Bar.html // @has structfields/struct.Bar.html pub struct Bar { // @has - //pre "pub a: ()" @@ -25,8 +19,6 @@ pub struct Bar { // @!has - //pre "// some fields omitted" } -// @has structfields/Qux.t.html -// @has - enum.Qux.html // @has structfields/enum.Qux.html pub enum Qux { Quz { |