Skip to content

Commit cce5840

Browse files
SuperhepperSuperhepper
authored
Merge pull request #575 from brandsimon/sbr/clippy
Fix clippy issues
2 parents fccb286 + a9b6442 commit cce5840

File tree

13 files changed

+65
-63
lines changed

13 files changed

+65
-63
lines changed

‎tss-esapi/src/attributes/nv_index.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl NvIndexAttributesBuilder {
157157
///
158158
/// # Arguments
159159
/// * `set` - `true` indicates that the attribute should have the value SET.
160-
/// `false`indicates that the attribute should have the value CLEAR.
160+
/// `false`indicates that the attribute should have the value CLEAR.
161161
pub fn with_pp_write(mut self, set: bool) -> Self {
162162
self.nv_index_attributes.set_pp_write(set);
163163
self
@@ -167,7 +167,7 @@ impl NvIndexAttributesBuilder {
167167
///
168168
/// # Arguments
169169
/// * `set` - `true` indicates that the attribute should have the value SET.
170-
/// `false`indicates that the attribute should have the value CLEAR.
170+
/// `false`indicates that the attribute should have the value CLEAR.
171171
pub fn with_owner_write(mut self, set: bool) -> Self {
172172
self.nv_index_attributes.set_owner_write(set);
173173
self
@@ -177,7 +177,7 @@ impl NvIndexAttributesBuilder {
177177
///
178178
/// # Arguments
179179
/// * `set` - `true` indicates that the attribute should have the value SET.
180-
/// `false`indicates that the attribute should have the value CLEAR.
180+
/// `false`indicates that the attribute should have the value CLEAR.
181181
pub fn with_auth_write(mut self, set: bool) -> Self {
182182
self.nv_index_attributes.set_auth_write(set);
183183
self
@@ -187,7 +187,7 @@ impl NvIndexAttributesBuilder {
187187
///
188188
/// # Arguments
189189
/// * `set` - `true` indicates that the attribute should have the value SET.
190-
/// `false`indicates that the attribute should have the value CLEAR.
190+
/// `false`indicates that the attribute should have the value CLEAR.
191191
pub fn with_policy_write(mut self, set: bool) -> Self {
192192
self.nv_index_attributes.set_policy_write(set);
193193
self
@@ -206,7 +206,7 @@ impl NvIndexAttributesBuilder {
206206
///
207207
/// # Arguments
208208
/// * `set` - `true` indicates that the attribute should have the value SET.
209-
/// `false`indicates that the attribute should have the value CLEAR.
209+
/// `false`indicates that the attribute should have the value CLEAR.
210210
pub fn with_policy_delete(mut self, set: bool) -> Self {
211211
self.nv_index_attributes.set_policy_delete(set);
212212
self
@@ -216,7 +216,7 @@ impl NvIndexAttributesBuilder {
216216
///
217217
/// # Arguments
218218
/// * `set` - `true` indicates that the attribute should have the value SET.
219-
/// `false`indicates that the attribute should have the value CLEAR.
219+
/// `false`indicates that the attribute should have the value CLEAR.
220220
pub fn with_write_locked(mut self, set: bool) -> Self {
221221
self.nv_index_attributes.set_write_locked(set);
222222
self
@@ -226,7 +226,7 @@ impl NvIndexAttributesBuilder {
226226
///
227227
/// # Arguments
228228
/// * `set` - `true` indicates that the attribute should have the value SET.
229-
/// `false`indicates that the attribute should have the value CLEAR.
229+
/// `false`indicates that the attribute should have the value CLEAR.
230230
pub fn with_write_all(mut self, set: bool) -> Self {
231231
self.nv_index_attributes.set_write_all(set);
232232
self
@@ -236,7 +236,7 @@ impl NvIndexAttributesBuilder {
236236
///
237237
/// # Arguments
238238
/// * `set` - `true` indicates that the attribute should have the value SET.
239-
/// `false`indicates that the attribute should have the value CLEAR.
239+
/// `false`indicates that the attribute should have the value CLEAR.
240240
pub fn with_write_define(mut self, set: bool) -> Self {
241241
self.nv_index_attributes.set_write_define(set);
242242
self
@@ -246,7 +246,7 @@ impl NvIndexAttributesBuilder {
246246
///
247247
/// # Arguments
248248
/// * `set` - `true` indicates that the attribute should have the value SET.
249-
/// `false`indicates that the attribute should have the value CLEAR.
249+
/// `false`indicates that the attribute should have the value CLEAR.
250250
pub fn with_write_stclear(mut self, set: bool) -> Self {
251251
self.nv_index_attributes.set_write_stclear(set);
252252
self
@@ -256,7 +256,7 @@ impl NvIndexAttributesBuilder {
256256
///
257257
/// # Arguments
258258
/// * `set` - `true` indicates that the attribute should have the value SET.
259-
/// `false`indicates that the attribute should have the value CLEAR.
259+
/// `false`indicates that the attribute should have the value CLEAR.
260260
pub fn with_global_lock(mut self, set: bool) -> Self {
261261
self.nv_index_attributes.set_global_lock(set);
262262
self
@@ -266,7 +266,7 @@ impl NvIndexAttributesBuilder {
266266
///
267267
/// # Arguments
268268
/// * `set` - `true` indicates that the attribute should have the value SET.
269-
/// `false`indicates that the attribute should have the value CLEAR.
269+
/// `false`indicates that the attribute should have the value CLEAR.
270270
pub fn with_pp_read(mut self, set: bool) -> Self {
271271
self.nv_index_attributes.set_pp_read(set);
272272
self
@@ -276,7 +276,7 @@ impl NvIndexAttributesBuilder {
276276
///
277277
/// # Arguments
278278
/// * `set` - `true` indicates that the attribute should have the value SET.
279-
/// `false`indicates that the attribute should have the value CLEAR.
279+
/// `false`indicates that the attribute should have the value CLEAR.
280280
pub fn with_owner_read(mut self, set: bool) -> Self {
281281
self.nv_index_attributes.set_owner_read(set);
282282
self
@@ -286,7 +286,7 @@ impl NvIndexAttributesBuilder {
286286
///
287287
/// # Arguments
288288
/// * `set` - `true` indicates that the attribute should have the value SET.
289-
/// `false`indicates that the attribute should have the value CLEAR.
289+
/// `false`indicates that the attribute should have the value CLEAR.
290290
pub fn with_auth_read(mut self, set: bool) -> Self {
291291
self.nv_index_attributes.set_auth_read(set);
292292
self
@@ -296,7 +296,7 @@ impl NvIndexAttributesBuilder {
296296
///
297297
/// # Arguments
298298
/// * `set` - `true` indicates that the attribute should have the value SET.
299-
/// `false`indicates that the attribute should have the value CLEAR.
299+
/// `false`indicates that the attribute should have the value CLEAR.
300300
pub fn with_policy_read(mut self, set: bool) -> Self {
301301
self.nv_index_attributes.set_policy_read(set);
302302
self
@@ -306,7 +306,7 @@ impl NvIndexAttributesBuilder {
306306
///
307307
/// # Arguments
308308
/// * `set` - `true` indicates that the attribute should have the value SET.
309-
/// `false`indicates that the attribute should have the value CLEAR.
309+
/// `false`indicates that the attribute should have the value CLEAR.
310310
pub fn with_no_da(mut self, set: bool) -> Self {
311311
self.nv_index_attributes.set_no_da(set);
312312
self
@@ -316,7 +316,7 @@ impl NvIndexAttributesBuilder {
316316
///
317317
/// # Arguments
318318
/// * `set` - `true` indicates that the attribute should have the value SET.
319-
/// `false`indicates that the attribute should have the value CLEAR.
319+
/// `false`indicates that the attribute should have the value CLEAR.
320320
pub fn with_orderly(mut self, set: bool) -> Self {
321321
self.nv_index_attributes.set_orderly(set);
322322
self
@@ -326,7 +326,7 @@ impl NvIndexAttributesBuilder {
326326
///
327327
/// # Arguments
328328
/// * `set` - `true` indicates that the attribute should have the value SET.
329-
/// `false`indicates that the attribute should have the value CLEAR.
329+
/// `false`indicates that the attribute should have the value CLEAR.
330330
pub fn with_clear_stclear(mut self, set: bool) -> Self {
331331
self.nv_index_attributes.set_clear_stclear(set);
332332
self
@@ -336,7 +336,7 @@ impl NvIndexAttributesBuilder {
336336
///
337337
/// # Arguments
338338
/// * `set` - `true` indicates that the attribute should have the value SET.
339-
/// `false`indicates that the attribute should have the value CLEAR.
339+
/// `false`indicates that the attribute should have the value CLEAR.
340340
pub fn with_read_locked(mut self, set: bool) -> Self {
341341
self.nv_index_attributes.set_read_locked(set);
342342
self
@@ -346,7 +346,7 @@ impl NvIndexAttributesBuilder {
346346
///
347347
/// # Arguments
348348
/// * `set` - `true` indicates that the attribute should have the value SET.
349-
/// `false`indicates that the attribute should have the value CLEAR.
349+
/// `false`indicates that the attribute should have the value CLEAR.
350350
pub fn with_written(mut self, set: bool) -> Self {
351351
self.nv_index_attributes.set_written(set);
352352
self
@@ -356,7 +356,7 @@ impl NvIndexAttributesBuilder {
356356
///
357357
/// # Arguments
358358
/// * `set` - `true` indicates that the attribute should have the value SET.
359-
/// `false`indicates that the attribute should have the value CLEAR.
359+
/// `false`indicates that the attribute should have the value CLEAR.
360360
pub fn with_platform_create(mut self, set: bool) -> Self {
361361
self.nv_index_attributes.set_platform_create(set);
362362
self
@@ -366,7 +366,7 @@ impl NvIndexAttributesBuilder {
366366
///
367367
/// # Arguments
368368
/// * `set` - `true` indicates that the attribute should have the value SET.
369-
/// `false`indicates that the attribute should have the value CLEAR.
369+
/// `false`indicates that the attribute should have the value CLEAR.
370370
pub fn with_read_stclear(mut self, set: bool) -> Self {
371371
self.nv_index_attributes.set_read_stclear(set);
372372
self

‎tss-esapi/src/attributes/object.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl ObjectAttributesBuilder {
9595
///
9696
/// # Arguments
9797
/// * `set` - `true` indicates that the attribute should have the value SET.
98-
/// `false`indicates that the attribute should have the value CLEAR.
98+
/// `false`indicates that the attribute should have the value CLEAR.
9999
pub fn with_fixed_tpm(mut self, set: bool) -> Self {
100100
self.object_attributes.set_fixed_tpm(set);
101101
self
@@ -105,7 +105,7 @@ impl ObjectAttributesBuilder {
105105
///
106106
/// # Arguments
107107
/// * `set` - `true` indicates that the attribute should have the value SET.
108-
/// `false`indicates that the attribute should have the value CLEAR.
108+
/// `false`indicates that the attribute should have the value CLEAR.
109109
pub fn with_st_clear(mut self, set: bool) -> Self {
110110
self.object_attributes.set_st_clear(set);
111111
self
@@ -115,7 +115,7 @@ impl ObjectAttributesBuilder {
115115
///
116116
/// # Arguments
117117
/// * `set` - `true` indicates that the attribute should have the value SET.
118-
/// `false`indicates that the attribute should have the value CLEAR.
118+
/// `false`indicates that the attribute should have the value CLEAR.
119119
pub fn with_fixed_parent(mut self, set: bool) -> Self {
120120
self.object_attributes.set_fixed_parent(set);
121121
self
@@ -125,7 +125,7 @@ impl ObjectAttributesBuilder {
125125
///
126126
/// # Arguments
127127
/// * `set` - `true` indicates that the attribute should have the value SET.
128-
/// `false`indicates that the attribute should have the value CLEAR.
128+
/// `false`indicates that the attribute should have the value CLEAR.
129129
pub fn with_sensitive_data_origin(mut self, set: bool) -> Self {
130130
self.object_attributes.set_sensitive_data_origin(set);
131131
self
@@ -135,7 +135,7 @@ impl ObjectAttributesBuilder {
135135
///
136136
/// # Arguments
137137
/// * `set` - `true` indicates that the attribute should have the value SET.
138-
/// `false`indicates that the attribute should have the value CLEAR.
138+
/// `false`indicates that the attribute should have the value CLEAR.
139139
pub fn with_user_with_auth(mut self, set: bool) -> Self {
140140
self.object_attributes.set_user_with_auth(set);
141141
self
@@ -145,7 +145,7 @@ impl ObjectAttributesBuilder {
145145
///
146146
/// # Arguments
147147
/// * `set` - `true` indicates that the attribute should have the value SET.
148-
/// `false`indicates that the attribute should have the value CLEAR.
148+
/// `false`indicates that the attribute should have the value CLEAR.
149149
pub fn with_admin_with_policy(mut self, set: bool) -> Self {
150150
self.object_attributes.set_admin_with_policy(set);
151151
self
@@ -155,7 +155,7 @@ impl ObjectAttributesBuilder {
155155
///
156156
/// # Arguments
157157
/// * `set` - `true` indicates that the attribute should have the value SET.
158-
/// `false`indicates that the attribute should have the value CLEAR.
158+
/// `false`indicates that the attribute should have the value CLEAR.
159159
pub fn with_no_da(mut self, set: bool) -> Self {
160160
self.object_attributes.set_no_da(set);
161161
self
@@ -165,7 +165,7 @@ impl ObjectAttributesBuilder {
165165
///
166166
/// # Arguments
167167
/// * `set` - `true` indicates that the attribute should have the value SET.
168-
/// `false`indicates that the attribute should have the value CLEAR.
168+
/// `false`indicates that the attribute should have the value CLEAR.
169169
pub fn with_encrypted_duplication(mut self, set: bool) -> Self {
170170
self.object_attributes.set_encrypted_duplication(set);
171171
self
@@ -175,7 +175,7 @@ impl ObjectAttributesBuilder {
175175
///
176176
/// # Arguments
177177
/// * `set` - `true` indicates that the attribute should have the value SET.
178-
/// `false`indicates that the attribute should have the value CLEAR.
178+
/// `false`indicates that the attribute should have the value CLEAR.
179179
pub fn with_restricted(mut self, set: bool) -> Self {
180180
self.object_attributes.set_restricted(set);
181181
self
@@ -185,7 +185,7 @@ impl ObjectAttributesBuilder {
185185
///
186186
/// # Arguments
187187
/// * `set` - `true` indicates that the attribute should have the value SET.
188-
/// `false`indicates that the attribute should have the value CLEAR.
188+
/// `false`indicates that the attribute should have the value CLEAR.
189189
pub fn with_decrypt(mut self, set: bool) -> Self {
190190
self.object_attributes.set_decrypt(set);
191191
self
@@ -195,7 +195,7 @@ impl ObjectAttributesBuilder {
195195
///
196196
/// # Arguments
197197
/// * `set` - `true` indicates that the attribute should have the value SET.
198-
/// `false`indicates that the attribute should have the value CLEAR.
198+
/// `false`indicates that the attribute should have the value CLEAR.
199199
pub fn with_sign_encrypt(mut self, set: bool) -> Self {
200200
self.object_attributes.set_sign_encrypt(set);
201201
self
@@ -205,7 +205,7 @@ impl ObjectAttributesBuilder {
205205
///
206206
/// # Arguments
207207
/// * `set` - `true` indicates that the attribute should have the value SET.
208-
/// `false`indicates that the attribute should have the value CLEAR.
208+
/// `false`indicates that the attribute should have the value CLEAR.
209209
pub fn with_x509_sign(mut self, set: bool) -> Self {
210210
self.object_attributes.set_x509_sign(set);
211211
self

‎tss-esapi/src/context/general_esys_tr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl Context {
146146
///
147147
/// # Arguments
148148
/// * `tpm_handle` - The TPM handle that references the TPM object for which
149-
/// the ESYS object is being created.
149+
/// the ESYS object is being created.
150150
///
151151
/// # Returns
152152
/// A handle to the ESYS object that was created from a TPM resource.
@@ -277,7 +277,7 @@ impl Context {
277277
///
278278
/// # Arguments
279279
/// * object_handle`- An [ObjectHandle] referring to an object for which all metadata and
280-
/// resources is going to be released.
280+
/// resources is going to be released.
281281
///
282282
/// # Example
283283
/// ```rust
@@ -468,7 +468,7 @@ impl Context {
468468
///
469469
/// # Arguments
470470
/// * `buffer` - The buffer containing the data to restore the object.
471-
/// It can be created using [`tr_serialize`](Self::tr_serialize).
471+
/// It can be created using [`tr_serialize`](Self::tr_serialize).
472472
///
473473
/// # Returns
474474
/// A handle to the object that was created from the buffer.

‎tss-esapi/src/context/tpm_commands/asymmetric_primitives.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl Context {
7676
///
7777
/// # Arguments
7878
/// * `key_handle`- A [KeyHandle] of ECC key which curve parameters will be used
79-
/// to generate the ephemeral key.
79+
/// to generate the ephemeral key.
8080
///
8181
/// # Details
8282
/// This command uses the TPM to generate an ephemeral
@@ -211,7 +211,7 @@ impl Context {
211211
///
212212
/// # Arguments
213213
/// * `key_handle` - A [KeyHandle] of ECC key which curve parameters will be used
214-
/// to generate the ephemeral key.
214+
/// to generate the ephemeral key.
215215
/// * `in_point` - An [EccPoint] on the curve of the key referenced by `key_handle`
216216
///
217217
/// # Details

‎tss-esapi/src/context/tpm_commands/context_management.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,12 @@ impl Context {
146146
///
147147
/// # Arguments
148148
/// * `auth` - An a handle used for authorization that is limited to the ones
149-
/// specified in [Provision].
149+
/// specified in [Provision].
150150
/// * `object_handle` - The handle of a loaded object.
151151
/// * `persistent` - If the `object_handle` is transient object then this
152-
/// then this will become the persistent handle of that
153-
/// object. If the `object_handle` refers to a persistent
154-
/// object then this shall be the persistent handle of that
155-
/// object.
152+
/// then this will become the persistent handle of that object. If the
153+
/// `object_handle` refers to a persistent object then this shall be the
154+
/// persistent handle of that object.
156155
///
157156
/// # Returns
158157
/// If the input `object_handle` was transient object then it will be made

‎tss-esapi/src/context/tpm_commands/duplication_commands.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Context {
2424
/// * `object_to_duplicate` - An [ObjectHandle] of the object that will be duplicated.
2525
/// * `new_parent_handle` - An [ObjectHandle] of the new parent.
2626
/// * `encryption_key_in` - An optional encryption key. If this parameter is `None`
27-
/// then a [default value][Default::default] is used.
27+
/// then a [default value][Default::default] is used.
2828
/// * `symmetric_alg` - Symmetric algorithm to be used for the inner wrapper.
2929
///
3030
/// The `object_to_duplicate` need to be have Fixed TPM and Fixed Parent attributes set to `false`.
@@ -347,7 +347,7 @@ impl Context {
347347
/// # Arguments
348348
/// * `parent_handle` - An [ObjectHandle] of the new parent for the object.
349349
/// * `encryption_key` - An optional symmetric encryption key used as the inner wrapper.
350-
/// If `encryption_key` is `None` then a [default value][Default::default] is used.
350+
/// If `encryption_key` is `None` then a [default value][Default::default] is used.
351351
/// * `public` - A [Public] of the imported object.
352352
/// * `duplicate` - A symmetrically encrypted duplicated object.
353353
/// * `encrypted_secret` - The seed for the symmetric key and HMAC key.

‎tss-esapi/src/context/tpm_commands/enhanced_authorization_ea_commands.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ impl Context {
331331
/// * `object_name` - The [name][Name] of the object being duplicated.
332332
/// * `new_parent_name` - The [name][Name] of the new parent.
333333
/// * `include_object` - Flag indicating if `object_name` will be included in policy
334-
/// calculation.
334+
/// calculation.
335335
///
336336
/// # Details
337337
/// Set `include_object` only when this command is used in conjunction with
@@ -601,7 +601,7 @@ impl Context {
601601
/// * `policy_session` - The [policy session][PolicySession] being extended.
602602
/// * `auth_handle` - Handle indicating the source of authorization value.
603603
/// * `nv_index_handle` - The [NvIndexHandle] associated with NV memory
604-
/// where the policy is stored.
604+
/// where the policy is stored.
605605
///
606606
/// # Example
607607
/// ```rust

0 commit comments

Comments
 (0)