Merge pull request #4780 from apple/revert-4776-needless-warning

Author: swift-ci

lib/Basic/StringExtras.cpp

@@ -669,7 +669,7 @@ static StringRef omitNeedlessWords(StringRef name,
                             NameRole::Partial, allPropertyNames, scratch);
       if (shortenedNameWord == newShortenedNameWord &&
           shortenedNameWord.back() == 'e') {
-        shortenedNameWord = shortenedNameWord.drop_back();
+        shortenedNameWord.drop_back();
         newShortenedNameWord =
           omitNeedlessWords(shortenedNameWord, typeName.CollectionElement,
                             NameRole::Partial, allPropertyNames, scratch);

test/IDE/Inputs/custom-modules/OmitNeedlessWords.h

@@ -7,9 +7,6 @@
 @interface SEGreebieArray : NSObject
 @end
 
-@interface Echo : NSObject
-@end
-
 typedef NS_OPTIONS(NSUInteger, OMWWobbleOptions) {
   OMWWobbleSideToSide = 0x01,
   OMWWobbleBackAndForth = 0x02,
@@ -24,7 +21,6 @@ typedef NS_OPTIONS(NSUInteger, OMWWobbleOptions) {
 -(void)jumpToTop:(nonnull id)sender;
 -(void)removeWithNoRemorse:(nonnull id)object;
 -(void)bookmarkWithURLs:(nonnull NSArray<NSURL *> *)urls;
--(void)listenToEchoes:(nonnull NSArray<Echo *> *)echoes;
 -(void)saveToURL:(nonnull NSURL *)url forSaveOperation:(NSInteger)operation;
 -(void)indexWithItemNamed:(nonnull NSString *)name;
 -(void)methodAndReturnError:(NSError **)error;

test/IDE/print_omit_needless_words.swift

@@ -209,7 +209,6 @@
 // CHECK-OMIT-NEEDLESS-WORDS: func jumpToTop(_: Any)
 // CHECK-OMIT-NEEDLESS-WORDS: func removeWithNoRemorse(_: Any)
 // CHECK-OMIT-NEEDLESS-WORDS: func bookmark(with: [NSURL])
-// CHECK-OMIT-NEEDLESS-WORDS: func listen(to: [Echo])
 // CHECK-OMIT-NEEDLESS-WORDS: func save(to: NSURL, forSaveOperation: Int)
 // CHECK-OMIT-NEEDLESS-WORDS: func index(withItemNamed: String)
 // CHECK-OMIT-NEEDLESS-WORDS: func methodAndReturnError(_: AutoreleasingUnsafeMutablePointer<NSError?>!)