Skip to content

Commit 8ac4dcc

Browse files
brandonskiserbrandonskiser
committed
Merge remote-tracking branch 'origin/main' into bskiser/mcp-subcommands
2 parents 222b06b + a7d09a7 commit 8ac4dcc

File tree

19 files changed

+411
-222
lines changed

19 files changed

+411
-222
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/amzn-codewhisperer-client/src/config.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,9 @@ impl Builder {
11281128
/// # Examples
11291129
///
11301130
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1131-
/// `behavior-version-latest` cargo feature. ```no_run
1131+
/// `behavior-version-latest` cargo feature.
1132+
///
1133+
/// ```no_run
11321134
/// use amzn_codewhisperer_client::config::BehaviorVersion;
11331135
///
11341136
/// let config = amzn_codewhisperer_client::Config::builder()
@@ -1137,8 +1139,9 @@ impl Builder {
11371139
/// .build();
11381140
/// let client = amzn_codewhisperer_client::Client::from_conf(config);
11391141
/// ```
1140-
///
1142+
///
11411143
/// Customizing behavior major version:
1144+
///
11421145
/// ```no_run
11431146
/// use amzn_codewhisperer_client::config::BehaviorVersion;
11441147
///
@@ -1163,7 +1166,8 @@ impl Builder {
11631166
/// # Examples
11641167
///
11651168
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1166-
/// `behavior-version-latest` cargo feature. ```no_run
1169+
/// `behavior-version-latest` cargo feature.
1170+
/// ```no_run
11671171
/// use amzn_codewhisperer_client::config::BehaviorVersion;
11681172
///
11691173
/// let config = amzn_codewhisperer_client::Config::builder()
@@ -1172,7 +1176,7 @@ impl Builder {
11721176
/// .build();
11731177
/// let client = amzn_codewhisperer_client::Client::from_conf(config);
11741178
/// ```
1175-
///
1179+
///
11761180
/// Customizing behavior major version:
11771181
/// ```no_run
11781182
/// use amzn_codewhisperer_client::config::BehaviorVersion;

‎crates/amzn-codewhisperer-streaming-client/src/config.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,9 @@ impl Builder {
11101110
/// # Examples
11111111
///
11121112
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1113-
/// `behavior-version-latest` cargo feature. ```no_run
1113+
/// `behavior-version-latest` cargo feature.
1114+
///
1115+
/// ```no_run
11141116
/// use amzn_codewhisperer_streaming_client::config::BehaviorVersion;
11151117
///
11161118
/// let config = amzn_codewhisperer_streaming_client::Config::builder()
@@ -1119,8 +1121,9 @@ impl Builder {
11191121
/// .build();
11201122
/// let client = amzn_codewhisperer_streaming_client::Client::from_conf(config);
11211123
/// ```
1122-
///
1124+
///
11231125
/// Customizing behavior major version:
1126+
///
11241127
/// ```no_run
11251128
/// use amzn_codewhisperer_streaming_client::config::BehaviorVersion;
11261129
///
@@ -1145,7 +1148,9 @@ impl Builder {
11451148
/// # Examples
11461149
///
11471150
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1148-
/// `behavior-version-latest` cargo feature. ```no_run
1151+
/// `behavior-version-latest` cargo feature.
1152+
///
1153+
/// ```no_run
11491154
/// use amzn_codewhisperer_streaming_client::config::BehaviorVersion;
11501155
///
11511156
/// let config = amzn_codewhisperer_streaming_client::Config::builder()
@@ -1154,8 +1159,9 @@ impl Builder {
11541159
/// .build();
11551160
/// let client = amzn_codewhisperer_streaming_client::Client::from_conf(config);
11561161
/// ```
1157-
///
1162+
///
11581163
/// Customizing behavior major version:
1164+
///
11591165
/// ```no_run
11601166
/// use amzn_codewhisperer_streaming_client::config::BehaviorVersion;
11611167
///

‎crates/amzn-consolas-client/src/config.rs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,9 @@ impl Builder {
11431143
/// # Examples
11441144
///
11451145
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1146-
/// `behavior-version-latest` cargo feature. ```no_run
1146+
/// `behavior-version-latest` cargo feature.
1147+
///
1148+
/// ```no_run
11471149
/// use amzn_consolas_client::config::BehaviorVersion;
11481150
///
11491151
/// let config = amzn_consolas_client::Config::builder()
@@ -1152,9 +1154,10 @@ impl Builder {
11521154
/// .build();
11531155
/// let client = amzn_consolas_client::Client::from_conf(config);
11541156
/// ```
1155-
///
1157+
///
11561158
/// Customizing behavior major version:
1157-
/// ```no_run
1159+
///
1160+
/// ```no_run
11581161
/// use amzn_consolas_client::config::BehaviorVersion;
11591162
///
11601163
/// let config = amzn_consolas_client::Config::builder()
@@ -1178,7 +1181,9 @@ impl Builder {
11781181
/// # Examples
11791182
///
11801183
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1181-
/// `behavior-version-latest` cargo feature. ```no_run
1184+
/// `behavior-version-latest` cargo feature.
1185+
//
1186+
/// ```no_run
11821187
/// use amzn_consolas_client::config::BehaviorVersion;
11831188
///
11841189
/// let config = amzn_consolas_client::Config::builder()
@@ -1187,9 +1192,10 @@ impl Builder {
11871192
/// .build();
11881193
/// let client = amzn_consolas_client::Client::from_conf(config);
11891194
/// ```
1190-
///
1195+
///
11911196
/// Customizing behavior major version:
1192-
/// ```no_run
1197+
///
1198+
/// ```no_run
11931199
/// use amzn_consolas_client::config::BehaviorVersion;
11941200
///
11951201
/// let config = amzn_consolas_client::Config::builder()

‎crates/amzn-qdeveloper-streaming-client/src/config.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,9 @@ impl Builder {
11251125
/// # Examples
11261126
///
11271127
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1128-
/// `behavior-version-latest` cargo feature. ```no_run
1128+
/// `behavior-version-latest` cargo feature.
1129+
///
1130+
/// ```no_run
11291131
/// use amzn_qdeveloper_streaming_client::config::BehaviorVersion;
11301132
///
11311133
/// let config = amzn_qdeveloper_streaming_client::Config::builder()
@@ -1134,8 +1136,9 @@ impl Builder {
11341136
/// .build();
11351137
/// let client = amzn_qdeveloper_streaming_client::Client::from_conf(config);
11361138
/// ```
1137-
///
1139+
///
11381140
/// Customizing behavior major version:
1141+
///
11391142
/// ```no_run
11401143
/// use amzn_qdeveloper_streaming_client::config::BehaviorVersion;
11411144
///
@@ -1160,7 +1163,9 @@ impl Builder {
11601163
/// # Examples
11611164
///
11621165
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1163-
/// `behavior-version-latest` cargo feature. ```no_run
1166+
/// `behavior-version-latest` cargo feature.
1167+
///
1168+
/// ```no_run
11641169
/// use amzn_qdeveloper_streaming_client::config::BehaviorVersion;
11651170
///
11661171
/// let config = amzn_qdeveloper_streaming_client::Config::builder()
@@ -1169,8 +1174,9 @@ impl Builder {
11691174
/// .build();
11701175
/// let client = amzn_qdeveloper_streaming_client::Client::from_conf(config);
11711176
/// ```
1172-
///
1177+
///
11731178
/// Customizing behavior major version:
1179+
///
11741180
/// ```no_run
11751181
/// use amzn_qdeveloper_streaming_client::config::BehaviorVersion;
11761182
///

‎crates/amzn-toolkit-telemetry/src/config.rs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,9 @@ impl Builder {
10551055
/// # Examples
10561056
///
10571057
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1058-
/// `behavior-version-latest` cargo feature. ```no_run
1058+
/// `behavior-version-latest` cargo feature.
1059+
///
1060+
/// ```no_run
10591061
/// use amzn_toolkit_telemetry::config::BehaviorVersion;
10601062
///
10611063
/// let config = amzn_toolkit_telemetry::Config::builder()
@@ -1064,9 +1066,10 @@ impl Builder {
10641066
/// .build();
10651067
/// let client = amzn_toolkit_telemetry::Client::from_conf(config);
10661068
/// ```
1067-
///
1069+
///
10681070
/// Customizing behavior major version:
1069-
/// ```no_run
1071+
///
1072+
/// ```no_run
10701073
/// use amzn_toolkit_telemetry::config::BehaviorVersion;
10711074
///
10721075
/// let config = amzn_toolkit_telemetry::Config::builder()
@@ -1090,7 +1093,9 @@ impl Builder {
10901093
/// # Examples
10911094
///
10921095
/// Set the behavior major version to `latest`. This is equivalent to enabling the
1093-
/// `behavior-version-latest` cargo feature. ```no_run
1096+
/// `behavior-version-latest` cargo feature.
1097+
///
1098+
/// ```no_run
10941099
/// use amzn_toolkit_telemetry::config::BehaviorVersion;
10951100
///
10961101
/// let config = amzn_toolkit_telemetry::Config::builder()
@@ -1099,8 +1104,9 @@ impl Builder {
10991104
/// .build();
11001105
/// let client = amzn_toolkit_telemetry::Client::from_conf(config);
11011106
/// ```
1102-
///
1107+
///
11031108
/// Customizing behavior major version:
1109+
///
11041110
/// ```no_run
11051111
/// use amzn_toolkit_telemetry::config::BehaviorVersion;
11061112
///

‎crates/fig_settings/src/keys.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub const UPDATE_AVAILABLE_KEY: &str = "update.new-version-available";

‎crates/fig_settings/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
pub mod error;
22
pub mod history;
33
pub mod keybindings;
4+
pub mod keys;
45
pub mod settings;
56
pub mod sqlite;
67
pub mod state;

‎crates/figterm/src/update.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use fig_os_shim::{
33
Context,
44
Os,
55
};
6+
use fig_settings::keys::UPDATE_AVAILABLE_KEY;
67
use fig_settings::settings::get_bool_or;
78
use fig_telemetry::{
89
InstallMethod,
@@ -16,8 +17,6 @@ use fig_util::manifest::{
1617
use semver::Version;
1718
use tracing::warn;
1819

19-
const UPDATE_AVAILABLE_KEY: &str = "update.new-version-available";
20-
2120
fn current_version() -> Version {
2221
Version::parse(env!("CARGO_PKG_VERSION")).unwrap()
2322
}

‎crates/q_chat/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ clap.workspace = true
1515
color-print.workspace = true
1616
convert_case.workspace = true
1717
crossterm.workspace = true
18+
semver.workspace = true
1819
eyre.workspace = true
1920
fig_api_client.workspace = true
2021
fig_auth.workspace = true
2122
fig_diagnostic.workspace = true
2223
fig_os_shim.workspace = true
24+
fig_install.workspace = true
2325
fig_settings.workspace = true
2426
fig_telemetry.workspace = true
2527
fig_util.workspace = true

0 commit comments

Comments
 (0)