Skip to content

Commit 0c6fab3

Browse files
Upgrade Rustc to 1.88.0 (#818)
<!-- The PR description should answer 2 (maybe 3) important questions: --> ### What New version comes with a bunch of useful lints for detecting enums with large size discrepencies, upgrade and fix the suggestions.
1 parent c1cd0c1 commit 0c6fab3

File tree

23 files changed

+55
-54
lines changed

23 files changed

+55
-54
lines changed

.github/workflows/ship.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ jobs:
4141
LOADED_IMAGE=$(docker load < result | awk -F': ' '{print $2}')
4242
echo "image=$LOADED_IMAGE" >> $GITHUB_OUTPUT
4343
echo "Loaded image: $LOADED_IMAGE"
44+
4445
- name: Scan Docker Image with gokakashi
4546
uses: shinobistack/gokakashi-action@v0.2.0
47+
continue-on-error: true
4648
with:
4749
image: ${{ steps.load-image.outputs.image }}
4850
labels: agentKey=${{ github.run_id }}-${{ matrix.target }}

changelog.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@
305305
and will not write the introspection result to file if the configuration file is already up to date.
306306
([#362](https://github.com/hasura/ndc-postgres/pull/362))
307307
- A few fields in the configuration format has been changed:
308-
309308
- `configureOptions` was renamed to `introspectionOptions`
310309
- `connectionUri`, `poolSettings` and `isolationLevel` are now nested under `connectionSettings`
311310
- `mutationsVersion` was moved from `configureOptions` to the top-level

crates/cli/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub async fn run(command: Command, context: Context<impl Environment>) -> anyhow
5454
Command::Update => update(context).await?,
5555
Command::Upgrade { dir_from, dir_to } => upgrade(dir_from, dir_to).await?,
5656
Command::NativeOperation(cmd) => native_operations::run(cmd, context).await?,
57-
};
57+
}
5858
Ok(())
5959
}
6060

crates/cli/src/native_operations.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub async fn run(command: Command, context: Context<impl Environment>) -> anyhow
6363
Command::Delete { name, kind } => {
6464
delete(context, name, kind).await?;
6565
}
66-
};
66+
}
6767
Ok(())
6868
}
6969

@@ -99,7 +99,7 @@ async fn list(context: Context<impl Environment>) -> anyhow::Result<()> {
9999
println!("- {}", native_operation.0);
100100
}
101101
}
102-
};
102+
}
103103
Ok(())
104104
}
105105

@@ -250,7 +250,7 @@ async fn create(
250250
}
251251
}
252252
}
253-
};
253+
}
254254

255255
// We write the configuration including the new Native Operation to file.
256256
configuration::write_parsed_configuration(configuration, context.context_path.clone()).await?;

crates/configuration/src/metrics.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::VersionTag;
66

77
/// The collection of configuration-related metrics exposed through the `/metrics` endpoint.
88
#[derive(Debug, Clone)]
9+
#[allow(clippy::struct_field_names)]
910
pub struct Metrics {
1011
configuration_version_3: IntGauge,
1112
configuration_version_4: IntGauge,

crates/configuration/src/version3/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,14 +646,14 @@ pub async fn write_parsed_configuration(
646646
file: file.clone(),
647647
},
648648
)?;
649-
};
649+
}
650650

651651
let native_query_file = out_dir.as_ref().to_owned().join(file);
652652
if let Some(native_query_sql_dir) = native_query_file.parent() {
653653
fs::create_dir_all(native_query_sql_dir).await?;
654-
};
654+
}
655655
fs::write(native_query_file, String::from(sql.clone())).await?;
656-
};
656+
}
657657
}
658658

659659
// create the jsonschema file

crates/configuration/src/version4/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,14 @@ pub async fn write_parsed_configuration(
346346
file: file.clone(),
347347
},
348348
)?;
349-
};
349+
}
350350

351351
let native_query_file = out_dir.as_ref().to_owned().join(file);
352352
if let Some(native_query_sql_dir) = native_query_file.parent() {
353353
fs::create_dir_all(native_query_sql_dir).await?;
354-
};
354+
}
355355
fs::write(native_query_file, String::from(sql.clone())).await?;
356-
};
356+
}
357357
}
358358

359359
// create the jsonschema file

crates/configuration/src/version4/native_operations.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ pub async fn oids_to_typenames(
180180
if info.schema_name == schema_name && info.type_name == type_name {
181181
oids_map.insert(oid, scalar_type_name.clone());
182182
found = true;
183-
continue;
184183
}
185184
}
186185

crates/configuration/src/version5/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,14 @@ pub async fn write_parsed_configuration(
387387
file: file.clone(),
388388
},
389389
)?;
390-
};
390+
}
391391

392392
let native_query_file = out_dir.as_ref().to_owned().join(file);
393393
if let Some(native_query_sql_dir) = native_query_file.parent() {
394394
fs::create_dir_all(native_query_sql_dir).await?;
395-
};
395+
}
396396
fs::write(native_query_file, String::from(sql.clone())).await?;
397-
};
397+
}
398398
}
399399
for native_query_sql in parsed_config
400400
.metadata
@@ -414,14 +414,14 @@ pub async fn write_parsed_configuration(
414414
file: file.clone(),
415415
},
416416
)?;
417-
};
417+
}
418418

419419
let native_query_file = out_dir.as_ref().to_owned().join(file);
420420
if let Some(native_query_sql_dir) = native_query_file.parent() {
421421
fs::create_dir_all(native_query_sql_dir).await?;
422-
};
422+
}
423423
fs::write(native_query_file, String::from(sql.clone())).await?;
424-
};
424+
}
425425
}
426426

427427
// create the jsonschema file

crates/configuration/src/version5/native_operations.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ pub async fn oids_to_typenames(
186186
if info.schema_name == schema_name && info.type_name == type_name {
187187
oids_map.insert(oid, scalar_type_name.clone());
188188
found = true;
189-
continue;
190189
}
191190
}
192191

0 commit comments

Comments
 (0)