Format code with gofmt and gofumpt (#114)

jaswdr · Aug 10, 2022 · 5b35065 · 5b35065
1 parent 7605ba2
commit 5b35065
Show file tree

Hide file tree

Showing 17 changed files with 141 additions and 134 deletions.
diff --git a/address.go b/address.go
@@ -12,7 +12,8 @@ var (
 
 	buildingNumber = []string{"%####", "%###", "%##"}
 
-	streetSuffix = []string{"Alley", "Avenue",
+	streetSuffix = []string{
+		"Alley", "Avenue",
 		"Branch", "Bridge", "Brook", "Brooks", "Burg", "Burgs", "Bypass",
 		"Camp", "Canyon", "Cape", "Causeway", "Center", "Centers", "Circle", "Circles", "Cliff", "Cliffs", "Club", "Common", "Corner", "Corners", "Course", "Court", "Courts", "Cove", "Coves", "Creek", "Crescent", "Crest", "Crossing", "Crossroad", "Curve",
 		"Dale", "Dam", "Divide", "Drive", "Drive", "Drives",
@@ -33,15 +34,17 @@ var (
 		"Terrace", "Throughway", "Trace", "Track", "Trafficway", "Trail", "Trail", "Tunnel", "Tunnel", "Turnpike", "Turnpike",
 		"Underpass", "Union", "Unions",
 		"Valley", "Valleys", "Via", "Viaduct", "View", "Views", "Village", "Village", "Villages", "Ville", "Vista", "Vista",
-		"Walk", "Walks", "Wall", "Way", "Ways", "Well", "Wells"}
+		"Walk", "Walks", "Wall", "Way", "Ways", "Well", "Wells",
+	}
 
 	postCode = []string{"#####", "#####-####"}
 
 	state = []string{"Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Delaware", "District of Columbia", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"}
 
 	stateAbbr = []string{"AK", "AL", "AR", "AZ", "CA", "CO", "CT", "DC", "DE", "FL", "GA", "HI", "IA", "ID", "IL", "IN", "KS", "KY", "LA", "MA", "MD", "ME", "MI", "MN", "MO", "MS", "MT", "NC", "ND", "NE", "NH", "NJ", "NM", "NV", "NY", "OH", "OK", "OR", "PA", "RI", "SC", "SD", "TN", "TX", "UT", "VA", "VT", "WA", "WI", "WV", "WY"}
 
-	country = []string{"Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica (the territory South of 60 deg S)", "Antigua and Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan",
+	country = []string{
+		"Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica (the territory South of 60 deg S)", "Antigua and Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan",
 		"Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Bouvet Island (Bouvetoya)", "Brazil", "British Indian Ocean Territory (Chagos Archipelago)", "British Virgin Islands", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi",
 		"Cambodia", "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo", "Cook Islands", "Costa Rica", "Cote d\"Ivoire", "Croatia", "Cuba", "Cyprus", "Czech Republic",
 		"Denmark", "Djibouti", "Dominica", "Dominican Republic",
@@ -65,23 +68,32 @@ var (
 		"Vanuatu", "Venezuela", "Vietnam",
 		"Wallis and Futuna", "Western Sahara",
 		"Yemen",
-		"Zambia", "Zimbabwe"}
+		"Zambia", "Zimbabwe",
+	}
 
-	countryAbbr = []string{"ABW", "AFG", "AGO", "AIA", "ALA", "ALB", "AND", "ARE", "ARG", "ARM", "ASM", "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES", "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", "BOL", "BRA", "BRB", "BRN", "BTN", "BVT", "BWA", "CAF", "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", "COL", "COM", "CPV", "CRI", "CUB", "CUW", "CXR", "CYM", "CYP", "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI", "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO",
+	countryAbbr = []string{
+		"ABW", "AFG", "AGO", "AIA", "ALA", "ALB", "AND", "ARE", "ARG", "ARM", "ASM", "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES", "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", "BOL", "BRA", "BRB", "BRN", "BTN", "BVT", "BWA", "CAF", "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", "COL", "COM", "CPV", "CRI", "CUB", "CUW", "CXR", "CYM", "CYP", "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI", "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO",
 		"FSM", "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", "GNQ", "GRC", "GRD", "GRL", "GTM", "GUF", "GUM", "GUY", "HKG", "HMD", "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", "KGZ", "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", "MLI", "MLT", "MMR", "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI",
 		"MYS", "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", "NPL", "NRU", "NZL", "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", "ROU", "RUS", "RWA", "SAU", "SDN", "SEN", "SGP", "SGS", "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "SSD", "STP", "SUR", "SVK", "SVN", "SWE", "SWZ", "SXM", "SYC", "SYR", "TCA", "TCD", "TGO", "THA", "TJK", "TKL", "TKM", "TLS", "TON", "TTO", "TUN", "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", "VAT",
-		"VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "ZAF", "ZMB", "ZWE"}
+		"VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "ZAF", "ZMB", "ZWE",
+	}
 
-	cityFormats = []string{"{{cityPrefix}} {{firstName}}{{citySuffix}}",
+	cityFormats = []string{
+		"{{cityPrefix}} {{firstName}}{{citySuffix}}",
 		"{{cityPrefix}} {{firstName}}",
 		"{{firstName}}{{citySuffix}}",
-		"{{lastName}}{{citySuffix}}"}
-
-	streetNameFormats = []string{"{{firstName}} {{streetSuffix}}",
-		"{{lastName}} {{streetSuffix}}"}
-
-	streetAddressFormats = []string{"{{buildingNumber}} {{streetName}}",
-		"{{buildingNumber}} {{streetName}} {{secondaryAddress}}"}
+		"{{lastName}}{{citySuffix}}",
+	}
+
+	streetNameFormats = []string{
+		"{{firstName}} {{streetSuffix}}",
+		"{{lastName}} {{streetSuffix}}",
+	}
+
+	streetAddressFormats = []string{
+		"{{buildingNumber}} {{streetName}}",
+		"{{buildingNumber}} {{streetName}} {{secondaryAddress}}",
+	}
 
 	addressFormats = []string{"{{streetAddress}}\n{{city}}, {{stateAbbr}} {{postCode}}"}
 

diff --git a/app.go b/app.go
@@ -1,8 +1,6 @@
 package faker
 
-var (
-	appNames = []string{"App Your Service", "Appcentric", "Appcare", "Develapp", "Fingertip Freedom", "Winning Widgets", "Tap Into Apps", "Download Developers", "Download Digital", "Tool Kit Digital", "Tech Happy", "Appy Digital", "Handheld Help", "In Your Palm", "For Your Palm", "Fit For Fingertips", "Fingertrip", "Tap To Begin", "Tap Into Digital", "Download Dev", "Touchpoint", "Trained For Tech", "Digitize Design", "About Apps", "A Is For App", "Handheld Digital", "Apprecicreate", "Apptitude", "Appreciate Apps", "Appster", "Digiapp", "Good Apptitude", "App Association", "Appetite", "Take-With-You Tech", "App Tech", "Appetite", "Strong Appetite", "App Natural", "Develop Digital", "Digital Daredevil", "If You Build It", "Pocket Pro", "Iconic Inc.", "Icon Inc.", "Fingertip Tech", "Dare To Design", "Pocket Pros", "Digit Widget", "Build Better", "Dual Develop", "Amazing Apps", "Action Apps", "Application Station", "App Innovation", "Fun Apps", "Fantappstic", "App Command", "Strike Apps", "App Force", "Creative Applications", "App Fly", "Sure Apps", "App Door", "App Tray", "App Sure", "Rocket Apps", "App Place", "App Cafe", "Trippy Apps", "Appkey", "App Home", "Hot Apps", "App Focus", "App Possible", "App Leader", "Whip App", "App Works", "Good Apps", "Easy Apps", "App Source", "App Stage", "App Inspire", "Fire Apps", "App Flower", "App Dog", "Advance Apps", "Chatter Apps", "App Dream", "Bold Apps", "Boss Apps", "App Joy", "App Bullet", "App Cracker", "True Apps", "Feather Apps", "Real Apps", "App Whimsy", "Jewel Apps", "Image Apps", "Rifle Apps", "Next App", "Mobile Vibes", "Candy App", "Setup App", "Personality App", "Essential Web", "VitalApp", "Interact Mobile", "HelloWeb", "Network Moment", "Major Connection", "Billing Mobile", "SmartApp", "NoteWork", "Web Influence", "PowerPhone", "Chief Network", "Connection App", "WebTools", "Gamepad", "Mobile Stick", "Know The App", "WebChecker", "PassApp", "RobotSoft", "SmartCloud", "MobileHelp", "WebDesk", "EasyClick", "WeBox", "AppCan", "Smartum", "Smartio", "Smarter Web", "GrandMobile", "Technet", "RoboVoice", "TabletSoft", "E-APPy", "SkyApp", "WebMap", "BoostApp", "UserMobile", "CheapMobile", "WireSmart", "SwipeApp", "LiveBox", "WebGroup", "LinkApp", "OneClick", "MeetAll", "MomyApp", "Moboapp Developers", "Uniworld Games", "Raptor Games", "Gamers Republic", "Atomik Games", "Javatron Games", "Ultrasonic Apps", "Graviton Games", "Virtualsphere Mobile App Developers", "Javanation", "Telesoft Mobile App Developers", "Phantom Labs", "Rededge Creations", "Virtualyard Tech", "Coderant It Solutions", "Loopsoft Developers", "Clever Co App Developers", "Primeroyal App Creations", "Cyberville Tech", "Angularis Mobile App Developers", "Oceanfloat Technology", "Intelli-Ware Creations", "Aster Mobile App Developers", "Venus Hub", "Pilot Softwares", "Dominio Software Consult", "Customs Software Developers", "Cellarstars Mobile Developers", "Helevate Games", "Tetrabyte", "Monolith Games", "Selvo Games", "Metreality Games", "Hovertec Games", "Helicion Games", "Play Monkey Studios", "Digisphere Developers", "Revolt Games", "Sabre Games", "Savagechimp Games", "Spidermokey Concept", "Gravitones Games", "Clique18 Concepts", "Blackguard Gamea", "WireSmart", "SwipeApp", "LiveBox", "WebGroup", "LinkApp", "OneClick", "MeetAll", "MomyApp"}
-)
+var appNames = []string{"App Your Service", "Appcentric", "Appcare", "Develapp", "Fingertip Freedom", "Winning Widgets", "Tap Into Apps", "Download Developers", "Download Digital", "Tool Kit Digital", "Tech Happy", "Appy Digital", "Handheld Help", "In Your Palm", "For Your Palm", "Fit For Fingertips", "Fingertrip", "Tap To Begin", "Tap Into Digital", "Download Dev", "Touchpoint", "Trained For Tech", "Digitize Design", "About Apps", "A Is For App", "Handheld Digital", "Apprecicreate", "Apptitude", "Appreciate Apps", "Appster", "Digiapp", "Good Apptitude", "App Association", "Appetite", "Take-With-You Tech", "App Tech", "Appetite", "Strong Appetite", "App Natural", "Develop Digital", "Digital Daredevil", "If You Build It", "Pocket Pro", "Iconic Inc.", "Icon Inc.", "Fingertip Tech", "Dare To Design", "Pocket Pros", "Digit Widget", "Build Better", "Dual Develop", "Amazing Apps", "Action Apps", "Application Station", "App Innovation", "Fun Apps", "Fantappstic", "App Command", "Strike Apps", "App Force", "Creative Applications", "App Fly", "Sure Apps", "App Door", "App Tray", "App Sure", "Rocket Apps", "App Place", "App Cafe", "Trippy Apps", "Appkey", "App Home", "Hot Apps", "App Focus", "App Possible", "App Leader", "Whip App", "App Works", "Good Apps", "Easy Apps", "App Source", "App Stage", "App Inspire", "Fire Apps", "App Flower", "App Dog", "Advance Apps", "Chatter Apps", "App Dream", "Bold Apps", "Boss Apps", "App Joy", "App Bullet", "App Cracker", "True Apps", "Feather Apps", "Real Apps", "App Whimsy", "Jewel Apps", "Image Apps", "Rifle Apps", "Next App", "Mobile Vibes", "Candy App", "Setup App", "Personality App", "Essential Web", "VitalApp", "Interact Mobile", "HelloWeb", "Network Moment", "Major Connection", "Billing Mobile", "SmartApp", "NoteWork", "Web Influence", "PowerPhone", "Chief Network", "Connection App", "WebTools", "Gamepad", "Mobile Stick", "Know The App", "WebChecker", "PassApp", "RobotSoft", "SmartCloud", "MobileHelp", "WebDesk", "EasyClick", "WeBox", "AppCan", "Smartum", "Smartio", "Smarter Web", "GrandMobile", "Technet", "RoboVoice", "TabletSoft", "E-APPy", "SkyApp", "WebMap", "BoostApp", "UserMobile", "CheapMobile", "WireSmart", "SwipeApp", "LiveBox", "WebGroup", "LinkApp", "OneClick", "MeetAll", "MomyApp", "Moboapp Developers", "Uniworld Games", "Raptor Games", "Gamers Republic", "Atomik Games", "Javatron Games", "Ultrasonic Apps", "Graviton Games", "Virtualsphere Mobile App Developers", "Javanation", "Telesoft Mobile App Developers", "Phantom Labs", "Rededge Creations", "Virtualyard Tech", "Coderant It Solutions", "Loopsoft Developers", "Clever Co App Developers", "Primeroyal App Creations", "Cyberville Tech", "Angularis Mobile App Developers", "Oceanfloat Technology", "Intelli-Ware Creations", "Aster Mobile App Developers", "Venus Hub", "Pilot Softwares", "Dominio Software Consult", "Customs Software Developers", "Cellarstars Mobile Developers", "Helevate Games", "Tetrabyte", "Monolith Games", "Selvo Games", "Metreality Games", "Hovertec Games", "Helicion Games", "Play Monkey Studios", "Digisphere Developers", "Revolt Games", "Sabre Games", "Savagechimp Games", "Spidermokey Concept", "Gravitones Games", "Clique18 Concepts", "Blackguard Gamea", "WireSmart", "SwipeApp", "LiveBox", "WebGroup", "LinkApp", "OneClick", "MeetAll", "MomyApp"}
 
 // App is a faker struct for App
 type App struct {

diff --git a/blood.go b/blood.go
@@ -5,12 +5,9 @@ type Blood struct {
 	Faker *Faker
 }
 
-var ( 
-		bloodTypes = [] string{"A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"}
-)
+var bloodTypes = []string{"A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"}
 
 // Name returns a Blood name for Blood
 func (f Blood) Name() string {
 	return f.Faker.RandomStringElement(bloodTypes)
 }
-
diff --git a/blood_test.go b/blood_test.go
@@ -9,5 +9,3 @@ func TestBloodName(t *testing.T) {
 	NotExpect(t, "", v)
 	ExpectInString(t, v, bloodTypes)
 }
-
-
diff --git a/color.go b/color.go
@@ -8,11 +8,14 @@ import (
 var (
 	colorLetters = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"}
 
-	safeColorNames = []string{"black", "maroon", "green", "navy", "olive",
+	safeColorNames = []string{
+		"black", "maroon", "green", "navy", "olive",
 		"purple", "teal", "lime", "blue", "silver",
-		"gray", "yellow", "fuchsia", "aqua", "white"}
+		"gray", "yellow", "fuchsia", "aqua", "white",
+	}
 
-	allColorNames = []string{"AliceBlue", "AntiqueWhite", "Aqua", "Aquamarine",
+	allColorNames = []string{
+		"AliceBlue", "AntiqueWhite", "Aqua", "Aquamarine",
 		"Azure", "Beige", "Bisque", "Black", "BlanchedAlmond",
 		"Blue", "BlueViolet", "Brown", "BurlyWood", "CadetBlue",
 		"Chartreuse", "Chocolate", "Coral", "CornflowerBlue",
@@ -37,7 +40,8 @@ var (
 		"PowderBlue", "Purple", "Red", "RosyBrown", "RoyalBlue", "SaddleBrown", "Salmon",
 		"SandyBrown", "SeaGreen", "SeaShell", "Sienna", "Silver", "SkyBlue", "SlateBlue",
 		"SlateGray", "Snow", "SpringGreen", "SteelBlue", "Tan", "Teal", "Thistle", "Tomato",
-		"Turquoise", "Violet", "Wheat", "White", "WhiteSmoke", "Yellow", "YellowGreen"}
+		"Turquoise", "Violet", "Wheat", "White", "WhiteSmoke", "Yellow", "YellowGreen",
+	}
 )
 
 // Color is a faker struct for Color

diff --git a/company.go b/company.go
@@ -58,14 +58,16 @@ var (
 		"Umpire and Referee", "Underground Mining", "University", "Upholsterer", "Urban Planner", "User Experience Manager", "User Experience Researcher", "Usher", "Utility Meter Reader",
 		"Valve Repairer OR Regulator Repairer", "Vending Machine Servicer", "Veterinarian", "Veterinary Assistant OR Laboratory Animal Caretaker", "Veterinary Technician", "Vice President Of Human Resources", "Vice President Of Marketing", "Video Editor", "Visual Designer", "Vocational Education Teacher",
 		"Waiter", "Waitress", "Warehouse", "Washing Equipment Operator", "Waste Treatment Plant Operator", "Watch Repairer", "Weapons Specialists", "Web Developer", "Webmaster", "Welder", "Welder", "Welder and Cutter", "Welder-Fitter", "Welding Machine Tender", "Welding Machine Operator", "Welding Machine Setter", "Welfare Eligibility Clerk", "Well and Core Drill Operator", "Wellhead Pumper", "Wholesale Buyer", "Wind Instrument Repairer", "Woodworker", "Woodworking Machine Operator", "Woodworking Machine Setter", "Word Processors and Typist", "Writer OR Author",
-		"Zoologists OR Wildlife Biologist"}
+		"Zoologists OR Wildlife Biologist",
+	}
 
 	companySuffix = []string{"Inc", "and Sons", "LLC", "Group", "PLC", "Ltd"}
 
 	einPrefixes = []int{
 		01, 02, 03, 04, 05, 06, 10, 11, 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36,
 		37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
-		66, 67, 68, 71, 72, 73, 74, 75, 76, 77, 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, 93, 94, 95, 98, 99}
+		66, 67, 68, 71, 72, 73, 74, 75, 76, 77, 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, 93, 94, 95, 98, 99,
+	}
 )
 
 // Company is a faker struct for Company
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,3 @@ func TestBloodName(t *testing.T) {
		NotExpect(t, "", v)
		ExpectInString(t, v, bloodTypes)
		}