Skip to content

[dwds] Cleanup unused null safety related fields #2660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions dwds/lib/src/debugging/metadata/provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,6 @@ class MetadataProvider {

MetadataProvider(this.entrypoint, this._assetReader);

/// A sound null safety mode for the whole app.
///
/// All libraries have to agree on null safety mode.
@Deprecated('Only sound null safety is supported as of Dart 3.0')
Future<bool> get soundNullSafety async {
await _initialize();
return true;
}

/// A list of all libraries in the Dart application.
///
/// Example:
Expand Down
4 changes: 0 additions & 4 deletions dwds/lib/src/services/expression_compiler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@
class CompilerOptions {
final ModuleFormat moduleFormat;

@Deprecated('Only sound null safety is supported as of Dart 3.0')
final bool soundNullSafety;

final bool canaryFeatures;
final List<String> experiments;

CompilerOptions({
required this.moduleFormat,
this.soundNullSafety = true,
required this.canaryFeatures,
required this.experiments,
});
Expand Down
1 change: 0 additions & 1 deletion dwds/lib/src/services/expression_compiler_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class _Compiler {
'--module-format',
compilerOptions.moduleFormat.name,
if (verbose) '--verbose',
'--sound-null-safety',
for (final experiment in compilerOptions.experiments)
'--enable-experiment=$experiment',
if (compilerOptions.canaryFeatures) '--canary',
Expand Down
22 changes: 0 additions & 22 deletions dwds/lib/src/utilities/sdk_configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ class SdkLayout {
final String summaryPath;
final String dartdevcSnapshotPath;

@Deprecated('Only sound null safety is supported as of Dart 3.0')
final String soundSummaryPath;

@Deprecated('Only sound null safety is supported as of Dart 3.0')
final String weakSummaryPath;

SdkLayout.createDefault(String sdkDirectory)
: this(
sdkDirectory: sdkDirectory,
Expand All @@ -73,8 +67,6 @@ class SdkLayout {
const SdkLayout({
required this.sdkDirectory,
required this.summaryPath,
this.soundSummaryPath = '',
this.weakSummaryPath = '',
required this.dartdevcSnapshotPath,
});
}
Expand All @@ -93,17 +85,9 @@ class SdkConfiguration {
final String? sdkSummaryPath;
final String? compilerWorkerPath;

@Deprecated('Only sound null safety is supported as of Dart 3.0')
final String? weakSdkSummaryPath;

@Deprecated('Only sound null safety is supported as of Dart 3.0')
final String? soundSdkSummaryPath;

const SdkConfiguration({
this.sdkDirectory,
this.sdkSummaryPath,
this.weakSdkSummaryPath,
this.soundSdkSummaryPath,
this.compilerWorkerPath,
});

Expand All @@ -123,12 +107,6 @@ class SdkConfiguration {
Uri? get sdkDirectoryUri => _toUri(sdkDirectory);
Uri? get sdkSummaryUri => _toUri(sdkSummaryPath);

@Deprecated('Only sound null safety is supported as of Dart 3.0')
Uri? get soundSdkSummaryUri => _toUri(soundSdkSummaryPath);

@Deprecated('Only sound null safety is supported as of Dart 3.0')
Uri? get weakSdkSummaryUri => _toUri(weakSdkSummaryPath);

/// Note: has to be ///file: Uri to run in an isolate.
Uri? get compilerWorkerUri => _toAbsoluteUri(compilerWorkerPath);

Expand Down
2 changes: 1 addition & 1 deletion dwds/test/sdk_configuration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class FakeSdkLayout {

FakeSdkLayout(this.sdkDirectory);

String get summaryPath => p.join(sdkDirectory, 'summaries', 'sound.dill');
String get summaryPath => p.join(sdkDirectory, 'summaries', 'outline.dill');

String get compilerWorkerPath =>
p.join(sdkDirectory, 'snapshots', 'test.snapshot');
Expand Down
Loading