Skip to content
Sign in

flagon-io/hello

public
0

Commit

Merge #87: Rename hail() and part() to greet() and farewell()

g1tbotcommitted Parents6a43cfd8bdd0e5Browse files
3 files+16−150/3 viewed
+1−0
1717 ### Changed
1818
1919 - Renamed the public `greet()` function to `hail()` and `farewell()` to `part()`
20+- Renamed `hail()` back to `greet()` and `part()` to `farewell()`
+13−13
146146 }
147147
148148 /// The greeting for `name`.
149−pub fn hail(name: &str) -> String {
149+pub fn greet(name: &str) -> String {
150150 greeting_in(name, Lang::En)
151151 }
152152
167167 }
168168
169169 /// The farewell for `name`.
170−pub fn part(name: &str) -> String {
170+pub fn farewell(name: &str) -> String {
171171 let trimmed = name.trim();
172172 let display_name = if trimmed.is_empty() { "world" } else { trimmed };
173173 format!("Goodbye, {display_name}!")
219219
220220 #[test]
221221 fn loud_uses_three_exclamation_marks() {
222− assert_eq!(loud(&hail("Ada")), "Hi, Ada!!!");
222+ assert_eq!(loud(&greet("Ada")), "Hi, Ada!!!");
223223 }
224224
225225 #[test]
350350
351351 #[test]
352352 fn shout_upper_cases_greeting() {
353− assert_eq!(shout(&hail("Ada")), "HI, ADA!");
353+ assert_eq!(shout(&greet("Ada")), "HI, ADA!");
354354 }
355355
356356 #[test]
357357 fn whisper_lower_cases_and_trails_off() {
358− assert_eq!(whisper(&hail("Ada")), "hi, ada...");
358+ assert_eq!(whisper(&greet("Ada")), "hi, ada...");
359359 assert_eq!(whisper(&greeting_in("Luc", Lang::Fr)), "bonjour, luc...");
360360 }
361361
377377
378378 #[test]
379379 fn reverse_spells_backwards() {
380− assert_eq!(hail(&reverse("Ada")), "Hi, adA!");
380+ assert_eq!(greet(&reverse("Ada")), "Hi, adA!");
381381 }
382382
383383 #[test]
384384 fn greets_by_name() {
385− assert_eq!(hail("Ada"), "Hi, Ada!");
385+ assert_eq!(greet("Ada"), "Hi, Ada!");
386386 }
387387
388388 #[test]
389389 fn greets_world_with_empty_string() {
390− assert_eq!(hail(""), "Hi, world!");
390+ assert_eq!(greet(""), "Hi, world!");
391391 }
392392
393393 #[test]
394394 fn greets_world_with_whitespace_only() {
395− assert_eq!(hail(" "), "Hi, world!");
395+ assert_eq!(greet(" "), "Hi, world!");
396396 }
397397
398398 #[test]
399399 fn trims_whitespace_from_name() {
400− assert_eq!(hail(" Ada "), "Hi, Ada!");
400+ assert_eq!(greet(" Ada "), "Hi, Ada!");
401401 }
402402
403403 #[test]
404404 fn says_goodbye_by_name() {
405− assert_eq!(part("Ada"), "Goodbye, Ada!");
405+ assert_eq!(farewell("Ada"), "Goodbye, Ada!");
406406 }
407407
408408 #[test]
409409 fn says_goodbye_to_world_when_blank() {
410− assert_eq!(part(" "), "Goodbye, world!");
410+ assert_eq!(farewell(" "), "Goodbye, world!");
411411 }
412412
413413 #[test]
414414 fn farewell_trims_whitespace() {
415− assert_eq!(part(" Ada "), "Goodbye, Ada!");
415+ assert_eq!(farewell(" Ada "), "Goodbye, Ada!");
416416 }
417417 }
+2−2
11 use std::{env, process};
22
3−use hello::{greeting_in, loud, parse_args, part, reverse, shout, wave, whisper};
3+use hello::{farewell, greeting_in, loud, parse_args, reverse, shout, wave, whisper};
44
55 fn main() {
66 let options = match parse_args(env::args().skip(1)) {
5252 println!("{}", wave());
5353 }
5454 if options.bye {
55− println!("{}", part(&name));
55+ println!("{}", farewell(&name));
5656 }
5757 }