Make popd and pushd update PWD

src/lib/builtins/mod.rs

@@ -243,7 +243,7 @@ fn builtin_pushd(args: &[&str], shell: &mut Shell) -> i32 {
     if check_help(args, MAN_PUSHD) {
         return SUCCESS;
     }
-    match shell.directory_stack.pushd(args, &shell.variables) {
+    match shell.directory_stack.pushd(args, &mut shell.variables) {
         Ok(()) => SUCCESS,
         Err(why) => {
             let stderr = io::stderr();
@@ -258,8 +258,7 @@ fn builtin_popd(args: &[&str], shell: &mut Shell) -> i32 {
     if check_help(args, MAN_POPD) {
         return SUCCESS;
     }
-
-    match shell.directory_stack.popd(args) {
+    match shell.directory_stack.popd(args, &mut shell.variables) {
         Ok(()) => SUCCESS,
         Err(why) => {
             let stderr = io::stderr();

src/lib/shell/directory_stack.rs

@@ -40,7 +40,7 @@ impl DirectoryStack {
 
     /// Attempts to set the current directory to the directory stack's previous directory,
     /// and then removes the front directory from the stack.
-    pub(crate) fn popd<I: IntoIterator>(&mut self, args: I) -> Result<(), Cow<'static, str>>
+    pub(crate) fn popd<I: IntoIterator>(&mut self, args: I, variables: &mut Variables) -> Result<(), Cow<'static, str>>
     where
         I::Item: AsRef<str>,
     {
@@ -101,6 +101,8 @@ impl DirectoryStack {
             )));
         }
 
+        // Manually update $PWD
+        variables.set_var("PWD", current_dir().unwrap().to_str().unwrap());
         self.print_dirs();
         Ok(())
     }
@@ -108,7 +110,7 @@ impl DirectoryStack {
     pub(crate) fn pushd<I: IntoIterator>(
         &mut self,
         args: I,
-        variables: &Variables,
+        variables: &mut Variables,
     ) -> Result<(), Cow<'static, str>>
     where
         I::Item: AsRef<str>,
@@ -164,8 +166,9 @@ impl DirectoryStack {
             }
         };
 
+        // Manually update $PWD
+        variables.set_var("PWD", current_dir().unwrap().to_str().unwrap());
         self.print_dirs();
-
         Ok(())
     }