Skip to content

Commit c20be2b

Browse files
committed
reformat code in doc comments using nightly rustfmt
1 parent ab77f56 commit c20be2b

File tree

9 files changed

+44
-43
lines changed

9 files changed

+44
-43
lines changed

benches/client.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use chrono::{DateTime, Utc};
2-
use influxdb::Error;
3-
use influxdb::InfluxDbWriteable;
4-
use influxdb::{Client, ReadQuery};
2+
use influxdb::{Client, Error, InfluxDbWriteable, ReadQuery};
53
use std::sync::Arc;
64
use std::time::Instant;
75
use tokio::sync::mpsc::unbounded_channel;

influxdb/src/client/mod.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ use std::fmt::{self, Debug, Formatter};
2222
use std::sync::Arc;
2323

2424
use crate::query::QueryType;
25-
use crate::Error;
26-
use crate::Query;
25+
use crate::{Error, Query};
2726

2827
#[derive(Clone)]
2928
/// Internal Representation of a Client
@@ -188,17 +187,16 @@ impl Client {
188187
/// # Examples
189188
///
190189
/// ```rust,no_run
191-
/// use influxdb::{Client, Query, Timestamp};
192-
/// use influxdb::InfluxDbWriteable;
190+
/// use influxdb::{Client, InfluxDbWriteable, Query, Timestamp};
193191
/// use std::time::{SystemTime, UNIX_EPOCH};
194192
///
195193
/// # #[tokio::main]
196194
/// # async fn main() -> Result<(), influxdb::Error> {
197195
/// let start = SystemTime::now();
198196
/// let since_the_epoch = start
199-
/// .duration_since(UNIX_EPOCH)
200-
/// .expect("Time went backwards")
201-
/// .as_millis();
197+
/// .duration_since(UNIX_EPOCH)
198+
/// .expect("Time went backwards")
199+
/// .as_millis();
202200
///
203201
/// let client = Client::new("http://localhost:8086", "test");
204202
/// let query = Timestamp::Milliseconds(since_the_epoch)

influxdb/src/integrations/serde_integration/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
//! .series
3434
//! .into_iter()
3535
//! .map(|mut city_series| {
36-
//! let city_name =
37-
//! city_series.name.split("_").collect::<Vec<&str>>().remove(2);
36+
//! let city_name = city_series.name.split("_").collect::<Vec<&str>>().remove(2);
3837
//! Weather {
3938
//! weather: city_series.values.remove(0),
4039
//! city_name: city_name.to_string(),
@@ -50,7 +49,8 @@ mod de;
5049
use serde::de::DeserializeOwned;
5150
use serde_derive::Deserialize;
5251

53-
use crate::{client::check_status, Client, Error, Query, ReadQuery};
52+
use crate::client::check_status;
53+
use crate::{Client, Error, Query, ReadQuery};
5454

5555
#[derive(Deserialize)]
5656
#[doc(hidden)]

influxdb/src/lib.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//! # Quickstart
1717
//!
1818
//! Add the following to your `Cargo.toml`
19-
//!
2019
#![doc = cargo_toml!(indent="", "derive")]
2120
//!
2221
//! For an example with using Serde deserialization, please refer to [serde_integration](crate::integrations::serde_integration)
@@ -45,13 +44,15 @@
4544
//! humidity: 30,
4645
//! wind_direction: String::from("north"),
4746
//! }
48-
//! .into_query("weather"),
47+
//! .try_into_query("weather")
48+
//! .unwrap(),
4949
//! WeatherReading {
5050
//! time: Timestamp::Hours(2).into(),
5151
//! humidity: 40,
5252
//! wind_direction: String::from("west"),
5353
//! }
54-
//! .into_query("weather"),
54+
//! .try_into_query("weather")
55+
//! .unwrap(),
5556
//! ];
5657
//!
5758
//! client.query(weather_readings).await?;
@@ -123,11 +124,9 @@ mod query;
123124

124125
pub use client::Client;
125126
pub use error::Error;
126-
pub use query::{
127-
read_query::ReadQuery,
128-
write_query::{Type, WriteQuery},
129-
InfluxDbWriteable, Query, QueryType, Timestamp, ValidQuery,
130-
};
127+
pub use query::read_query::ReadQuery;
128+
pub use query::write_query::{Type, WriteQuery};
129+
pub use query::{InfluxDbWriteable, Query, QueryType, Timestamp, ValidQuery};
131130

132131
#[cfg(feature = "serde")]
133132
pub mod integrations {

influxdb/src/query/mod.rs

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
//! # Examples
55
//!
66
//! ```rust
7-
//! use influxdb::{ReadQuery, Query as _, Timestamp};
8-
//! use influxdb::InfluxDbWriteable;
7+
//! use influxdb::{InfluxDbWriteable, Query as _, ReadQuery, Timestamp};
98
//!
10-
//! let write_query = Timestamp::Nanoseconds(0).into_query("measurement")
9+
//! let write_query = Timestamp::Nanoseconds(0)
10+
//! .into_query("measurement")
1111
//! .add_field("field1", 5)
1212
//! .add_tag("author", "Gero")
1313
//! .build();
1414
//!
1515
//! assert!(write_query.is_ok());
1616
//!
17-
//! let read_query = ReadQuery::new("SELECT * FROM weather")
18-
//! .build();
17+
//! let read_query = ReadQuery::new("SELECT * FROM weather").build();
1918
//!
2019
//! assert!(read_query.is_ok());
2120
//! ```
@@ -24,7 +23,8 @@ pub mod consts;
2423
mod line_proto_term;
2524
pub mod read_query;
2625
pub mod write_query;
27-
use std::{convert::Infallible, fmt};
26+
use std::convert::Infallible;
27+
use std::fmt;
2828

2929
use crate::{Error, WriteQuery};
3030
use consts::{
@@ -130,13 +130,15 @@ pub trait Query {
130130
/// # Examples
131131
///
132132
/// ```rust
133-
/// use influxdb::{Query, Timestamp};
134-
/// use influxdb::InfluxDbWriteable;
133+
/// use influxdb::{InfluxDbWriteable, Query, Timestamp};
135134
///
136135
/// let invalid_query = Timestamp::Nanoseconds(0).into_query("measurement").build();
137136
/// assert!(invalid_query.is_err());
138137
///
139-
/// let valid_query = Timestamp::Nanoseconds(0).into_query("measurement").add_field("myfield1", 11).build();
138+
/// let valid_query = Timestamp::Nanoseconds(0)
139+
/// .into_query("measurement")
140+
/// .add_field("myfield1", 11)
141+
/// .build();
140142
/// assert!(valid_query.is_ok());
141143
/// ```
142144
fn build(&self) -> Result<ValidQuery, Error>;
@@ -148,15 +150,19 @@ pub trait Query {
148150
/// # Examples
149151
///
150152
/// ```rust
151-
/// use influxdb::{Query, Timestamp};
152-
/// use influxdb::InfluxDbWriteable;
153+
/// use influxdb::{InfluxDbWriteable, Query, Timestamp};
153154
///
154155
/// let use_v2 = true;
155156
///
156-
/// let invalid_query = Timestamp::Nanoseconds(0).into_query("measurement").build_with_opts(use_v2);
157+
/// let invalid_query = Timestamp::Nanoseconds(0)
158+
/// .into_query("measurement")
159+
/// .build_with_opts(use_v2);
157160
/// assert!(invalid_query.is_err());
158161
///
159-
/// let valid_query = Timestamp::Nanoseconds(0).into_query("measurement").add_field("myfield1", 11).build_with_opts(use_v2);
162+
/// let valid_query = Timestamp::Nanoseconds(0)
163+
/// .into_query("measurement")
164+
/// .add_field("myfield1", 11)
165+
/// .build_with_opts(use_v2);
160166
/// assert!(valid_query.is_ok());
161167
/// ```
162168
fn build_with_opts(&self, use_v2: bool) -> Result<ValidQuery, Error>;

influxdb/src/query/write_query.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ impl WriteQuery {
5555
/// # Examples
5656
///
5757
/// ```rust
58-
/// use influxdb::{Query, Timestamp};
59-
/// use influxdb::InfluxDbWriteable;
58+
/// use influxdb::{InfluxDbWriteable, Query, Timestamp};
6059
///
61-
/// Timestamp::Nanoseconds(0).into_query("measurement").add_field("field1", 5).build();
60+
/// Timestamp::Nanoseconds(0)
61+
/// .into_query("measurement")
62+
/// .add_field("field1", 5)
63+
/// .build();
6264
/// ```
6365
#[must_use = "Creating a query is pointless unless you execute it"]
6466
pub fn add_field<S, F>(mut self, field: S, value: F) -> Self

influxdb/tests/integration_tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ use utilities::{
88
assert_result_err, assert_result_ok, create_client, create_db, delete_db, run_test,
99
};
1010

11-
use influxdb::InfluxDbWriteable;
12-
use influxdb::{Client, Error, ReadQuery, Timestamp};
11+
use influxdb::{Client, Error, InfluxDbWriteable, ReadQuery, Timestamp};
1312

1413
/// INTEGRATION TEST
1514
///

influxdb/tests/integration_tests_v2.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ extern crate influxdb;
44
mod utilities;
55
use utilities::{assert_result_err, assert_result_ok, run_test};
66

7-
use influxdb::InfluxDbWriteable;
8-
use influxdb::{Client, Error, ReadQuery, Timestamp};
7+
use influxdb::{Client, Error, InfluxDbWriteable, ReadQuery, Timestamp};
98

109
/// INTEGRATION TEST
1110
///

influxdb_derive/src/writeable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use proc_macro2::{Span, TokenStream};
22
use quote::{format_ident, quote};
3+
use syn::parse::{Parse, ParseStream};
4+
use syn::punctuated::Punctuated;
35
use syn::{
4-
parse::{Parse, ParseStream},
5-
punctuated::Punctuated,
66
AngleBracketedGenericArguments, Data, DeriveInput, Field, Fields, GenericArgument, Ident,
77
Lifetime, Meta, PathArguments, PredicateType, Token, Type, TypeParamBound, WhereClause,
88
WherePredicate,

0 commit comments

Comments
 (0)