Skip to content

Commit cdddac9

Browse files
committed
Address ECJ warnings
* They happen again since org.truffleruby no longer uses "jniHeaders": True and so can again be compiled by ECJ and is not forced to use javac.
1 parent 3b48762 commit cdddac9

36 files changed

+62
-71
lines changed

mx.truffleruby/eclipse-settings/org.eclipse.jdt.core.prefs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
2+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
23
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
34
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
45
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
56
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
67
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
78
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
89
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
10+
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=ignore
911
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
1012
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
1113
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

src/main/java/org/truffleruby/cext/ValueWrapperManager.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,6 @@ public static final class HandleBlock {
215215

216216
@SuppressWarnings("unused") private Cleanable cleanable;
217217

218-
private HandleBlock() {
219-
base = 0;
220-
cleanable = null;
221-
wrappers = null;
222-
}
223-
224218
public HandleBlock(RubyContext context, RubyLanguage language, ValueWrapperManager manager) {
225219
HandleBlockAllocator allocator = language.handleBlockAllocator;
226220
long base = allocator.getFreeBlock();

src/main/java/org/truffleruby/collections/ConcurrentWeakSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Object[] toArray() {
3232

3333
@TruffleBoundary
3434
public WeakSetIterator<E> iterator() {
35-
return new WeakSetIterator<E>(map.keySet().iterator());
35+
return new WeakSetIterator<>(map.keySet().iterator());
3636
}
3737

3838
private static final class WeakSetIterator<E> implements Iterator<E> {

src/main/java/org/truffleruby/core/array/ArrayConcatNode.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public void doExecuteVoid(VirtualFrame frame) {
8181
}
8282
}
8383

84+
@Override
8485
public RubyNode cloneUninitialized() {
8586
var copy = new ArrayConcatNode(cloneUninitialized(children));
8687
return copy.copyFlags(this);

src/main/java/org/truffleruby/core/array/library/DoubleArrayStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static void sort(double[] store, int size) {
165165

166166
@ExportMessage
167167
static Iterable<Object> getIterable(double[] store, int from, int length) {
168-
return () -> new Iterator<Object>() {
168+
return () -> new Iterator<>() {
169169

170170
private int n = from;
171171

src/main/java/org/truffleruby/core/array/library/IntegerArrayStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static void sort(int[] store, int size) {
165165

166166
@ExportMessage
167167
static Iterable<Object> getIterable(int[] store, int from, int length) {
168-
return () -> new Iterator<Object>() {
168+
return () -> new Iterator<>() {
169169

170170
private int n = from;
171171

src/main/java/org/truffleruby/core/array/library/LongArrayStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static void sort(long[] store, int size) {
186186

187187
@ExportMessage
188188
static Iterable<Object> getIterable(long[] store, int from, int length) {
189-
return () -> new Iterator<Object>() {
189+
return () -> new Iterator<>() {
190190

191191
private int n = from;
192192

src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ protected Object[] toJavaArrayCopy(int size,
221221
@ExportMessage
222222
static Iterable<Object> getIterable(NativeArrayStorage store, int from, int length,
223223
@CachedLibrary("store") ArrayStoreLibrary stores) {
224-
return () -> new Iterator<Object>() {
224+
return () -> new Iterator<>() {
225225

226226
private int n = from;
227227

src/main/java/org/truffleruby/core/array/library/ObjectArrayStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static Object[] toJavaArrayCopy(Object[] store, int length) {
160160

161161
@ExportMessage
162162
static Iterable<Object> getIterable(Object[] store, int from, int length) {
163-
return () -> new Iterator<Object>() {
163+
return () -> new Iterator<>() {
164164

165165
private int n = from;
166166

src/main/java/org/truffleruby/core/fiber/FiberManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,6 @@ public RubyFiber getSendingFiber() {
478478
return sendingFiber;
479479
}
480480

481-
public ArgumentsDescriptor getDescriptor() {
482-
return descriptor;
483-
}
484-
485481
public Object[] getArgs() {
486482
return args;
487483
}

0 commit comments

Comments
 (0)