diff options
| author | bors <bors@rust-lang.org> | 2020-01-24 23:04:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-24 23:04:54 +0000 |
| commit | 8647aa1a2ce279f8ec7cc5252d10b8cb9ea504eb (patch) | |
| tree | ea761455fe8821274ff5db691e789a91a206631d /src/libstd/sys/cloudabi | |
| parent | c2d141df59703393c0c683abc259f9a8c3be041a (diff) | |
| parent | f998e275cae5320e75871c626c0f88eaef83d5e4 (diff) | |
| download | rust-8647aa1a2ce279f8ec7cc5252d10b8cb9ea504eb.tar.gz rust-8647aa1a2ce279f8ec7cc5252d10b8cb9ea504eb.zip | |
Auto merge of #68526 - JohnTitor:rollup-3mmljof, r=JohnTitor
Rollup of 6 pull requests Successful merges: - #68111 (Print constants in `type_name` for const generics) - #68374 (Fix invalid link to the C++ Exception Handling ABI documentation) - #68504 (Use check-pass mode for lint tests and nll tests) - #68509 (Clean up error codes E0223 and E0225 explanations) - #68511 (Remove unused ignore-license directives) - #68515 (Support feature process_set_argv0 for VxWorks) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys/cloudabi')
| -rw-r--r-- | src/libstd/sys/cloudabi/abi/bitflags.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys/cloudabi/abi/cloudabi.rs | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/sys/cloudabi/abi/bitflags.rs b/src/libstd/sys/cloudabi/abi/bitflags.rs index 306936213ed..2383277ad72 100644 --- a/src/libstd/sys/cloudabi/abi/bitflags.rs +++ b/src/libstd/sys/cloudabi/abi/bitflags.rs @@ -21,9 +21,6 @@ // OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF // SUCH DAMAGE. -// Appease Rust's tidy. -// ignore-license - #[cfg(feature = "bitflags")] use bitflags::bitflags; diff --git a/src/libstd/sys/cloudabi/abi/cloudabi.rs b/src/libstd/sys/cloudabi/abi/cloudabi.rs index d113a7b3d60..b02faf1830c 100644 --- a/src/libstd/sys/cloudabi/abi/cloudabi.rs +++ b/src/libstd/sys/cloudabi/abi/cloudabi.rs @@ -26,7 +26,6 @@ // Source: https://github.com/NuxiNL/cloudabi // Appease Rust's tidy. -// ignore-license // ignore-tidy-linelength //! **PLEASE NOTE: This entire crate including this |