Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 30fb124

Browse files
committedNov 8, 2021
Merge commit 'ea199bacef07213dbe008841b89c450e3bf0c638' into rustfmt-sync
2 parents 46b8e74 + ea199ba commit 30fb124

Some content is hidden

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

59 files changed

+670
-372
lines changed
 
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: rustdoc check
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
8+
jobs:
9+
rustdoc_check:
10+
runs-on: ubuntu-latest
11+
name: rustdoc check
12+
steps:
13+
- name: checkout
14+
uses: actions/checkout@v2
15+
16+
- name: install rustup
17+
run: |
18+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh
19+
sh rustup-init.sh -y --default-toolchain none
20+
rustup target add x86_64-unknown-linux-gnu
21+
22+
- name: document rustfmt
23+
env:
24+
RUSTDOCFLAGS: --document-private-items --enable-index-page --show-type-layout --generate-link-to-definition -Zunstable-options -Dwarnings
25+
run: cargo doc -Zskip-rustdoc-fingerprint --no-deps -p rustfmt-nightly -p rustfmt-config_proc_macro

‎src/tools/rustfmt/Configurations.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,7 @@ use sit;
20622062
Controls the strategy for how imports are grouped together.
20632063

20642064
- **Default value**: `Preserve`
2065-
- **Possible values**: `Preserve`, `StdExternalCrate`
2065+
- **Possible values**: `Preserve`, `StdExternalCrate`, `One`
20662066
- **Stable**: No
20672067

20682068
#### `Preserve` (default):
@@ -2108,6 +2108,23 @@ use super::update::convert_publish_payload;
21082108
use crate::models::Event;
21092109
```
21102110

2111+
#### `One`:
2112+
2113+
Discard existing import groups, and create a single group for everything
2114+
2115+
```rust
2116+
use super::schema::{Context, Payload};
2117+
use super::update::convert_publish_payload;
2118+
use crate::models::Event;
2119+
use alloc::alloc::Layout;
2120+
use broker::database::PooledConnection;
2121+
use chrono::Utc;
2122+
use core::f32;
2123+
use juniper::{FieldError, FieldResult};
2124+
use std::sync::Arc;
2125+
use uuid::Uuid;
2126+
```
2127+
21112128
## `reorder_modules`
21122129

21132130
Reorder `mod` declarations alphabetically in group.

0 commit comments

Comments
 (0)
This repository has been archived.